fixed MSVC6 warning

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index cb10a1772d610d80a11d51dea6bd10a02949f026..dd3544a26be36ee1f82b80d4debab44528168ea4 100644 (file)
--- 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
@@ -29,8 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/font.h"
-#include "wx/intl.h"
+    #include "wx/font.h"
+    #include "wx/intl.h"
+    #include "wx/dcscreen.h"
 #endif // WX_PRECOMP
 
 #include "wx/gdicmn.h"
@@ -56,8 +57,8 @@
 static void AdjustFontSize(wxFont font, wxDC& dc, const wxSize& pixelSize)
 {
     int currentSize = font.GetPointSize();
-    int largestGood;
-    int smallestBad;
+    int largestGood wxDUMMY_INITIALIZE(0);
+    int smallestBad wxDUMMY_INITIALIZE(0);
 
     bool initialGoodFound = false;
     bool initialBadFound = false;
@@ -185,10 +186,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
 }