Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / gtk1 / data.cpp

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 48730c7ec978231ec0b4cc76a2dd4de868bb1a89..f1f49656b80444dfe24b1edf0c559ecbc8be271c 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -13,11 +13,10 @@
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/window.h"

+    #include "wx/dc.h"
+    #include "wx/cursor.h"

 #endif
 
 #endif
 

-#include "wx/dc.h"
-#include "wx/cursor.h"
-

 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;