X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93763ad5ba900aecb9220a36ebe7447313ea3e31..94d0d21a15fa73ac426480d195d16ee04caf2de8:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index d51b0fb949..50f971d756 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -10,16 +10,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FONTDLG - -#ifndef __WXGPE__ +#if wxUSE_FONTDLG && !defined(__WXGPE__) #include "wx/fontdlg.h" + +#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/intl.h" -#include "wx/debug.h" -#include "wx/msgdlg.h" #include "wx/gtk/private.h" @@ -31,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()) @@ -55,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 ); } } @@ -79,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 ); } } @@ -96,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, @@ -154,6 +144,4 @@ void wxFontDialog::SetChosenFont(const char *fontname) m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); } -#endif // wxUSE_FONTDLG - -#endif // GPE +#endif // wxUSE_FONTDLG && !__WXGPE__