X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a7a4e10ed18f81a576dcd866cfbf02bf404c00..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/fontdlg.cpp diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index d912375443..5b9a04bba4 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/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/gtk1/private.h" @@ -85,7 +84,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject( dialog ); - dialog->GetEventHandler()->ProcessEvent( event ); + dialog->HandleWindowEvent( event ); } } @@ -102,7 +101,7 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); event.SetEventObject( dialog ); - dialog->GetEventHandler()->ProcessEvent( event ); + dialog->HandleWindowEvent( event ); } } @@ -149,7 +148,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); wxFont font = m_fontData.GetInitialFont(); - if( font.Ok() ) + if( font.IsOk() ) { const wxNativeFontInfo *info = font.GetNativeFontInfo(); @@ -165,7 +164,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) else { // this is not supposed to happen! - wxFAIL_MSG(_T("font is ok but no native font info?")); + wxFAIL_MSG(wxT("font is ok but no native font info?")); } }