Avoid problems with events that might be sent during creation of controls.

[wxWidgets.git] / src / unix / fontutil.cpp

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index cc30f65aa1d1996dfe05aacb9bf0cd9de4ac1481..93df3b0ced18602095f28df0ef3e5ad5de3ddfd8 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -24,17 +24,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/fontutil.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
     #include "wx/hash.h"
     #include "wx/utils.h"       // for wxGetDisplay()
 #endif // PCH
 
     #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
     #include "wx/hash.h"
     #include "wx/utils.h"       // for wxGetDisplay()
 #endif // PCH
 

-#include "wx/fontutil.h"

 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
 #include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
 #include "wx/module.h"

+#include "wx/fontenum.h"

 
 #if wxUSE_PANGO
 
 
 #if wxUSE_PANGO
 


@@ -258,9 +261,10 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     wxFAIL_MSG( _T("not implemented") );
 }
 
     wxFAIL_MSG( _T("not implemented") );
 }
 

-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)

 {
     pango_font_description_set_family(description, wxGTK_CONV_SYS(facename));
 {
     pango_font_description_set_family(description, wxGTK_CONV_SYS(facename));

+    return true;

 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))


@@ -307,6 +311,10 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 
     description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) );
 
 
     description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) );
 

+    // ensure a valid facename is selected
+    if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
+        SetFaceName(wxNORMAL_FONT->GetFaceName());
+

     return true;
 }
 
     return true;
 }
 


@@ -774,9 +782,10 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
     // can't do this under X
 }
 
     // can't do this under X
 }
 

-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)

 {
     SetXFontComponent(wxXLFD_FAMILY, facename);
 {
     SetXFontComponent(wxXLFD_FAMILY, facename);

+    return true;

 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))