diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Device.H | 4 | ||||
| -rw-r--r-- | FL/win32.H | 2 | ||||
| -rw-r--r-- | FL/x.H | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 25b254266..f7c7fecbb 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -46,8 +46,6 @@ class Fl_Surface_Device; FL_EXPORT extern Fl_Graphics_Driver *fl_graphics_driver; /** \brief Points to the surface that currently receives all graphics requests */ FL_EXPORT extern Fl_Surface_Device *fl_surface; -/** \brief Points to the platform's display */ -FL_EXPORT extern Fl_Display_Device *fl_display_device; /** signature of image generation callback function. @@ -394,7 +392,7 @@ public: /** @brief Returns the platform's display device. */ - static Fl_Display_Device *display_device() { return fl_display_device; }; + static Fl_Display_Device *display_device(); }; /** diff --git a/FL/win32.H b/FL/win32.H index 27cfdc25e..cb19475df 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -136,7 +136,7 @@ typedef HBITMAP Fl_Offscreen; # define fl_begin_offscreen(b) \ HDC _sgc=fl_gc; Window _sw=fl_window; \ - Fl_Surface_Device *_ss = fl_surface; fl_display_device->set_current(); \ + Fl_Surface_Device *_ss = fl_surface; Fl_Display_Device::display_device()->set_current(); \ fl_gc=fl_makeDC(b); int _savedc = SaveDC(fl_gc); fl_window=(HWND)b; fl_push_no_clip() # define fl_end_offscreen() \ @@ -90,7 +90,7 @@ typedef ulong Fl_Offscreen; // begin/end are macros that save the old state in local variables: # define fl_begin_offscreen(pixmap) \ Window _sw=fl_window; fl_window=pixmap; \ - Fl_Surface_Device *_ss = fl_surface; fl_display_device->set_current(); \ + Fl_Surface_Device *_ss = fl_surface; Fl_Display_Device::display_device()->set_current(); \ fl_push_no_clip() # define fl_end_offscreen() \ fl_pop_clip(); fl_window = _sw; _ss->set_current() |