X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..47678105333557b1a5f225fe57e4ae27fa4b8706:/src/gtk1/data.cpp

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 3d2f42a354..abf1e939c0 100644
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifdef __GNUG__
 // #pragma implementation
 #endif
@@ -16,22 +15,18 @@
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/dc.h"
+
+#if wxUSE_ACCEL
 #include "wx/accel.h"
+#endif
+
 #include "wx/dcps.h"
 #include "wx/icon.h"
 
 #define _MAXPATHLEN 500
 
-/* Used for X resources */
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
-
-wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL;
-XrmDatabase wxResourceDatabase;
-
 /* Useful buffer, initialized in wxCommonInit */
-char *wxBuffer = (char *) NULL;
+wxChar *wxBuffer = (wxChar *) NULL;
 
 /* Windows List */
 wxWindowList wxTopLevelWindows;
@@ -39,12 +34,6 @@ wxWindowList wxTopLevelWindows;
 /* List of windows pending deletion */
 wxList wxPendingDelete;
 
-#if wxUSE_THREADS
-/* List of events pending processing */
-wxList *wxPendingEvents = NULL;
-wxCriticalSection *wxPendingEventsLocker = NULL;
-#endif
-
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;
@@ -55,6 +44,9 @@ 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;
+
 /* 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;
@@ -142,6 +134,7 @@ wxColour   wxNullColour;
 wxPalette  wxNullPalette;
 
 /* Default window names */
+const wxChar *wxControlNameStr = wxT("control");
 const wxChar *wxButtonNameStr = wxT("button");
 const wxChar *wxCanvasNameStr = wxT("canvas");
 const wxChar *wxCheckBoxNameStr = wxT("check");
@@ -177,6 +170,7 @@ const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error");
 const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
+const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 
 /* See wx/utils.h */
 const wxChar *wxFloatToStringStr = wxT("%.2f");