mirror of
https://github.com/fltk/fltk.git
synced 2026-06-04 15:32:12 +08:00
Moved Quartz graphics driver to the new naming scheme
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11057 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+1
-1
@@ -276,7 +276,7 @@ protected:
|
|||||||
|
|
||||||
// FIXME: add Fl_Quartz_Printer_Graphics_Driver
|
// FIXME: add Fl_Quartz_Printer_Graphics_Driver
|
||||||
// FIXME: it should not be required to include this file here. This is nothing that the user should have access to.
|
// FIXME: it should not be required to include this file here. This is nothing that the user should have access to.
|
||||||
#include "src/cfg_gfx/quartz.H"
|
#include "src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
#elif defined(WIN32) || defined(FL_DOXYGEN)
|
#elif defined(WIN32) || defined(FL_DOXYGEN)
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,8 @@
|
|||||||
#ifndef FL_CFG_GFX_QUARTZ_ARCI_CXX
|
#ifndef FL_CFG_GFX_QUARTZ_ARCI_CXX
|
||||||
#define FL_CFG_GFX_QUARTZ_ARCI_CXX
|
#define FL_CFG_GFX_QUARTZ_ARCI_CXX
|
||||||
|
|
||||||
|
#include "Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\file quartz_arci.cxx
|
\file quartz_arci.cxx
|
||||||
\brief Utility functions for drawing circles using integers
|
\brief Utility functions for drawing circles using integers
|
||||||
+3
-1
@@ -24,13 +24,15 @@
|
|||||||
// matt: Neither Quartz nor Quickdraw support colormaps in this implementation
|
// matt: Neither Quartz nor Quickdraw support colormaps in this implementation
|
||||||
// matt: Quartz support done
|
// matt: Quartz support done
|
||||||
|
|
||||||
|
#include "Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/x.H>
|
#include <FL/x.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
|
|
||||||
static unsigned fl_cmap[256] = {
|
static unsigned fl_cmap[256] = {
|
||||||
#include "../fl_cmap.h" // this is a file produced by "cmap.cxx":
|
#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx":
|
||||||
};
|
};
|
||||||
|
|
||||||
void Fl_Quartz_Graphics_Driver::color(Fl_Color i) {
|
void Fl_Quartz_Graphics_Driver::color(Fl_Color i) {
|
||||||
@@ -16,6 +16,8 @@
|
|||||||
// http://www.fltk.org/str.php
|
// http://www.fltk.org/str.php
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include "Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
+1
-1
@@ -24,7 +24,7 @@
|
|||||||
\brief Line style drawing utility hiding different platforms.
|
\brief Line style drawing utility hiding different platforms.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "quartz.H"
|
#include "Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
float fl_quartz_line_width_ = 1.0f;
|
float fl_quartz_line_width_ = 1.0f;
|
||||||
static /*enum*/ CGLineCap fl_quartz_line_cap_ = kCGLineCapButt;
|
static /*enum*/ CGLineCap fl_quartz_line_cap_ = kCGLineCapButt;
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "quartz.H"
|
#include "Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
|
|
||||||
extern float fl_quartz_line_width_;
|
extern float fl_quartz_line_width_;
|
||||||
+1
-1
@@ -25,7 +25,7 @@
|
|||||||
simple 2D transformations, implemented for OS X Quartz.
|
simple 2D transformations, implemented for OS X Quartz.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "quartz.H"
|
#include "Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
#include <FL/x.H>
|
||||||
+1
-1
@@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
#ifdef FL_CFG_GFX_QUARTZ
|
#ifdef FL_CFG_GFX_QUARTZ
|
||||||
|
|
||||||
# include "cfg_gfx/quartz_arci.cxx"
|
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
#ifdef FL_CFG_GFX_QUARTZ
|
#ifdef FL_CFG_GFX_QUARTZ
|
||||||
|
|
||||||
# include "cfg_gfx/quartz_color.cxx"
|
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -48,7 +48,7 @@
|
|||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
# include "fl_font_win32.cxx"
|
# include "fl_font_win32.cxx"
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
# include "cfg_gfx/quartz_font.cxx"
|
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx"
|
||||||
#elif USE_XFT
|
#elif USE_XFT
|
||||||
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx"
|
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx"
|
||||||
#elif defined(FL_PORTING)
|
#elif defined(FL_PORTING)
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ int fl_line_width_ = 0;
|
|||||||
|
|
||||||
#ifdef FL_CFG_GFX_QUARTZ
|
#ifdef FL_CFG_GFX_QUARTZ
|
||||||
|
|
||||||
# include "cfg_gfx/quartz_line_style.cxx"
|
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -67,7 +67,7 @@ Fl_Region Fl_Graphics_Driver::clip_region() {
|
|||||||
|
|
||||||
#ifdef FL_CFG_GFX_QUARTZ
|
#ifdef FL_CFG_GFX_QUARTZ
|
||||||
|
|
||||||
# include "cfg_gfx/quartz_rect.cxx"
|
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -150,7 +150,7 @@ void Fl_Graphics_Driver::fixloop() { // remove equal points from closed path
|
|||||||
|
|
||||||
#ifdef FL_CFG_GFX_QUARTZ
|
#ifdef FL_CFG_GFX_QUARTZ
|
||||||
|
|
||||||
# include "cfg_gfx/quartz_vertex.cxx"
|
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user