X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd046d42215b11a898c3519889c8170134cb749a..68cb30154e69c03d141aa649f024e916c5a96540:/src/gtk/data.cpp diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp index 6ecbf2a917..dc6b6523a8 100644 --- 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");