warning about standard controls

[wxWidgets.git] / src / common / fontcmn.cpp

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index cb10a1772d610d80a11d51dea6bd10a02949f026..99466a583e84a4e7166e099f64a4f7d10551c20b 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -29,8 +29,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/font.h"
-#include "wx/intl.h"
+    #include "wx/dc.h"
+    #include "wx/font.h"
+    #include "wx/intl.h"
+    #include "wx/dcscreen.h"
 #endif // WX_PRECOMP
 
 #include "wx/gdicmn.h"
@@ -53,11 +55,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;
-    int smallestBad;
+    int largestGood = 0;
+    int smallestBad = 0;
 
     bool initialGoodFound = false;
     bool initialBadFound = false;
@@ -185,10 +187,10 @@ wxFont *wxFontBase::New(const wxSize& pixelSize,
     return new wxFont(pixelSize, family, style, weight, underlined,
                       face, encoding);
 #else
-    wxFont * ret = New(10, family, style, weight, underlined, face, encoding);
+    wxFont *self = New(10, family, style, weight, underlined, face, encoding);
     wxScreenDC dc;
-    ret->AdjustFontSize(*(wxFont *)this, dc, pixelSize);
-    return ret;
+    AdjustFontSize(*(wxFont *)self, dc, pixelSize);
+    return self;
 #endif
 }
 
@@ -601,7 +603,7 @@ wxString wxNativeFontInfo::ToUserString() const
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
-        desc << _T(' ') << wxFontMapper::Get()->GetEncodingName(enc);
+        desc << _T(' ') << wxFontMapper::GetEncodingName(enc);
     }
 #endif // wxUSE_FONTMAP