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

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 98d1bedcd8..086d296b85 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.cpp
+// Name:        src/gtk/fontdlg.cpp
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,135 +7,121 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "fontdlg.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#include "wx/fontdlg.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/debug.h"
-#include "wx/msgdlg.h"
+#if wxUSE_FONTDLG && !defined(__WXGPE__)
 
-#include "gtk/gtk.h"
+#include "wx/fontdlg.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+#endif
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/fontutil.h"
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
-// "delete_event"
+// "response"
 //-----------------------------------------------------------------------------
 
-static
-bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
+extern "C" {
+static void response(GtkDialog* dialog, int response_id, wxFontDialog* win)
 {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    win->Close();
+    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)));
+        }
+    }
 
-    return TRUE;
+    if (win->IsModal())
+        win->EndModal(rc);
+    else
+        win->Show(false);
+}
 }
 
 //-----------------------------------------------------------------------------
-// "clicked" for OK-button
+// wxFontDialog
 //-----------------------------------------------------------------------------
 
-static
-void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
+IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+
+bool wxFontDialog::DoCreate(wxWindow *parent)
 {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
+    parent = GetParentForModalDialog(parent, 0);
 
-    GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
-    GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
-    
-    if (!gfont)
+    if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
+                     wxDefaultValidator, wxT("fontdialog") ))
     {
-        wxMessageBox(_("Please choose a valid font."), _("Error"), wxOK);
-        return;
+        wxFAIL_MSG( wxT("wxFontDialog creation failed") );
+        return false;
     }
-    
-    gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
-    wxFont font( gfont, fontname );
-    g_free( fontname );
-    dialog->m_fontData.SetChosenFont( font );
-    
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
-}
 
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
-
-static
-void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
-{
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-// wxFontDialog
-//-----------------------------------------------------------------------------
+    const wxString message(_("Choose font"));
+    GtkWindow* gtk_parent = NULL;
+    if (parent)
+        gtk_parent = GTK_WINDOW(parent->m_widget);
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog)
+#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);
 
-wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
-{
-    m_needParent = FALSE;
+    g_signal_connect(m_widget, "response", G_CALLBACK(response), this);
 
-    if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, 
-	             wxDefaultValidator, _T("fontdialog") ))
+    wxFont font = m_fontData.GetInitialFont();
+    if( font.IsOk() )
     {
-        wxFAIL_MSG( _T("wxXX creation failed") );
-	return;
+        const wxNativeFontInfo *info = font.GetNativeFontInfo();
+
+        if ( info )
+        {
+#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(wxT("font is ok but no native font info?"));
+        }
     }
-    
-    wxString m_message( _("Choose font") );
-    m_widget = gtk_font_selection_dialog_new( m_message.mbc_str() );
-
-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    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 );
-
-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
-
-    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 );
+
+    return true;
 }
 
 wxFontDialog::~wxFontDialog()
 {
 }
 
+#endif // wxUSE_FONTDLG && !__WXGPE__