2 step creation for wxDocMDIChildFrame (patch 661657)

[wxWidgets.git] / include / wx / mac / font.h

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index 2c3c17e84e13e899f3fbf815903883e70e634364..a49236c63623d250764b961caca26057f94de473 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -27,7 +27,7 @@ public:
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)
-        , m_faceName("Geneva")
+        , m_faceName(wxT("Geneva"))
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
         , m_macFontSize(0)
@@ -35,7 +35,7 @@ public:
         , m_macATSUFontID()
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             "Geneva", wxFONTENCODING_DEFAULT);
+             wxT("Geneva"), wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData(const wxFontRefData& data)
@@ -106,12 +106,12 @@ protected:
     bool            m_noAA;      // No anti-aliasing
     
 public:
-    short         m_macFontNum;
-    short         m_macFontSize;
+    short       m_macFontNum;
+    short       m_macFontSize;
     unsigned char  m_macFontStyle;
     wxUint32       m_macATSUFontID;
 public:
-    void               MacFindFont() ;
+    void        MacFindFont() ;
 };
 // ----------------------------------------------------------------------------
 // wxFont