Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keep the old wxFont::Create() signature (changed by font size in pixels patch) to fix XTI and to preserve backwards compatibility

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-27 11:02:11 +00:00
parent 77d8d6cd64
commit df455719ff
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/msw/font.h
View File

@@ -39,8 +39,7 @@ public:
{
Init();
(void)Create(size, wxSize(0, 0), FALSE, family, style, weight,
underlined, face, encoding);
(void)Create(size, family, style, weight, underlined, face, encoding);
}
wxFont(const wxSize& pixelSize,
@@ -53,8 +52,8 @@ public:
{
Init();
(void)Create(0, pixelSize, TRUE, family, style, weight, underlined,
face, encoding);
(void)Create(pixelSize, family, style, weight,
underlined, face, encoding);
}
wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
@@ -67,14 +66,28 @@ public:
wxFont(const wxString& fontDesc);
bool Create(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
return DoCreate(size, wxDefaultSize, false, family, style,
weight, underlined, face, encoding);
}
bool Create(const wxSize& pixelSize,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
return DoCreate(-1, pixelSize, true, family, style,
weight, underlined, face, encoding);
}
bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
@@ -123,6 +136,17 @@ public:
*/
protected:
// real font creation function, used in all cases
bool DoCreate(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
int family,
int style,
int weight,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
// common part of all ctors

2
src/msw/font.cpp
View File

@@ -787,7 +787,7 @@ wxFont::wxFont(const wxString& fontdesc)
/* Constructor for a font. Note that the real construction is done
* in wxDC::SetFont, when information is available about scaling etc.
*/
bool wxFont::Create(int pointSize,
bool wxFont::DoCreate(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
int family,