Preserve original menu label for later retrieval

[wxWidgets.git] / src / gtk / font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 31338b9b5a85226648ccf97db0f83cb302e7f073..94cc8e66d5f6e10f0bd29d7444f2d11ae0429448 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -127,7 +127,7 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData


@@ -157,6 +157,8 @@ void wxFontRefData::Init(int pointSize,
 
     m_underlined = underlined;
     m_encoding = encoding;
 
     m_underlined = underlined;
     m_encoding = encoding;

+    if ( m_encoding == wxFONTENCODING_DEFAULT )
+        m_encoding = wxFont::GetDefaultEncoding();

 
     m_noAA = false;
 
 
     m_noAA = false;
 


@@ -201,7 +203,7 @@ void wxFontRefData::InitFromNative()
     PangoFontDescription *desc = m_nativeFontInfo.description;
 
     // init fields
     PangoFontDescription *desc = m_nativeFontInfo.description;
 
     // init fields

-    m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
+    m_faceName = wxGTK_CONV_BACK_SYS(pango_font_description_get_family(desc));

 
     // Pango sometimes needs to have a size
     int pango_size = pango_font_description_get_size( desc );
 
     // Pango sometimes needs to have a size
     int pango_size = pango_font_description_get_size( desc );