Added background inheritance to wxUniv.

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

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 6ecbf2a917a5dbde3d6638a8aee3e1569bd547ee..4979216daea891c821bd5db3000248eca26ae2a1 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -15,15 +15,16 @@
 #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
 
-/* Useful buffer, initialized in wxCommonInit */
-wxChar *wxBuffer = (wxChar *) NULL;
-
 /* Windows List */
 wxWindowList wxTopLevelWindows;
 
@@ -50,12 +51,6 @@ bool g_isIdle = FALSE;
 /* 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;
 
@@ -130,6 +125,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");
@@ -161,8 +157,6 @@ const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text");
 const wxChar *wxMessageBoxCaptionStr = wxT("Message");
 const wxChar *wxFileSelectorPromptStr = wxT("Select a file");
 const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*");
-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");