X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8caa4ed10ec5a89c61dff9d19c3c28ea729b4272..77611ad4da9df336a0805508276a81b8f4437107:/src/generic/proplist.cpp diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp index 6acfe87f88..60e51cadd6 100644 --- 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 *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 @@ -1851,7 +1851,7 @@ static wxBitmap *GetTickBitmap() { 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 ); @@ -1870,7 +1870,7 @@ static wxBitmap *GetCrossBitmap() { 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 );