X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfbd6dc1921a17bd880d580dd660e8bc478a9391..d08f23a71cc77701bb2a02da0aa96835b6d5231b:/src/msw/data.cpp?ds=inline diff --git a/src/msw/data.cpp b/src/msw/data.cpp index 1b24fc3e3a..0a9c7286a2 100644 --- a/src/msw/data.cpp +++ b/src/msw/data.cpp @@ -37,20 +37,13 @@ wxWindowList wxTopLevelWindows; // List of windows pending deletion wxList WXDLLEXPORT wxPendingDelete; -// 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 -wxBrushList *wxTheBrushList = NULL; -wxPenList *wxThePenList = NULL; wxFontList *wxTheFontList = NULL; -wxBitmapList *wxTheBitmapList = NULL; - +wxPenList *wxThePenList = NULL; +wxBrushList *wxTheBrushList = NULL; +wxBitmapList *wxTheBitmapList = NULL; wxColourDatabase *wxTheColourDatabase = NULL; // Stock objects @@ -58,8 +51,8 @@ wxFont *wxNORMAL_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; @@ -95,14 +88,14 @@ wxCursor *wxCROSS_CURSOR = NULL; // 'Null' objects wxAcceleratorTable wxNullAcceleratorTable; -wxBitmap wxNullBitmap; -wxIcon wxNullIcon; -wxCursor wxNullCursor; -wxPen wxNullPen; -wxBrush wxNullBrush; +wxBitmap wxNullBitmap; +wxIcon wxNullIcon; +wxCursor wxNullCursor; +wxPen wxNullPen; +wxBrush wxNullBrush; wxPalette wxNullPalette; -wxFont wxNullFont; -wxColour wxNullColour; +wxFont wxNullFont; +wxColour wxNullColour; // Default window names const wxChar *wxControlNameStr = wxT("control");