From 9342fdbe5e17b09025d53496dd983bc7eb99f21f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 25 Sep 2004 23:37:29 +0000 Subject: [PATCH] compilation fix for not MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fontcmn.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index cb10a1772d..c2de94c21e 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -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" @@ -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 } -- 2.45.2