wxRTTI for wxPopupWindow in wxMGL

[wxWidgets.git] / src / common / fontcmn.cpp

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index bdc45ec3bcff1f02f0ab2a9405cac7711029d31c..938e9259fdc0e11ef88849216b89594163700874 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -49,6 +49,11 @@
 
 wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM;
 
 
 wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM;
 

+wxFontBase::~wxFontBase()
+{
+    // this destructor is required for Darwin
+}
+

 /* static */
 wxFont *wxFontBase::New(int size,
                         int family,
 /* static */
 wxFont *wxFontBase::New(int size,
                         int family,


@@ -450,11 +455,13 @@ wxString wxNativeFontInfo::ToUserString() const
         desc << _T(' ') << size;
     }
 
         desc << _T(' ') << size;
     }
 

+#if wxUSE_FONTMAP

     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
         desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc);
     }
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
         desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc);
     }

+#endif // wxUSE_FONTMAP

 
     return desc;
 }
 
     return desc;
 }


@@ -471,7 +478,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 
     wxString face;
     unsigned long size;
 
     wxString face;
     unsigned long size;

+
+#if wxUSE_FONTMAP

     wxFontEncoding encoding;
     wxFontEncoding encoding;

+#endif // wxUSE_FONTMAP

 
     while ( tokenizer.HasMoreTokens() )
     {
 
     while ( tokenizer.HasMoreTokens() )
     {


@@ -501,11 +511,13 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         {
             SetPointSize(size);
         }
         {
             SetPointSize(size);
         }

+#if wxUSE_FONTMAP

         else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
         }
         else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
         }

+#endif // wxUSE_FONTMAP

         else // assume it is the face name
         {
             if ( !face.empty() )
         else // assume it is the face name
         {
             if ( !face.empty() )