[ 1493802 ] Allow multiple wxComboCtrl::SetPopupControl calls.

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 870c4c9ccb057844172ab8e12964adb97c257d2a..72ee7a2c0271743e653925a04d2ad991d99e60bc 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -23,15 +23,18 @@
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/combobox.h"
+
 #if wxUSE_TOOLBAR_NATIVE
-#include "wx/toolbar.h"
+    #include "wx/toolbar.h"
 #endif
 
 #if wxUSE_DRAG_AND_DROP
@@ -50,9 +53,7 @@
     #include "wx/textctrl.h"
 #endif
 
-#include "wx/menu.h"
 #include "wx/statusbr.h"
-#include "wx/settings.h"
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__
@@ -4135,7 +4136,7 @@ static inline bool IsScrollIncrement(double increment, double x)
     return fabs(increment - fabs(x)) < tolerance;
 }
 
-wxEventType wxWindow::GetScrollEventType(GtkRange* range)
+wxEventType wxWindowGTK::GetScrollEventType(GtkRange* range)
 {
     DEBUG_MAIN_THREAD