diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Device.H | 4 | ||||
| -rw-r--r-- | FL/mac.H | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index caece3b7c..3162255b9 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -585,10 +585,8 @@ class FL_EXPORT Fl_Display_Device : public Fl_Surface_Device { public: static const char *class_id; const char *class_name() {return class_id;}; - /** \brief A constructor that sets the graphics driver used by the display */ Fl_Display_Device(Fl_Graphics_Driver *graphics_driver); - /** Returns the platform display device. */ - static inline Fl_Display_Device *display_device() {return _display;}; + static Fl_Display_Device *display_device(); #ifdef __APPLE__ static bool high_resolution() {return high_res_window_;} #endif @@ -197,6 +197,7 @@ public: static const int CoreText_threshold; // Mac OS version from which the Core Text API is used to display text static Fl_Fontdesc* calc_fl_fonts(void); // computes the fl_fonts global variable static int dnd(int use_selection); // call Fl_X::dnd(1) to support text dragging + static int calc_mac_os_version(void); // computes the fl_mac_os_version global variable private: #if FLTK_ABI_VERSION >= 10304 CGRect* subRect_; // makes sure subwindow remains inside its parent window |
