wxArrayString::Sort() wasn't MT-safe even though it tried to

[wxWidgets.git] / src / gtk / fontpicker.cpp

diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index 8934897134e20edc3dca34caece95fec88c62e7d..27d8bb19bfc1a3ce19035eeed8b50f6c2710e9bb 100644 (file)
--- a/src/gtk/fontpicker.cpp
+++ b/src/gtk/fontpicker.cpp
@@ -17,23 +17,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/gtk/private.h"
+#if wxUSE_FONTPICKERCTRL && defined(__WXGTK24__)
+

 #include "wx/fontpicker.h"
 
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 
 #include "wx/fontpicker.h"
 
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-#if wxUSE_FONTPICKERCTRL && defined(__WXGTK24__)
-

 //-----------------------------------------------------------------------------
 // "font-set"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "font-set"
 //-----------------------------------------------------------------------------


@@ -126,4 +120,4 @@ void wxFontButton::UpdateFont()
         wxGenericFontButton::UpdateFont();
 }
 
         wxGenericFontButton::UpdateFont();
 }
 

-#endif      // wxUSE_FONTPICKERCTRL
+#endif      // wxUSE_FONTPICKERCTRL && defined(__WXGTK24__)