summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-02-24 08:07:30 +0000
committerManolo Gouy <Manolo>2016-02-24 08:07:30 +0000
commit6097c134d893c67aa6d3d56ee176531c481261a8 (patch)
tree0f852ee2b98526ea3dbf039bd672f0646ca19f3a /src
parent941c301cebc5e636667cca1ae8f3938a25d770df (diff)
Avoid static initializers to allow FLTK usage in static initializers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11213 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index c0120b13d..a27a187fd 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -216,16 +216,12 @@ char const * const Fl::clipboard_image = "image";
// Drivers
//
-Fl_Screen_Driver *Fl::screen_driver_ = Fl_Screen_Driver::newScreenDriver();
-
Fl_Screen_Driver *Fl::screen_driver()
{
- if (!screen_driver_)
- screen_driver_ = Fl_Screen_Driver::newScreenDriver();
+ static Fl_Screen_Driver* screen_driver_ = Fl_Screen_Driver::newScreenDriver();
return screen_driver_;
}
-
//
// 'Fl::version()' - Return the API version number...
//