X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b2575e2c40d104f18dd298e9aa025fed9fb6efa..ff534ba469473a9ace193e736ca131144df307f9:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index a1df8d00e5..ce8afcb7ad 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -86,7 +86,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) bool wxFontDialog::DoCreate(wxWindow *parent) { - parent = GetParentForModalDialog(parent); + parent = GetParentForModalDialog(parent, 0); if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, @@ -106,17 +106,17 @@ bool wxFontDialog::DoCreate(wxWindow *parent) GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget); - g_signal_connect (sel->ok_button, "clicked", + g_signal_connect (gtk_font_selection_dialog_get_ok_button(sel), "clicked", G_CALLBACK (gtk_fontdialog_ok_callback), this); - g_signal_connect (sel->cancel_button, "clicked", + g_signal_connect (gtk_font_selection_dialog_get_cancel_button(sel), "clicked", G_CALLBACK (gtk_fontdialog_cancel_callback), this); g_signal_connect (m_widget, "delete_event", G_CALLBACK (gtk_fontdialog_delete_callback), this); wxFont font = m_fontData.GetInitialFont(); - if( font.Ok() ) + if( font.IsOk() ) { const wxNativeFontInfo *info = font.GetNativeFontInfo(); @@ -129,7 +129,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?")); } }