summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Device.cxx3
-rw-r--r--src/Fl_Widget.cxx3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx
index 40562c7de..080ad7761 100644
--- a/src/Fl_Device.cxx
+++ b/src/Fl_Device.cxx
@@ -76,6 +76,9 @@ void Fl_Graphics_Driver::text_extents(const char*t, int n, int& dx, int& dy, int
/** A constructor that sets the graphics driver used by the display */
Fl_Display_Device::Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_Surface_Device(graphics_driver) {
this->set_current();
+#ifdef __APPLE__
+ if (!fl_fonts) fl_fonts = Fl_X::calc_fl_fonts(); // make sure fl_fonts is initialized
+#endif
};
diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx
index edc904055..74287640b 100644
--- a/src/Fl_Widget.cxx
+++ b/src/Fl_Widget.cxx
@@ -145,9 +145,6 @@ Fl_Widget::Fl_Widget(int X, int Y, int W, int H, const char* L) {
if (!been_here) {
been_here = 1;
Fl_Display_Device::display_device(); // make sure fl_graphics_driver is initialized
-#ifdef __APPLE__
- fl_fonts = Fl_X::calc_fl_fonts(); // make sure fl_fonts is initialized
-#endif
}
}