merged MapBitmap() from 2.2 branch

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

diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index ae00740978947146f7e96f0bc9b4dac436b7a5b0..03f4aabf105a4245db1129e0cb2e48bf2e80911a 100644 (file)
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -29,12 +29,6 @@ wxWindowList wxTopLevelWindows;
 // List of windows pending deletion
 wxList WXDLLEXPORT wxPendingDelete;
 
-// List of events pending processing
-#if wxUSE_THREADS
-wxList *wxPendingEvents = NULL;
-wxCriticalSection *wxPendingEventsLocker = NULL;
-#endif
-
 // Current cursor, in order to hang on to
 // cursor handle when setting the cursor globally
 wxCursor *g_globalCursor = NULL;
@@ -42,12 +36,6 @@ 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
@@ -108,6 +96,7 @@ wxBrush  wxNullBrush;
 wxPalette wxNullPalette;
 wxFont   wxNullFont;
 wxColour wxNullColour;
+wxNativeFontInfo wxNullNativeFontInfo;
 
 // Default window names
 const wxChar *wxButtonNameStr = wxT("button");