fixed Cyrillic encodings

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

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 6ecbf2a917a5dbde3d6638a8aee3e1569bd547ee..dc6b6523a8562816e30755763106bcb225ee4fc2 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -15,7 +15,11 @@
 #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"
 
@@ -50,12 +54,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 +128,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");