move definitions from src/gtk/data.cpp to other appropriate places

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index fd78e1f321a341e7989e61aff077a4db3a3c2050..a323e44d694a37aa597b9b6607a154190d9030eb 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -379,7 +379,9 @@ GdkCursor *wxCursor::GetCursor() const
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
 // busy cursor routines
 //-----------------------------------------------------------------------------
 

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

 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;
 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 6a0f2172c6ab69039e48706703ddd5b9b3423db8..570d9b74b4a200709b6d6fad249c33fab5e50cbf 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -9,20 +9,3 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-
-#ifndef WX_PRECOMP
-    #include "wx/cursor.h"
-#endif
-
-/* Current cursor, in order to hang on to
- * cursor handle when setting the cursor globally */
-wxCursor g_globalCursor;
-
-/* Don't allow event propagation during drag */
-bool g_blockEventsOnDrag = false;
-
-/* Don't allow mouse event propagation during scroll */
-bool g_blockEventsOnScroll = false;
-
-/* Don't allow window closing if there are open dialogs */
-int g_openDialogs = 0;

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 7688d3329b11fb52cc7f9d95a236a71004b25495..425aac9ae91cc37c1823a10c9bc5d93e33035a2b 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -30,7 +30,8 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern int g_openDialogs;
+// Don't allow window closing if there are open dialogs
+int g_openDialogs;

 
 //-----------------------------------------------------------------------------
 // wxDialog
 
 //-----------------------------------------------------------------------------
 // wxDialog

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 098372578a8b20d85eb473e3b7e54167983eb641..0cb6276a0dac881f2e7dd8297544fe00c477246b 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -190,8 +190,10 @@
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool       g_blockEventsOnDrag;
-extern bool       g_blockEventsOnScroll;
+// Don't allow event propagation during drag
+bool g_blockEventsOnDrag;
+// Don't allow mouse event propagation during scroll
+bool g_blockEventsOnScroll;

 extern wxCursor   g_globalCursor;
 
 // mouse capture state: the window which has it and if the mouse is currently
 extern wxCursor   g_globalCursor;
 
 // mouse capture state: the window which has it and if the mouse is currently