X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8375af8ff97a3649361b988a40b991a8cdaab09..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index cb99b9c398..086d296b85 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -16,65 +16,42 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
-    #include "wx/utils.h"
-    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/fontutil.h"
-
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static
-bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    win->Close();
-
-    return true;
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
+// "response"
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static
-void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
+static void response(GtkDialog* dialog, int response_id, wxFontDialog* win)
 {
-    GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
-
-    wxGtkString fontname(gtk_font_selection_dialog_get_font_name(fontdlg));
-    dialog->SetChosenFont( fontname);
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
+    int rc = wxID_CANCEL;
+    if (response_id == GTK_RESPONSE_OK)
+    {
+        rc = wxID_OK;
+#if GTK_CHECK_VERSION(3,2,0)
+        if (gtk_check_version(3,2,0) == NULL)
+        {
+            wxNativeFontInfo info;
+            info.description = gtk_font_chooser_get_font_desc(GTK_FONT_CHOOSER(dialog));
+            win->GetFontData().SetChosenFont(wxFont(info));
+        }
+        else
+#endif
+        {
+            GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(dialog);
+            wxGtkString name(gtk_font_selection_dialog_get_font_name(sel));
+            win->GetFontData().SetChosenFont(wxFont(wxString::FromUTF8(name)));
+        }
+    }
 
-extern "C" {
-static
-void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
-{
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    if (win->IsModal())
+        win->EndModal(rc);
+    else
+        win->Show(false);
 }
 }
 
@@ -86,7 +63,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 bool wxFontDialog::DoCreate(wxWindow *parent)
 {
-    parent = GetParentForModalDialog(parent);
+    parent = GetParentForModalDialog(parent, 0);
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
@@ -96,39 +73,47 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
         return false;
     }
 
-    wxString m_message( _("Choose font") );
-    m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
-
+    const wxString message(_("Choose font"));
+    GtkWindow* gtk_parent = NULL;
     if (parent)
-        gtk_window_set_transient_for(GTK_WINDOW(m_widget),
-                                     GTK_WINDOW(parent->m_widget));
+        gtk_parent = GTK_WINDOW(parent->m_widget);
 
-    GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
-
-    g_signal_connect (sel->ok_button, "clicked",
-                      G_CALLBACK (gtk_fontdialog_ok_callback), this);
-
-    g_signal_connect (sel->cancel_button, "clicked",
-                      G_CALLBACK (gtk_fontdialog_cancel_callback), this);
+#if GTK_CHECK_VERSION(3,2,0)
+    if (gtk_check_version(3,2,0) == NULL)
+        m_widget = gtk_font_chooser_dialog_new(wxGTK_CONV(message), gtk_parent);
+    else
+#endif
+    {
+        m_widget = gtk_font_selection_dialog_new(wxGTK_CONV(message));
+        if (gtk_parent)
+            gtk_window_set_transient_for(GTK_WINDOW(m_widget), gtk_parent);
+    }
+    g_object_ref(m_widget);
 
-    g_signal_connect (m_widget, "delete_event",
-                      G_CALLBACK (gtk_fontdialog_delete_callback), this);
+    g_signal_connect(m_widget, "response", G_CALLBACK(response), this);
 
     wxFont font = m_fontData.GetInitialFont();
-    if( font.Ok() )
+    if( font.IsOk() )
     {
         const wxNativeFontInfo *info = font.GetNativeFontInfo();
 
         if ( info )
         {
-
-            const wxString& fontname = info->ToString();
-            gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
+#if GTK_CHECK_VERSION(3,2,0)
+            if (gtk_check_version(3,2,0) == NULL)
+                gtk_font_chooser_set_font_desc(GTK_FONT_CHOOSER(m_widget), info->description);
+            else
+#endif
+            {
+                const wxString& fontname = info->ToString();
+                GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(m_widget);
+                gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
+            }
         }
         else
         {
             // this is not supposed to happen!
-            wxFAIL_MSG(_T("font is ok but no native font info?"));
+            wxFAIL_MSG(wxT("font is ok but no native font info?"));
         }
     }
 
@@ -139,9 +124,4 @@ wxFontDialog::~wxFontDialog()
 {
 }
 
-void wxFontDialog::SetChosenFont(const char *fontname)
-{
-    m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
-}
-
 #endif // wxUSE_FONTDLG && !__WXGPE__