added wxLocale::GetLanguageName

[wxWidgets.git] / src / gtk / fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 3dfb008131d6bd2b6caf46d741138a183cc7325d..0c11da99a5db469b8f1ded86fafd270af3ccba1b 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -64,6 +64,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
         wxapp_install_idle_handler();
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
         wxapp_install_idle_handler();
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);

+
+#ifndef __WXGTK20__

     GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
 
     if (!gfont)
     GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
 
     if (!gfont)


@@ -72,11 +74,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
                      wxOK | wxICON_ERROR);
         return;
     }
                      wxOK | wxICON_ERROR);
         return;
     }

+#endif

 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);

-    
-    // printf( "font %s\n", fontname );
-

     dialog->SetChosenFont( fontname);
 
     g_free( fontname );
     dialog->SetChosenFont( fontname);
 
     g_free( fontname );