implement Set/GetTitle() (last part of patch 1679337)

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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index cc30f65aa1d1996dfe05aacb9bf0cd9de4ac1481..1a19014406575fc04a86e42b3f419fda4deac777 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -24,27 +24,35 @@
     #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()
     #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
     #include "wx/hash.h"
     #include "wx/utils.h"       // for wxGetDisplay()

+    #include "wx/module.h"

 #endif // PCH
 
 #endif // PCH
 

-#include "wx/fontutil.h"

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

-#include "wx/module.h"
+#include "wx/fontenum.h"

 
 #if wxUSE_PANGO
 
 #include "pango/pango.h"
 
 #ifdef __WXGTK20__
 
 #if wxUSE_PANGO
 
 #include "pango/pango.h"
 
 #ifdef __WXGTK20__

-#include "wx/gtk/private.h"
-extern GtkWidget *wxGetRootWindow();
+    #include "wx/gtk/private.h"
+    extern GtkWidget *wxGetRootWindow();
+
+    #define wxPANGO_CONV wxGTK_CONV_SYS

 #else
 #else

-#include "wx/x11/private.h"
+    #include "wx/x11/private.h"
+    #include "wx/gtk/private/string.h"
+
+    #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -128,9 +136,7 @@ bool wxNativeFontInfo::GetUnderlined() const
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
 
 wxString wxNativeFontInfo::GetFaceName() const
 {

-    wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
-
-    return tmp;
+    return wxGTK_CONV_BACK_SYS(pango_font_description_get_family(description));

 }
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 }
 
 wxFontFamily wxNativeFontInfo::GetFamily() const


@@ -258,9 +264,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, wxPANGO_CONV(facename));
+    return true;

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


@@ -305,7 +312,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
         }
     }
 
         }
     }
 

-    description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) );
+    description = pango_font_description_from_string(wxPANGO_CONV(str));
+
+    // ensure a valid facename is selected
+    if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
+        SetFaceName(wxNORMAL_FONT->GetFaceName());

 
     return true;
 }
 
     return true;
 }


@@ -314,7 +325,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxGtkString str(pango_font_description_to_string( description ));
 
 {
     wxGtkString str(pango_font_description_to_string( description ));
 

-    return wxGTK_CONV_BACK(str);
+    return wxGTK_CONV_BACK_SYS(str);

 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)
 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)


@@ -327,36 +338,6 @@ wxString wxNativeFontInfo::ToUserString() const
     return ToString();
 }
 
     return ToString();
 }
 

-// ----------------------------------------------------------------------------
-// wxNativeEncodingInfo
-// ----------------------------------------------------------------------------
-
-bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
-{
-    return false;
-}
-
-wxString wxNativeEncodingInfo::ToString() const
-{
-    return wxEmptyString;
-}
-
-bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
-{
-    return true;
-}
-
-bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                             wxNativeEncodingInfo *info)
-{
-    // all encodings are available in GTK+ 2 because we translate text in any
-    // encoding to UTF-8 internally anyhow
-    info->facename.clear();
-    info->encoding = encoding;
-
-    return true;
-}
-

 #else // GTK+ 1.x
 
 #ifdef __X__
 #else // GTK+ 1.x
 
 #ifdef __X__


@@ -774,9 +755,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))