X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dfaa4e5d9b8e6c741971884ec896f15f71712f4..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/gtk/fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 98d1bedcd8..4b26ff00af 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -11,13 +11,14 @@
 #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 "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -33,7 +34,7 @@ extern bool g_isIdle;
 static
 bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
 /*
@@ -52,30 +53,70 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
+#ifdef __WXGTK12__
 static
 void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
     GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
-    
+
     if (!gfont)
     {
-        wxMessageBox(_("Please choose a valid font."), _("Error"), wxOK);
+        wxMessageBox(_("Please choose a valid font."), _("Error"),
+                     wxOK | wxICON_ERROR);
         return;
     }
-    
+
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
-    wxFont font( gfont, fontname );
+
+    // extract the relevant bits from it
+    wxString xregistry, xencoding;
+    char *dash = strrchr(fontname, '-');    // find the last dash
+    if ( dash )
+    {
+        xencoding = dash + 1;
+        *dash = '\0';
+        dash = strrchr(fontname, '-');      // the last before one
+        if ( dash )
+        {
+            xregistry = dash + 1;
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("no registry in X font spec?") );
+        }
+
+        // restore the dash we changed to NUL above
+        *(fontname + strlen(fontname)) = '-';
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("no encoding in X font spec?") );
+    }
+
+    // transfer the X registry/encoding to wxFontData - they are used by
+    // wxFontMapper after wxFontDialog returns
+    wxFontData& fontdata = dialog->m_fontData;
+
+    // we ignore the facename here - should be enough to choose an arbitrary
+    // one if the registry/encoding are specified
+    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.GetEncoding()));
+
     g_free( fontname );
-    dialog->m_fontData.SetChosenFont( font );
-    
+
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );
 }
+#endif // GTK+ 1.2 and later only
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
@@ -84,7 +125,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 static
 void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
@@ -98,16 +139,17 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog)
 
-wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
+wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
+            : m_fontData(*fontdata)
 {
     m_needParent = FALSE;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, 
-	             wxDefaultValidator, _T("fontdialog") ))
+        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
+                     wxDefaultValidator, wxT("fontdialog") ))
     {
-        wxFAIL_MSG( _T("wxXX creation failed") );
-	return;
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+        return;
     }
     
     wxString m_message( _("Choose font") );
@@ -118,7 +160,7 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
     gtk_widget_set_uposition( m_widget, x, y );
 
     GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
-    
+
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
 
@@ -127,12 +169,32 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this );
-      
+
     // strange way to internationalize
     gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
-    
+
     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()