1. wxStaticLine implemented (generic (ugly) and MSW versions)

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 842c71658726be598f4f47a463a8bfe2f06c16eb..ceb1255ac4d1a0416698b02e788228d53b9754db 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -401,7 +401,7 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
     if (!facename.IsEmpty())
     {
         wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() );
     if (!facename.IsEmpty())
     {
         wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() );

-        GdkFont *test = gdk_font_load( wxConv_libc.cWX2MB(wxBuffer) );
+        GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) );

         if (test)
        {
            gdk_font_unref( test );
         if (test)
        {
            gdk_font_unref( test );


@@ -427,7 +427,7 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
     wxSprintf( wxBuffer, _T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*"),
         xfamily, xweight, xstyle, pointSize);
     
     wxSprintf( wxBuffer, _T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*"),
         xfamily, xweight, xstyle, pointSize);
     

-    return gdk_font_load( wxConv_libc.cWX2MB(wxBuffer) );
+    return gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) );

 }
 
 static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight, 
 }
 
 static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight,