From: Robert Roebling <robert@roebling.de>
Date: Thu, 24 Apr 2003 14:35:29 +0000 (+0000)
Subject:   Upported minor fix for font dialog.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e7d0063bcacb38a77247312f3e598cf6398e267

  Upported minor fix for font dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 3dfb008131..0c11da99a5 100644
--- 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);
+
+#ifndef __WXGTK20__
     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;
     }
+#endif
 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
-    
-    // printf( "font %s\n", fontname );
-
     dialog->SetChosenFont( fontname);
 
     g_free( fontname );
diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 3dfb008131..0c11da99a5 100644
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/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);
+
+#ifndef __WXGTK20__
     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;
     }
+#endif
 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
-    
-    // printf( "font %s\n", fontname );
-
     dialog->SetChosenFont( fontname);
 
     g_free( fontname );