Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index a1d49974646b80f381dcc084bc07d0d29d91d49d..6a6ab75b09dc42d63f0b49685127b9c37904e087 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -46,8 +46,8 @@ public:
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
-        , m_macATSUFontID(0)
         , m_macATSUStyle(0)
+        , m_macATSUFontID(0)
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
              wxT("Geneva"), wxFONTENCODING_DEFAULT);
@@ -66,8 +66,8 @@ public:
         , m_macFontNum(data.m_macFontNum)
         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)
-        , m_macATSUFontID(data.m_macATSUFontID)
         , m_macATSUStyle(0)
+        , m_macATSUFontID(data.m_macATSUFontID)
     {
         Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
              data.m_underlined, data.m_faceName, data.m_encoding);
@@ -91,8 +91,8 @@ public:
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
-        , m_macATSUFontID(0)
         , m_macATSUStyle(0)
+        , m_macATSUFontID(0)
     {
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
@@ -112,14 +112,14 @@ protected:
               wxFontEncoding encoding);
 
     // font characterstics
-    int            m_fontId;
-    int            m_pointSize;
-    int            m_family;
-    int            m_style;
-    int            m_weight;
-    bool           m_underlined;
-    wxString       m_faceName;
-    wxFontEncoding m_encoding;
+    int             m_fontId;
+    int             m_pointSize;
+    int             m_family;
+    int             m_style;
+    int             m_weight;
+    bool            m_underlined;
+    wxString        m_faceName;
+    wxFontEncoding  m_encoding;
     bool            m_noAA;      // No anti-aliasing
     
 public:
@@ -509,31 +509,31 @@ void wxFont::SetNoAntiAliasing( bool no )
 
 int wxFont::GetPointSize() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_pointSize;
 }
 
 int wxFont::GetFamily() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
     return M_FONTDATA->m_underlined;
 }
 
@@ -551,31 +551,31 @@ wxFontEncoding wxFont::GetEncoding() const
 
 bool wxFont::GetNoAntiAliasing() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
     return M_FONTDATA->m_noAA;
 }
 
 short wxFont::MacGetFontNum() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_macFontNum;
 }
 
 short wxFont::MacGetFontSize() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_macFontSize;
 }
 
 wxByte wxFont::MacGetFontStyle() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_macFontStyle;
 }
 
 wxUint32 wxFont::MacGetATSUFontID() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_macATSUFontID;
 }
 
@@ -587,13 +587,13 @@ void* wxFont::MacGetATSUStyle() const
 
 wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_macATSUAdditionalQDStyles;
 }
 
 wxUint16 wxFont::MacGetThemeFontID() const 
 {
-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
     return M_FONTDATA->m_macThemeFontID;
 }