fixed new charset detection code (langinfo.h not included in intl.cpp; langinfo.h...

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

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 1298601a79de994b22c6b726c7896c9097eb4dfd..4b26ff00af42d2b17e5d4b8d13549c6147184491 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -11,17 +11,13 @@
 #pragma implementation "fontdlg.h"
 #endif
 
 #pragma implementation "fontdlg.h"
 #endif
 

+#include "wx/fontutil.h"

 #include "wx/fontdlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
 #include "wx/fontdlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

-#ifdef __VMS__
-#define gtk_font_selection_dialog_get_type gtk_font_selection_dialog_get_t
-#define gtk_font_selection_dialog_get_font gtk_font_selection_dialog_get_f
-#define gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_getnf
-#endif

 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------


@@ -69,7 +65,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 
     if (!gfont)
     {
 
     if (!gfont)
     {

-        wxMessageBox(_("Please choose a valid font."), _("Error"), wxOK);
+        wxMessageBox(_("Please choose a valid font."), _("Error"),
+                     wxOK | wxICON_ERROR);

         return;
     }
 
         return;
     }
 


@@ -106,13 +103,12 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 
     // we ignore the facename here - should be enough to choose an arbitrary
     // one if the registry/encoding are specified
 
     // we ignore the facename here - should be enough to choose an arbitrary
     // one if the registry/encoding are specified

-    //  dialog->m_fontData.EncodingInfo().facename = xfamily;

     fontdata.EncodingInfo().xregistry = xregistry;
     fontdata.EncodingInfo().xencoding = xencoding;
 
     // pass fontdata to wxFont ctor so that it can get the encoding from there
     // if it is already known (otherwise it will try to deduce it itself)
     fontdata.EncodingInfo().xregistry = xregistry;
     fontdata.EncodingInfo().xencoding = xencoding;
 
     // pass fontdata to wxFont ctor so that it can get the encoding from there
     // if it is already known (otherwise it will try to deduce it itself)

-    dialog->m_fontData.SetChosenFont( wxFont(fontname, fontdata) );
+    dialog->m_fontData.SetChosenFont(wxFont(fontname, fontdata.GetEncoding()));

 
     g_free( fontname );
 
 
     g_free( fontname );
 


@@ -179,6 +175,26 @@ 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 )
+        {
+            const wxString& fontname = info->xFontName;
+            if ( !fontname )
+                font.GetInternalFont();
+            gtk_font_selection_dialog_set_font_name(sel,
+                                                    wxConvCurrent->cWX2MB(fontname));
+        }
+        else
+        {
+            // this is not supposed to happen!
+            wxFAIL_MSG(_T("font is ok but no native font info?"));
+        }
+    }

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