don't crash if we can't detect g_wcCharset

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index c8e3bec3614340d76f805b61a7b25e6483ddd240..320d37935ecdc95f6a9caaa618943452aefe0df9 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,


@@ -77,13 +82,18 @@ wxFont *wxFontBase::New(const wxString& strNativeFontDesc)
     return New(fontInfo);
 }
 
     return New(fontInfo);
 }
 

+bool wxFontBase::IsFixedWidth() const
+{
+    return GetFamily() == wxFONTFAMILY_TELETYPE;
+}
+

 wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 {
 #ifdef wxNO_NATIVE_FONTINFO
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
 
     fontInfo->SetPointSize(GetPointSize());
 wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 {
 #ifdef wxNO_NATIVE_FONTINFO
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
 
     fontInfo->SetPointSize(GetPointSize());

-    fontInfo->SetFamily(GetFamily());
+    fontInfo->SetFamily((wxFontFamily)GetFamily());

     fontInfo->SetStyle((wxFontStyle)GetStyle());
     fontInfo->SetWeight((wxFontWeight)GetWeight());
     fontInfo->SetUnderlined(GetUnderlined());
     fontInfo->SetStyle((wxFontStyle)GetStyle());
     fontInfo->SetWeight((wxFontWeight)GetWeight());
     fontInfo->SetUnderlined(GetUnderlined());


@@ -257,7 +267,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    family = (int)l;
+    family = (wxFontFamily)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )


@@ -339,6 +349,11 @@ wxString wxNativeFontInfo::GetFaceName() const
     return faceName;
 }
 
     return faceName;
 }
 

+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+    return family;
+}
+

 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 {
     return encoding;
 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 {
     return encoding;


@@ -366,7 +381,12 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_)
 
 void wxNativeFontInfo::SetFaceName(wxString facename_)
 {
 
 void wxNativeFontInfo::SetFaceName(wxString facename_)
 {

-    facename = facename_;
+    faceName = facename_;
+}
+
+void wxNativeFontInfo::SetFamily(wxFontFamily family_)
+{
+    family = family_;

 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)


@@ -381,7 +401,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
 // format there anyhow (but there is a well-defined standard for X11 fonts used
 // by wxGTK and wxMotif)
 
 // format there anyhow (but there is a well-defined standard for X11 fonts used
 // by wxGTK and wxMotif)
 

-#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__)
+#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined (__WXPM__)

 
 wxString wxNativeFontInfo::ToUserString() const
 {
 
 wxString wxNativeFontInfo::ToUserString() const
 {


@@ -440,11 +460,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;
 }


@@ -461,7 +483,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() )
     {


@@ -491,11 +516,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() )


@@ -528,5 +555,5 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif // generic or wxMSW
+#endif // generic or wxMSW or wxOS2