fixed calling Union() or Offset() on a previously Clear()ed region, also removed...

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

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 0a9c7286a28779aeddbc2f0d8357b4b35736e120..8642adb452fb781a37f93a308fb352730ad865c6 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -87,13 +87,18 @@ wxCursor *wxHOURGLASS_CURSOR = NULL;
 wxCursor *wxCROSS_CURSOR = NULL;
 
 // 'Null' objects
+#if wxUSE_ACCEL
 wxAcceleratorTable wxNullAcceleratorTable;
+#endif // wxUSE_ACCEL
+
 wxBitmap  wxNullBitmap;
 wxIcon    wxNullIcon;
 wxCursor  wxNullCursor;
 wxPen     wxNullPen;
 wxBrush   wxNullBrush;
+#if wxUSE_PALETTE
 wxPalette wxNullPalette;
+#endif // wxUSE_PALETTE
 wxFont    wxNullFont;
 wxColour  wxNullColour;
 
@@ -130,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 *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("/");