X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30764ab5246a5a9876d6313607da56cf1f1909d2..3e5f88c6d2cdb2d4b0de4f44146a9839dc55f129:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 47a34e1bcc..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,186 +7,121 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "fontdlg.h" -#endif - -#include "wx/fontdlg.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/debug.h" -#include "wx/msgdlg.h" - -#include - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#if wxUSE_FONTDLG && !defined(__WXGPE__) -//----------------------------------------------------------------------------- -// "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" ); -*/ +#include "wx/fontdlg.h" - 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" //----------------------------------------------------------------------------- -#ifdef __WXGTK12__ -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); - return; - } - - gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); - - // 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 ) + rc = wxID_OK; +#if GTK_CHECK_VERSION(3,2,0) + if (gtk_check_version(3,2,0) == NULL) { - xregistry = dash + 1; + wxNativeFontInfo info; + info.description = gtk_font_chooser_get_font_desc(GTK_FONT_CHOOSER(dialog)); + win->GetFontData().SetChosenFont(wxFont(info)); } else +#endif { - wxFAIL_MSG( wxT("no registry in X font spec?") ); + GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(dialog); + wxGtkString name(gtk_font_selection_dialog_get_font_name(sel)); + win->GetFontData().SetChosenFont(wxFont(wxString::FromUTF8(name))); } - - // 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 - // 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) - dialog->m_fontData.SetChosenFont( wxFont(fontname, fontdata) ); - - 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); } -#endif // GTK+ 1.2 and later only - -//----------------------------------------------------------------------------- -// "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 //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog) +IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata ) - : m_fontData(*fontdata) +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("wxXX creation failed") ); - return; + wxFAIL_MSG( wxT("wxFontDialog creation failed") ); + return false; } - - 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 ); + const wxString message(_("Choose font")); + GtkWindow* gtk_parent = NULL; + if (parent) + gtk_parent = GTK_WINDOW(parent->m_widget); - // 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")) ); +#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.xFontName.IsEmpty() ) - font.GetInternalFont(); - gtk_font_selection_dialog_set_font_name(sel, wxConvCurrent->cWX2MB(info.xFontName.GetData())); + 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?")); + } } + + return true; } wxFontDialog::~wxFontDialog() { } +#endif // wxUSE_FONTDLG && !__WXGPE__