compilation fix for not MSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index cb10a1772d610d80a11d51dea6bd10a02949f026..c2de94c21efa34915ef0dca54079b0a82ef30ab0 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -29,8 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #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"
 #endif // WX_PRECOMP
 
 #include "wx/gdicmn.h"


@@ -185,10 +186,10 @@ wxFont *wxFontBase::New(const wxSize& pixelSize,
     return new wxFont(pixelSize, family, style, weight, underlined,
                       face, encoding);
 #else
     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;
     wxScreenDC dc;

-    ret->AdjustFontSize(*(wxFont *)this, dc, pixelSize);
-    return ret;
+    AdjustFontSize(*(wxFont *)self, dc, pixelSize);
+    return self;

 #endif
 }
 
 #endif
 }