Added an OS/2 section to the sql defines

[wxWidgets.git] / src / generic / proplist.cpp

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index 6acfe87f882ba162d0b87e4ce05efb9124e583b0..60e51cadd6cb55733c4093ca00ba940906e95cd4 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -433,7 +433,7 @@ bool wxPropertyListView::CreateControls()
     wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__
     wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__

-    wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize()+1, wxMODERN, wxNORMAL, wxNORMAL, FALSE, "Courier New");
+    wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL, FALSE, "Courier New");

 #else
     wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);
 #endif
 #else
     wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);
 #endif


@@ -1851,7 +1851,7 @@ static wxBitmap *GetTickBitmap()
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 

-        #if defined(__WXMSW__) || defined(__WXOS2__)
+        #if defined(__WXMSW__) || defined(__WXPM__)

             s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
         #else
             s_tickBitmap = new wxBitmap( tick_xpm );
             s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
         #else
             s_tickBitmap = new wxBitmap( tick_xpm );


@@ -1870,7 +1870,7 @@ static wxBitmap *GetCrossBitmap()
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 
     {
         s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
 

-        #if defined(__WXMSW__) || defined(__WXOS2__)
+        #if defined(__WXMSW__) || defined(__WXPM__)

             s_crossBitmap =  new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
         #else // XPMs
             s_crossBitmap =  new wxBitmap( cross_xpm );
             s_crossBitmap =  new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
         #else // XPMs
             s_crossBitmap =  new wxBitmap( cross_xpm );