X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7c80f9e052d3d50b3d7780b21e55d8c5586cdea..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 66b985019f..f6059b9e63 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,8 +32,7 @@ extern "C" { static bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal /* printf( "OnDelete from " ); @@ -61,11 +60,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial 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 );