A few tweaks and cleanups

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

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index e9e1c75c78e729a2469f14a601606cebdf78d386..8642adb452fb781a37f93a308fb352730ad865c6 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -87,16 +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;

+#endif // wxUSE_ACCEL
+

 wxBitmap  wxNullBitmap;
 wxIcon    wxNullIcon;
 wxCursor  wxNullCursor;
 wxPen     wxNullPen;
 wxBrush   wxNullBrush;
 wxBitmap  wxNullBitmap;
 wxIcon    wxNullIcon;
 wxCursor  wxNullCursor;
 wxPen     wxNullPen;
 wxBrush   wxNullBrush;

+#if wxUSE_PALETTE

 wxPalette wxNullPalette;
 wxPalette wxNullPalette;

+#endif // wxUSE_PALETTE

 wxFont    wxNullFont;
 wxColour  wxNullColour;
 wxFont    wxNullFont;
 wxColour  wxNullColour;

-wxNativeFontInfo wxNullNativeFontInfo;

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


@@ -131,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("/");