diff options
| author | Manolo Gouy <Manolo> | 2016-04-26 05:44:54 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-26 05:44:54 +0000 |
| commit | 25b4076b0376a924eb6c83f03f72e13e2f979d15 (patch) | |
| tree | 6587ab6ed069b3584df44e560639ae4d1c7793e7 | |
| parent | 8f9f17456b3eedded3af8be7b7ae73dd4573ddb5 (diff) | |
Set more accurately the protections of the members of class Fl_Display_Device.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11697 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Device.H | 7 | ||||
| -rw-r--r-- | src/Fl_Device.cxx | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 58c02a29e..22328ddd9 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -77,14 +77,11 @@ public: /** A display to which the computer can draw. - When the program begins running, an Fl_Display_Device instance has been created and made the current drawing surface. - There is no need to create any other object of this class. + When the program begins running, an object of class Fl_Display_Device has been created and made the current drawing surface. */ class FL_EXPORT Fl_Display_Device : public Fl_Surface_Device { - friend class Fl_Graphics_Driver; - static Fl_Display_Device *_display; // the platform display device -public: Fl_Display_Device(Fl_Graphics_Driver *graphics_driver); +public: static Fl_Display_Device *display_device(); static bool high_resolution(); }; diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx index dd2053f56..348d00e45 100644 --- a/src/Fl_Device.cxx +++ b/src/Fl_Device.cxx @@ -72,7 +72,7 @@ Fl_Display_Device::Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_S }; -/** Returns the platform display device. */ +/** Returns a pointer to the unique display device */ Fl_Display_Device *Fl_Display_Device::display_device() { static Fl_Display_Device *display = new Fl_Display_Device(Fl_Graphics_Driver::newMainGraphicsDriver()); return display; @@ -89,10 +89,6 @@ Fl_Surface_Device *Fl_Surface_Device::default_surface() return Fl_Display_Device::display_device(); } - -Fl_Display_Device *Fl_Display_Device::_display; - - // // End of "$Id$". // |