X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7c80f9e052d3d50b3d7780b21e55d8c5586cdea..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/fontdlg.cpp?ds=sidebyside diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 66b985019f..50f971d756 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -17,10 +17,10 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/utils.h" + #include "wx/msgdlg.h" #endif #include "wx/fontutil.h" -#include "wx/msgdlg.h" #include "wx/gtk/private.h" @@ -32,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()) @@ -56,19 +53,14 @@ 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); - 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 ); + dialog->HandleWindowEvent( event ); } } @@ -80,12 +72,9 @@ 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 ); + dialog->HandleWindowEvent( event ); } } @@ -97,7 +86,7 @@ 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,