Fixed typo with TV_HITTESTINFO

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

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index db66e05e73daa7d60bb440588d82486db29c0b15..9971508a7b694ac4b93be8b6385865c59c0d80da 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

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


@@ -22,16 +21,8 @@
 
 #define _MAXPATHLEN 500
 
 
 #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;


@@ -49,6 +40,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;


@@ -136,6 +130,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");


@@ -171,6 +166,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");