Lots of OS/2 fixes mostly to do with painting

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

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 0cd7791011314b621de8df7b715ed59457674f39..47a34e1bcc3c31a6cd36707be5bd851fb459e6d1 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -174,6 +174,16 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );

+
+    wxFont font = m_fontData.GetInitialFont();
+    if( font.Ok() )
+    {
+        wxNativeFontInfo info = font.GetNativeFontInfo();
+
+        if( info.xFontName.IsEmpty() )
+            font.GetInternalFont();
+        gtk_font_selection_dialog_set_font_name(sel, wxConvCurrent->cWX2MB(info.xFontName.GetData()));
+    }

 }
 
 wxFontDialog::~wxFontDialog()
 }
 
 wxFontDialog::~wxFontDialog()