add support for GtkFontChooserDialog, new in GTK 3.2

[wxWidgets.git] / src / common / combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index ac476a5addc1005245937e3a8e7ff86daed3fd6b..06bb0409915d094ae606a8f85ae59d5d765464b1 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -23,26 +23,11 @@
     #pragma hdrstop
 #endif
 
+#include "wx/combo.h"
+
 #if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
-#endif
-
-#if wxUSE_COMBOCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/dcclient.h"
-    #include "wx/settings.h"
-    #include "wx/timer.h"
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/tooltip.h"
-
-#include "wx/combo.h"
-
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -110,6 +95,21 @@ wxEMPTY_HANDLERS_TABLE(wxComboBox)
 wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
                 wxString, Value, wxPoint, Position, wxSize, Size )
 
+#endif // wxUSE_COMBOBOX
+
+#if wxUSE_COMBOCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/timer.h"
+    #include "wx/textctrl.h"
+#endif
+
+#include "wx/tooltip.h"
+
 // constants
 // ----------------------------------------------------------------------------
 
@@ -2051,7 +2051,9 @@ void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
 void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {
 // On Mac, this leads to infinite recursion and eventually a crash
-#ifndef __WXMAC__
+#ifdef __WXMAC__
+    wxUnusedVar(event);
+#else
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
         wxWindow* tc = GetTextCtrl();