X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1ce7c198801c1766083a245874f07ea20b16407..df1f4832e5e08438255594172b4c2b31b34f6453:/src/common/fontcmn.cpp?ds=sidebyside diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index dd3544a26b..dcb846f6f5 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -1,4 +1,4 @@ - ///////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // Name: common/fontcmn.cpp // Purpose: implementation of wxFontBase methods // Author: Vadim Zeitlin @@ -36,7 +36,7 @@ #include "wx/gdicmn.h" -#if defined(__WXMSW__) +#if defined(__WXMSW__) && !defined(__PALMOS__) #include "wx/msw/private.h" // includes windows.h for LOGFONT #include "wx/msw/winundef.h" #endif @@ -54,11 +54,11 @@ // helper functions // ---------------------------------------------------------------------------- -static void AdjustFontSize(wxFont font, wxDC& dc, const wxSize& pixelSize) +static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize) { int currentSize = font.GetPointSize(); - int largestGood wxDUMMY_INITIALIZE(0); - int smallestBad wxDUMMY_INITIALIZE(0); + int largestGood = 0; + int smallestBad = 0; bool initialGoodFound = false; bool initialBadFound = false;