X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c96d7bec67801a380d029990ad1df5e2c9fc207b..ada175836e7b9e456b7f32d82bfb5f6b21d5608d:/src/gtk/msgdlg.cpp diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp index 49b2a38b1c..ca2fa78303 100644 --- a/src/gtk/msgdlg.cpp +++ b/src/gtk/msgdlg.cpp @@ -25,12 +25,17 @@ #endif #include "wx/gtk/private.h" +#include "wx/gtk/private/mnemonics.h" #include #if wxUSE_LIBHILDON #include #endif // wxUSE_LIBHILDON +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 + IMPLEMENT_CLASS(wxMessageDialog, wxDialog) wxMessageDialog::wxMessageDialog(wxWindow *parent, @@ -38,20 +43,56 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& caption, long style, const wxPoint& WXUNUSED(pos)) - : wxMessageDialogBase(GetParentForModalDialog(parent), - message, - caption, - style) + : wxMessageDialogWithCustomLabels(GetParentForModalDialog(parent), + message, + caption, + style) +{ +} + +wxString wxMessageDialog::GetDefaultYesLabel() const +{ + return GTK_STOCK_YES; +} + +wxString wxMessageDialog::GetDefaultNoLabel() const { + return GTK_STOCK_NO; +} + +wxString wxMessageDialog::GetDefaultOKLabel() const +{ + return GTK_STOCK_OK; +} + +wxString wxMessageDialog::GetDefaultCancelLabel() const +{ + return GTK_STOCK_CANCEL; +} + +void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label) +{ + int stockId = label.GetStockId(); + if ( stockId == wxID_NONE ) + { + wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, label); + var = wxConvertMnemonicsToGTK(var); + } + else // stock label + { + var = wxGetStockGtkID(stockId); + } } void wxMessageDialog::GTKCreateMsgDialog() { GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL; -#if wxUSE_LIBHILDON +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 const char *stockIcon; - if ( m_dialogStyle & wxICON_ERROR ) + if ( m_dialogStyle & wxICON_NONE ) + stockIcon = ""; + else if ( m_dialogStyle & wxICON_ERROR ) stockIcon = "qgn_note_gene_syserror"; else if ( m_dialogStyle & wxICON_EXCLAMATION ) stockIcon = "qgn_note_gene_syswarning"; @@ -67,31 +108,40 @@ void wxMessageDialog::GTKCreateMsgDialog() m_widget = (GtkWidget *)g_object_new ( HILDON_TYPE_NOTE, +#if wxUSE_LIBHILDON "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE, +#else // wxUSE_LIBHILDON + "note_type", HILDON_NOTE_TYPE_CONFIRMATION_BUTTON, +#endif // wxUSE_LIBHILDON /wxUSE_LIBHILDON2 "description", (const char *)GetFullMessage().utf8_str(), "icon", stockIcon, NULL ); -#else // !wxUSE_LIBHILDON +#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 GtkMessageType type = GTK_MESSAGE_ERROR; - GtkButtonsType buttons = GTK_BUTTONS_OK; - - if (m_dialogStyle & wxYES_NO) - { - if (m_dialogStyle & wxCANCEL) - buttons = GTK_BUTTONS_NONE; - else - buttons = GTK_BUTTONS_YES_NO; - } + GtkButtonsType buttons = GTK_BUTTONS_NONE; - if (m_dialogStyle & wxOK) + // when using custom labels, we have to add all the buttons ourselves + if ( !HasCustomLabels() ) { - if (m_dialogStyle & wxCANCEL) - buttons = GTK_BUTTONS_OK_CANCEL; - else - buttons = GTK_BUTTONS_OK; + if ( m_dialogStyle & wxYES_NO ) + { + if ( !(m_dialogStyle & wxCANCEL) ) + buttons = GTK_BUTTONS_YES_NO; + //else: no standard GTK_BUTTONS_YES_NO_CANCEL so leave as NONE + } + else if ( m_dialogStyle & wxOK ) + { + buttons = m_dialogStyle & wxCANCEL ? GTK_BUTTONS_OK_CANCEL + : GTK_BUTTONS_OK; + } } +#ifdef __WXGTK210__ + if ( gtk_check_version(2, 10, 0) == NULL && (m_dialogStyle & wxICON_NONE)) + type = GTK_MESSAGE_OTHER; + else +#endif // __WXGTK210__ if (m_dialogStyle & wxICON_EXCLAMATION) type = GTK_MESSAGE_WARNING; else if (m_dialogStyle & wxICON_ERROR) @@ -102,7 +152,8 @@ void wxMessageDialog::GTKCreateMsgDialog() type = GTK_MESSAGE_QUESTION; else { - // GTK+ doesn't have a "typeless" msg box, so try to auto detect... + // if no style is explicitly specified, detect the suitable icon + // ourselves (this can be disabled by using wxICON_NONE) type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO; } @@ -138,48 +189,71 @@ void wxMessageDialog::GTKCreateMsgDialog() ); } #endif // GTK+ 2.6+ -#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 + + g_object_ref(m_widget); if (m_caption != wxMessageBoxCaptionStr) gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption)); - // we need to add dialogs manually when using Yes/No/Cancel dialog as GTK+ - // doesn't support it natively and when using Hildon we add all the buttons - // manually as it doesn't support too many of the combinations we have GtkDialog * const dlg = GTK_DIALOG(m_widget); - if ( m_dialogStyle & wxYES_NO ) + + if ( m_dialogStyle & wxSTAY_ON_TOP ) { - if ( m_dialogStyle & wxCANCEL ) + gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE); + } + + // we need to add buttons manually if we use custom labels or always for + // Yes/No/Cancel dialog as GTK+ doesn't support it natively and when using + // Hildon we add all the buttons manually as it doesn't support too many of + // the combinations we may have +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + static const bool addButtons = true; +#else // !wxUSE_LIBHILDON + const bool addButtons = buttons == GTK_BUTTONS_NONE; +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON + + if ( m_dialogStyle & wxYES_NO ) // Yes/No or Yes/No/Cancel dialog + { + if ( addButtons ) { - gtk_dialog_add_button(dlg, GTK_STOCK_NO, GTK_RESPONSE_NO); - gtk_dialog_add_button(dlg, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button(dlg, GTK_STOCK_YES, GTK_RESPONSE_YES); + gtk_dialog_add_button(dlg, wxGTK_CONV(GetNoLabel()), + GTK_RESPONSE_NO); + gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()), + GTK_RESPONSE_YES); + + if ( m_dialogStyle & wxCANCEL ) + { + gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()), + GTK_RESPONSE_CANCEL); + } } -#if wxUSE_LIBHILDON - else // just Yes/No + + // it'd probably be harmless to call gtk_dialog_set_default_response() + // twice but why do it if we're going to change the default below + // anyhow + if ( !(m_dialogStyle & wxCANCEL_DEFAULT) ) { - gtk_dialog_add_button(dlg, GTK_STOCK_NO, GTK_RESPONSE_NO); - gtk_dialog_add_button(dlg, GTK_STOCK_YES, GTK_RESPONSE_YES); + gtk_dialog_set_default_response(dlg, + m_dialogStyle & wxNO_DEFAULT + ? GTK_RESPONSE_NO + : GTK_RESPONSE_YES); } -#endif // wxUSE_LIBHILDON - - gtk_dialog_set_default_response(dlg, - m_dialogStyle & wxNO_DEFAULT - ? GTK_RESPONSE_NO - : GTK_RESPONSE_YES); } -#if wxUSE_LIBHILDON - else // Ok or Ok/Cancel dialog + else if ( addButtons ) // Ok or Ok/Cancel dialog { - gtk_dialog_add_button(dlg, GTK_STOCK_OK, GTK_RESPONSE_OK); + gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK); if ( m_dialogStyle & wxCANCEL ) - gtk_dialog_add_button(dlg, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + { + gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()), + GTK_RESPONSE_CANCEL); + } } -#endif // wxUSE_LIBHILDON - // VZ: isn't this done by GTK+ itself? - if (parent) - gtk_window_set_transient_for(GTK_WINDOW(m_widget), parent); + if ( m_dialogStyle & wxCANCEL_DEFAULT ) + { + gtk_dialog_set_default_response(dlg, GTK_RESPONSE_CANCEL); + } } int wxMessageDialog::ShowModal() @@ -194,7 +268,7 @@ int wxMessageDialog::ShowModal() { GTKCreateMsgDialog(); wxCHECK_MSG( m_widget, wxID_CANCEL, - _T("failed to create GtkMessageDialog") ); + wxT("failed to create GtkMessageDialog") ); } // This should be necessary, but otherwise the @@ -204,12 +278,13 @@ int wxMessageDialog::ShowModal() gint result = gtk_dialog_run(GTK_DIALOG(m_widget)); gtk_widget_destroy(m_widget); + g_object_unref(m_widget); m_widget = NULL; switch (result) { default: - wxFAIL_MSG(_T("unexpected GtkMessageDialog return code")); + wxFAIL_MSG(wxT("unexpected GtkMessageDialog return code")); // fall through case GTK_RESPONSE_CANCEL: