fix InsertSeparator() (patch 420987)

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

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 3d2f42a3548136df9165cb06893fa9418b59d0e8..dc6b6523a8562816e30755763106bcb225ee4fc2 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifdef __GNUG__
 // #pragma implementation
 #endif
 #ifdef __GNUG__
 // #pragma implementation
 #endif


@@ -16,22 +15,18 @@
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/dc.h"

+
+#if wxUSE_ACCEL

 #include "wx/accel.h"
 #include "wx/accel.h"

+#endif
+

 #include "wx/dcps.h"
 #include "wx/icon.h"
 
 #define _MAXPATHLEN 500
 
 #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 */
 /* Useful buffer, initialized in wxCommonInit */

-char *wxBuffer = (char *) NULL;
+wxChar *wxBuffer = (wxChar *) NULL;

 
 /* Windows List */
 wxWindowList wxTopLevelWindows;
 
 /* Windows List */
 wxWindowList wxTopLevelWindows;


@@ -39,12 +34,6 @@ wxWindowList wxTopLevelWindows;
 /* List of windows pending deletion */
 wxList wxPendingDelete;
 
 /* 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;
 /* 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 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;
 /* 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;


@@ -62,12 +54,6 @@ bool g_isIdle = FALSE;
 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 
 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 

-/* Custom OS version, as optionally placed in wx.ini/.wxrc
- * Currently this can be Win95, Windows, Win32s, WinNT.
- * For some systems, you can't tell until run-time what services you
- * have. See wxGetOsVersion, which uses this string if present. */
-char *wxOsVersion = (char *) NULL;
-

 /* For printing several pages */
 int wxPageNumber;
 
 /* For printing several pages */
 int wxPageNumber;
 


@@ -142,6 +128,7 @@ wxColour   wxNullColour;
 wxPalette  wxNullPalette;
 
 /* Default window names */
 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");
 const wxChar *wxButtonNameStr = wxT("button");
 const wxChar *wxCanvasNameStr = wxT("canvas");
 const wxChar *wxCheckBoxNameStr = wxT("check");


@@ -177,6 +164,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 *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");
 
 /* See wx/utils.h */
 const wxChar *wxFloatToStringStr = wxT("%.2f");