X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76e23cdba3a2e58e788dd18734e7893185531a5b..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/msw/data.cpp?ds=inline diff --git a/src/msw/data.cpp b/src/msw/data.cpp index 0a9c7286a2..8642adb452 100644 --- 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("/");