fixed crash in iconv_close() as well

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 94b9bab49bf9940bfa1630b6326bf13c0d67078d..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,6 +82,11 @@ 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 *wxFontBase::GetNativeFontInfo() const
 {
 #ifdef wxNO_NATIVE_FONTINFO


@@ -391,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
 {


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

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