X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93c5dd39af2fb5eb12c5c837999be944543b21b0..4c151c737e514a8b8ccdc6eebc9a6d421e8d59ec:/src/gtk/data.cpp

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 37f4f0006c..60234d0fd6 100644
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -18,6 +18,7 @@
 #include "wx/dc.h"
 #include "wx/accel.h"
 #include "wx/dcps.h"
+#include "wx/icon.h"
 
 #define _MAXPATHLEN 500
 
@@ -46,7 +47,7 @@ wxCriticalSection *wxPendingEventsLocker = NULL;
 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
-wxCursor *g_globalCursor = (wxCursor *) NULL;
+wxCursor g_globalCursor;
 
 /* Don't allow event propagation during drag */
 bool g_blockEventsOnDrag = FALSE;
@@ -54,6 +55,10 @@ bool g_blockEventsOnDrag = FALSE;
 /* Don't allow mouse event propagation during scroll */
 bool g_blockEventsOnScroll = FALSE;
 
+/* TRUE when the message queue is empty. this gets set to
+   FALSE by all event callbacks before anything else is done */
+bool g_isIdle = FALSE;
+
 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 
@@ -123,7 +128,10 @@ wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
 /* 'Null' objects */
-wxAcceleratorTable   wxNullAcceleratorTable;
+#if wxUSE_ACCEL
+    wxAcceleratorTable   wxNullAcceleratorTable;
+#endif // wxUSE_ACCEL
+
 wxBitmap   wxNullBitmap;
 wxIcon     wxNullIcon;
 wxCursor   wxNullCursor;