From 2f35f36bbcde256c802a4e0871c3d74e39ee476c Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 12 Jun 2004 12:36:26 +0000
Subject: [PATCH] fixed setting of initial font under wxGTK2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/fontdlg.cpp  | 13 ++++++-------
 src/gtk1/fontdlg.cpp | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 1bab264b82..fe2fe16ec3 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -152,7 +152,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
 
-#ifndef __WXGTK20__
     wxFont font = m_fontData.GetInitialFont();
     if( font.Ok() )
     {
@@ -160,14 +159,15 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
 
         if ( info )
         {
+
+#ifdef __WXGTK20__
+            const wxString& fontname = info->ToString();
+#else
             const wxString& fontname = info->GetXFontName();
             if ( !fontname )
                 font.GetInternalFont();
-            gtk_font_selection_dialog_set_font_name
-            (
-                sel,
-                wxConvCurrent->cWX2MB(fontname)
-            );
+#endif
+            gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
         }
         else
         {
@@ -175,7 +175,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
             wxFAIL_MSG(_T("font is ok but no native font info?"));
         }
     }
-#endif
 
     return TRUE;
 }
diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 1bab264b82..fe2fe16ec3 100644
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -152,7 +152,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
 
-#ifndef __WXGTK20__
     wxFont font = m_fontData.GetInitialFont();
     if( font.Ok() )
     {
@@ -160,14 +159,15 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
 
         if ( info )
         {
+
+#ifdef __WXGTK20__
+            const wxString& fontname = info->ToString();
+#else
             const wxString& fontname = info->GetXFontName();
             if ( !fontname )
                 font.GetInternalFont();
-            gtk_font_selection_dialog_set_font_name
-            (
-                sel,
-                wxConvCurrent->cWX2MB(fontname)
-            );
+#endif
+            gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
         }
         else
         {
@@ -175,7 +175,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
             wxFAIL_MSG(_T("font is ok but no native font info?"));
         }
     }
-#endif
 
     return TRUE;
 }
-- 
2.45.2