X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a7a4e10ed18f81a576dcd866cfbf02bf404c00..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 50e7ad2331..cb99b9c398 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -16,12 +16,11 @@ #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/utils.h" + #include "wx/msgdlg.h" #endif #include "wx/fontutil.h" -#include "wx/utils.h" -#include "wx/debug.h" -#include "wx/msgdlg.h" #include "wx/gtk/private.h" @@ -33,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()) @@ -57,16 +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); - 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 ); @@ -81,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 ); @@ -98,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,