X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..d2b23b67301bd2d286366d4326a21da3132558fa:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index af709b3825..cb99b9c398 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$ @@ -10,28 +10,20 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" +#if wxUSE_FONTDLG && !defined(__WXGPE__) -#if wxUSE_FONTDLG +#include "wx/fontdlg.h" -#ifndef __WXGPE__ +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/utils.h" + #include "wx/msgdlg.h" +#endif -#include "wx/fontdlg.h" #include "wx/fontutil.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" //----------------------------------------------------------------------------- @@ -40,9 +32,6 @@ extern "C" { 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()) @@ -52,7 +41,7 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN win->Close(); - return TRUE; + return true; } } @@ -64,27 +53,11 @@ extern "C" { static void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog ) { - if (g_isIdle) - wxapp_install_idle_handler(); - GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget); -#ifndef __WXGTK20__ - GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg); - - if (!gfont) - { - wxMessageBox(_("Please choose a valid font."), _("Error"), - wxOK | wxICON_ERROR); - return; - } -#endif - - gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); + wxGtkString 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 ); @@ -99,9 +72,6 @@ extern "C" { 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 ); @@ -116,14 +86,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) bool wxFontDialog::DoCreate(wxWindow *parent) { - m_needParent = FALSE; + parent = GetParentForModalDialog(parent); 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") ); @@ -135,24 +105,14 @@ bool wxFontDialog::DoCreate(wxWindow *parent) 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 ); + g_signal_connect (sel->ok_button, "clicked", + G_CALLBACK (gtk_fontdialog_ok_callback), this); -#ifndef __WXGTK20__ - // strange way to internationalize - gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), _("OK") ); -#endif + g_signal_connect (sel->cancel_button, "clicked", + G_CALLBACK (gtk_fontdialog_cancel_callback), this); - 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") ); -#endif - - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); + g_signal_connect (m_widget, "delete_event", + G_CALLBACK (gtk_fontdialog_delete_callback), this); wxFont font = m_fontData.GetInitialFont(); if( font.Ok() ) @@ -162,13 +122,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) if ( info ) { -#ifdef __WXGTK20__ const wxString& fontname = info->ToString(); -#else - const wxString& fontname = info->GetXFontName(); - if ( !fontname ) - font.GetInternalFont(); -#endif gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname)); } else @@ -178,7 +132,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) } } - return TRUE; + return true; } wxFontDialog::~wxFontDialog() @@ -190,7 +144,4 @@ void wxFontDialog::SetChosenFont(const char *fontname) m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); } -#endif // wxUSE_FONTDLG - -#endif // GPE - +#endif // wxUSE_FONTDLG && !__WXGPE__