X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce668f297b03143bc15014a37c12e610c49c6e6b..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/msgdlg.cpp diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp index 3badb45c63..5bbdc930b8 100644 --- a/src/gtk/msgdlg.cpp +++ b/src/gtk/msgdlg.cpp @@ -24,10 +24,10 @@ #include "wx/intl.h" #endif +#include #include "wx/gtk/private.h" #include "wx/gtk/private/messagetype.h" #include "wx/gtk/private/mnemonics.h" -#include #if wxUSE_LIBHILDON #include @@ -44,10 +44,13 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& caption, long style, const wxPoint& WXUNUSED(pos)) - : wxMessageDialogWithCustomLabels(GetParentForModalDialog(parent), - message, - caption, - style) + : wxMessageDialogBase + ( + GetParentForModalDialog(parent, style), + message, + caption, + style + ) { } @@ -71,12 +74,17 @@ wxString wxMessageDialog::GetDefaultCancelLabel() const return GTK_STOCK_CANCEL; } +wxString wxMessageDialog::GetDefaultHelpLabel() const +{ + return GTK_STOCK_HELP; +} + void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label) { int stockId = label.GetStockId(); if ( stockId == wxID_NONE ) { - wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, label); + wxMessageDialogBase::DoSetCustomLabel(var, label); var = wxConvertMnemonicsToGTK(var); } else // stock label @@ -90,19 +98,26 @@ void wxMessageDialog::GTKCreateMsgDialog() GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL; #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - const char *stockIcon; - 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"; - else if ( m_dialogStyle & wxICON_INFORMATION ) - stockIcon = "qgn_note_info"; - else if ( m_dialogStyle & wxICON_QUESTION ) - stockIcon = "qgn_note_confirm"; - else - stockIcon = ""; + const char *stockIcon = ""; + + switch ( GetEffectiveIcon() ) + { + case wxICON_ERROR: + stockIcon = "qgn_note_gene_syserror"; + break; + + case wxICON_WARNING: + stockIcon = "qgn_note_gene_syswarning"; + break; + + case wxICON_QUESTION: + stockIcon = "qgn_note_confirm"; + break; + + case wxICON_INFORMATION: + stockIcon = "qgn_note_info"; + break; + } // there is no generic note creation function in public API so we have no // choice but to use g_object_new() directly @@ -125,20 +140,25 @@ void wxMessageDialog::GTKCreateMsgDialog() // when using custom labels, we have to add all the buttons ourselves if ( !HasCustomLabels() ) { - 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 ) + // "Help" button is not supported by predefined combinations so we + // always need to create the buttons manually when it's used. + if ( !(m_dialogStyle & wxHELP) ) { - buttons = m_dialogStyle & wxCANCEL ? GTK_BUTTONS_OK_CANCEL - : 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; + } } } - if ( !wxGTKImpl::ConvertMessageTypeFromWX(m_dialogStyle, &type) ) + if ( !wxGTKImpl::ConvertMessageTypeFromWX(GetEffectiveIcon(), &type) ) { // if no style is explicitly specified, detect the suitable icon // ourselves (this can be disabled by using wxICON_NONE) @@ -146,15 +166,13 @@ void wxMessageDialog::GTKCreateMsgDialog() } wxString message; -#if GTK_CHECK_VERSION(2, 6, 0) bool needsExtMessage = false; - if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() ) + if (!m_extendedMessage.empty()) { message = m_message; needsExtMessage = true; } - else // extended message not needed or not supported -#endif // GTK+ 2.6+ + else // extended message not needed { message = GetFullMessage(); } @@ -166,7 +184,6 @@ void wxMessageDialog::GTKCreateMsgDialog() "%s", (const char*)wxGTK_CONV(message)); -#if GTK_CHECK_VERSION(2, 6, 0) if ( needsExtMessage ) { gtk_message_dialog_format_secondary_text @@ -176,7 +193,6 @@ void wxMessageDialog::GTKCreateMsgDialog() (const char *)wxGTK_CONV(m_extendedMessage) ); } -#endif // GTK+ 2.6+ #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 g_object_ref(m_widget); @@ -201,47 +217,58 @@ void wxMessageDialog::GTKCreateMsgDialog() 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 ) { - if ( addButtons ) + if ( m_dialogStyle & wxHELP ) { + gtk_dialog_add_button(dlg, wxGTK_CONV(GetHelpLabel()), + GTK_RESPONSE_HELP); + } + + if ( m_dialogStyle & wxYES_NO ) // Yes/No or Yes/No/Cancel dialog + { + // Add the buttons in the correct order which is, according to + // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en + // the following one: + // + // [Help] [Alternative] [Cancel] [Affirmative] + 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); } - } - // 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_set_default_response(dlg, - m_dialogStyle & wxNO_DEFAULT - ? GTK_RESPONSE_NO - : GTK_RESPONSE_YES); + gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()), + GTK_RESPONSE_YES); } - } - else if ( addButtons ) // Ok or Ok/Cancel dialog - { - gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK); - if ( m_dialogStyle & wxCANCEL ) + else // Ok or Ok/Cancel dialog { - gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()), - GTK_RESPONSE_CANCEL); + gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK); + if ( m_dialogStyle & wxCANCEL ) + { + gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()), + GTK_RESPONSE_CANCEL); + } } } + gint defaultButton; if ( m_dialogStyle & wxCANCEL_DEFAULT ) - { - gtk_dialog_set_default_response(dlg, GTK_RESPONSE_CANCEL); - } + defaultButton = GTK_RESPONSE_CANCEL; + else if ( m_dialogStyle & wxNO_DEFAULT ) + defaultButton = GTK_RESPONSE_NO; + else if ( m_dialogStyle & wxYES_NO ) + defaultButton = GTK_RESPONSE_YES; + else // No need to change the default value, whatever it is. + defaultButton = GTK_RESPONSE_NONE; + + if ( defaultButton != GTK_RESPONSE_NONE ) + gtk_dialog_set_default_response(dlg, defaultButton); } int wxMessageDialog::ShowModal() @@ -265,6 +292,7 @@ int wxMessageDialog::ShowModal() gtk_window_present( GTK_WINDOW(m_parent->m_widget) ); gint result = gtk_dialog_run(GTK_DIALOG(m_widget)); + GTKDisconnect(m_widget); gtk_widget_destroy(m_widget); g_object_unref(m_widget); m_widget = NULL; @@ -285,6 +313,8 @@ int wxMessageDialog::ShowModal() return wxID_YES; case GTK_RESPONSE_NO: return wxID_NO; + case GTK_RESPONSE_HELP: + return wxID_HELP; } }