compilation fix

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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index cff64e171c6aec79375d216bf4dcc3c9a0a80180..2802d1170b9c04ac470b42f86da095eeebe5f0de 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -235,7 +235,13 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL;
 #elif defined(__WXGTK__)
     wxNativeFont wxLoadFont(const wxString& fontSpec)
     {
 #elif defined(__WXGTK__)
     wxNativeFont wxLoadFont(const wxString& fontSpec)
     {

-       return gdk_font_load( wxConvertWX2MB(fontSpec) );
+        // VZ: we should use gdk_fontset_load() instead of gdk_font_load()
+        //     here to be able to display Japanese fonts correctly (at least
+        //     this is what people report) but unfortunately doing it results
+        //     in tons of warnings when using GTK with "normal" European
+        //     languages and so we can't always do it and I don't know enough
+        //     to determine when should this be done... (FIXME)
+        return gdk_font_load( wxConvertWX2MB(fontSpec) );

     }
 
     inline void wxFreeFont(wxNativeFont font)
     }
 
     inline void wxFreeFont(wxNativeFont font)


@@ -388,16 +394,20 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
             return FALSE;
         }
 
             return FALSE;
         }
 

-        fontElements[n] = tokenizer.GetNextToken();
+        wxString field = tokenizer.GetNextToken();
+        if ( !field.empty() && field != _T('*') )
+        {
+            // we're really initialized now
+            m_isDefault = FALSE;
+        }
+
+        fontElements[n] = field;

     }
 
     // this should be all
     if ( tokenizer.HasMoreTokens() )
         return FALSE;
 
     }
 
     // this should be all
     if ( tokenizer.HasMoreTokens() )
         return FALSE;
 

-    // we're initialized now
-    m_isDefault = FALSE;
-

     return TRUE;
 }
 
     return TRUE;
 }