X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab591c5cceff41c0bedaa89af34cd039e2c44e1..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 3444d52f6a..086d296b85 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/fontdlg.cpp +// Name: src/gtk/fontdlg.cpp // Purpose: wxFontDialog // Author: Robert Roebling // Id: $Id$ @@ -7,96 +7,52 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "fontdlg.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#if wxUSE_FONTDLG +#if wxUSE_FONTDLG && !defined(__WXGPE__) -#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/gtk/private.h" - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -//----------------------------------------------------------------------------- -// "delete_event" -//----------------------------------------------------------------------------- - -static -bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *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(); +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif - return TRUE; -} +#include "wx/fontutil.h" +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- -// "clicked" for OK-button +// "response" //----------------------------------------------------------------------------- -static -void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog ) +extern "C" { +static void response(GtkDialog* dialog, int response_id, wxFontDialog* win) { - 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) + int rc = wxID_CANCEL; + if (response_id == GTK_RESPONSE_OK) { - wxMessageBox(_("Please choose a valid font."), _("Error"), - wxOK | wxICON_ERROR); - return; + 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))); + } } - gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); - - dialog->SetChosenFont(fontname); - - g_free( fontname ); - - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); - event.SetEventObject( dialog ); - dialog->GetEventHandler()->ProcessEvent( event ); + if (win->IsModal()) + win->EndModal(rc); + else + win->Show(false); } - -//----------------------------------------------------------------------------- -// "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 ); } //----------------------------------------------------------------------------- @@ -107,78 +63,65 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) bool wxFontDialog::DoCreate(wxWindow *parent) { - m_needParent = FALSE; + parent = GetParentForModalDialog(parent, 0); if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, wxDefaultValidator, wxT("fontdialog") )) { wxFAIL_MSG( wxT("wxFontDialog creation failed") ); - return FALSE; + return false; } - wxString m_message( _("Choose font") ); - m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) ); - - int x = (gdk_screen_width () - 400) / 2; - int y = (gdk_screen_height () - 400) / 2; - gtk_widget_set_uposition( m_widget, x, y ); + const wxString message(_("Choose font")); + GtkWindow* gtk_parent = NULL; + if (parent) + gtk_parent = GTK_WINDOW(parent->m_widget); - 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 ); - -#ifndef __WXGTK20__ - // strange way to internationalize - gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), _("OK") ); -#endif - - gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked", - GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this ); - -#ifndef __WXGTK20__ - // strange way to internationalize - gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->cancel_button) ), _("Cancel") ); +#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); - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); + g_signal_connect(m_widget, "response", G_CALLBACK(response), this); wxFont font = m_fontData.GetInitialFont(); - if( font.Ok() ) + if( font.IsOk() ) { - wxNativeFontInfo *info = font.GetNativeFontInfo(); + const wxNativeFontInfo *info = font.GetNativeFontInfo(); if ( info ) { - const wxString& fontname = info->GetXFontName(); - if ( !fontname ) - font.GetInternalFont(); - gtk_font_selection_dialog_set_font_name - ( - sel, - wxConvCurrent->cWX2MB(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?")); } } - return TRUE; + return true; } wxFontDialog::~wxFontDialog() { } -void wxFontDialog::SetChosenFont(const char *fontname) -{ - m_fontData.SetChosenFont(wxFont(fontname)); -} - -#endif // wxUSE_FONTDLG - +#endif // wxUSE_FONTDLG && !__WXGPE__