A few tweaks and cleanups

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

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 103f694ce0abd2858b26f789a69027847b3c6f41..8642adb452fb781a37f93a308fb352730ad865c6 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -37,27 +37,13 @@ wxWindowList wxTopLevelWindows;
 // List of windows pending deletion
 wxList WXDLLEXPORT wxPendingDelete;
 
 // List of windows pending deletion
 wxList WXDLLEXPORT wxPendingDelete;
 

-// Current cursor, in order to hang on to
-// cursor handle when setting the cursor globally
-wxCursor *g_globalCursor = 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 = NULL;
-

 int wxPageNumber;
 
 // GDI Object Lists
 int wxPageNumber;
 
 // GDI Object Lists

-wxBrushList *wxTheBrushList = NULL;
-wxPenList   *wxThePenList = NULL;

 wxFontList   *wxTheFontList = NULL;
 wxFontList   *wxTheFontList = NULL;

-wxBitmapList   *wxTheBitmapList = NULL;
-
+wxPenList    *wxThePenList = NULL;
+wxBrushList  *wxTheBrushList = NULL;
+wxBitmapList *wxTheBitmapList = NULL;

 wxColourDatabase *wxTheColourDatabase = NULL;
 
 // Stock objects
 wxColourDatabase *wxTheColourDatabase = NULL;
 
 // Stock objects


@@ -65,8 +51,8 @@ wxFont *wxNORMAL_FONT;
 wxFont *wxSMALL_FONT;
 wxFont *wxITALIC_FONT;
 wxFont *wxSWISS_FONT;
 wxFont *wxSMALL_FONT;
 wxFont *wxITALIC_FONT;
 wxFont *wxSWISS_FONT;

-wxPen *wxRED_PEN;

 
 

+wxPen *wxRED_PEN;

 wxPen *wxCYAN_PEN;
 wxPen *wxGREEN_PEN;
 wxPen *wxBLACK_PEN;
 wxPen *wxCYAN_PEN;
 wxPen *wxGREEN_PEN;
 wxPen *wxBLACK_PEN;


@@ -101,15 +87,20 @@ wxCursor *wxHOURGLASS_CURSOR = NULL;
 wxCursor *wxCROSS_CURSOR = NULL;
 
 // 'Null' objects
 wxCursor *wxCROSS_CURSOR = NULL;
 
 // 'Null' objects

+#if wxUSE_ACCEL

 wxAcceleratorTable wxNullAcceleratorTable;
 wxAcceleratorTable wxNullAcceleratorTable;

-wxBitmap wxNullBitmap;
-wxIcon   wxNullIcon;
-wxCursor wxNullCursor;
-wxPen    wxNullPen;
-wxBrush  wxNullBrush;
+#endif // wxUSE_ACCEL
+
+wxBitmap  wxNullBitmap;
+wxIcon    wxNullIcon;
+wxCursor  wxNullCursor;
+wxPen     wxNullPen;
+wxBrush   wxNullBrush;
+#if wxUSE_PALETTE

 wxPalette wxNullPalette;
 wxPalette wxNullPalette;

-wxFont   wxNullFont;
-wxColour wxNullColour;
+#endif // wxUSE_PALETTE
+wxFont    wxNullFont;
+wxColour  wxNullColour;

 
 // Default window names
 const wxChar *wxControlNameStr = wxT("control");
 
 // Default window names
 const wxChar *wxControlNameStr = wxT("control");


@@ -144,8 +135,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 *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 *wxTreeCtrlNameStr = wxT("treeCtrl");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");