diff options
| author | Manolo Gouy <Manolo> | 2016-09-26 16:57:37 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-09-26 16:57:37 +0000 |
| commit | 04c20514f62f09ef92fcfbe8cdb0e3917ba1c9a7 (patch) | |
| tree | 9a1e06021006d6dac45e16b02dbb29a303a04cf7 /src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H | |
| parent | 606cdf1c6091920d006f4258af5f1495bc1af411 (diff) | |
Replace a few global variables by members of the Fl_Quartz_Graphics_Driver class
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11985 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H')
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H index b46b94000..94830acc1 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H @@ -49,8 +49,18 @@ protected: XPOINT *p; bool high_resolution_; driver_feature is_printer_; + float quartz_line_width_; + CGLineCap quartz_line_cap_; + CGLineJoin quartz_line_join_; + CGFloat *quartz_line_pattern; + int quartz_line_pattern_size; // protected constructor to ensure only derived classes are allocated Fl_Quartz_Graphics_Driver() : Fl_Graphics_Driver(), gc_(NULL), p_size(0), p(NULL) { + quartz_line_width_ = 1.f; + quartz_line_cap_ = kCGLineCapButt; + quartz_line_join_ = kCGLineJoinMiter; + quartz_line_pattern = 0; + quartz_line_pattern_size = 0; high_resolution_ = false; is_printer_ = (driver_feature)0; } @@ -157,6 +167,7 @@ protected: virtual void set_fontname_in_fontdesc(Fl_Fontdesc *f); virtual void descriptor_init(const char* name, Fl_Fontsize Size, Fl_Font_Descriptor *d) {} // end of function group + void quartz_restore_line_style(); }; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 @@ -182,7 +193,6 @@ class Fl_ATSU_Graphics_Driver : public Fl_Quartz_Graphics_Driver { }; #endif -extern float fl_quartz_line_width_; #endif // FL_QUARTZ_GRAPHICS_DRIVER_H |