multiple fixes to wxJoystick under Unix and new index-based API for accessing joystic...

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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 3d09eb207c4edd6e9eca00d556b0976104b19669..1a19014406575fc04a86e42b3f419fda4deac777 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -136,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


@@ -327,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)


@@ -340,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__