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

order wxFontRefData member constructor initialization according to member declaration

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2005-02-06 14:28:21 +00:00
parent 18216ae352
commit e369bddbfb
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mac/carbon/font.cpp
View File

@@ -46,8 +46,8 @@ public:
, m_macFontNum(0) , m_macFontNum(0)
, m_macFontSize(0) , m_macFontSize(0)
, m_macFontStyle(0) , m_macFontStyle(0)
, m_macATSUFontID(0)
, m_macATSUStyle(0) , m_macATSUStyle(0)
, m_macATSUFontID(0)
{ {
Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
wxT("Geneva"), wxFONTENCODING_DEFAULT); wxT("Geneva"), wxFONTENCODING_DEFAULT);
@@ -66,8 +66,8 @@ public:
, m_macFontNum(data.m_macFontNum) , m_macFontNum(data.m_macFontNum)
, m_macFontSize(data.m_macFontSize) , m_macFontSize(data.m_macFontSize)
, m_macFontStyle(data.m_macFontStyle) , m_macFontStyle(data.m_macFontStyle)
, m_macATSUFontID(data.m_macATSUFontID)
, m_macATSUStyle(0) , m_macATSUStyle(0)
, m_macATSUFontID(data.m_macATSUFontID)
{ {
Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight, Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
data.m_underlined, data.m_faceName, data.m_encoding); data.m_underlined, data.m_faceName, data.m_encoding);
@@ -91,8 +91,8 @@ public:
, m_macFontNum(0) , m_macFontNum(0)
, m_macFontSize(0) , m_macFontSize(0)
, m_macFontStyle(0) , m_macFontStyle(0)
, m_macATSUFontID(0)
, m_macATSUStyle(0) , m_macATSUStyle(0)
, m_macATSUFontID(0)
{ {
Init(size, family, style, weight, underlined, faceName, encoding); Init(size, family, style, weight, underlined, faceName, encoding);
} }
@@ -112,14 +112,14 @@ protected:
wxFontEncoding encoding); wxFontEncoding encoding);
// font characterstics // font characterstics
int m_fontId; int m_fontId;
int m_pointSize; int m_pointSize;
int m_family; int m_family;
int m_style; int m_style;
int m_weight; int m_weight;
bool m_underlined; bool m_underlined;
wxString m_faceName; wxString m_faceName;
wxFontEncoding m_encoding; wxFontEncoding m_encoding;
bool m_noAA; // No anti-aliasing bool m_noAA; // No anti-aliasing
public: public: