X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4322df68b099e5e983acc0a3dad4ad5841b57b5..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/gtk/msgdlg.cpp?ds=sidebyside diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp index e2b0a4ef26..49b2a38b1c 100644 --- a/src/gtk/msgdlg.cpp +++ b/src/gtk/msgdlg.cpp @@ -16,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__) +#if wxUSE_MSGDLG && !defined(__WXGPE__) #include "wx/msgdlg.h" @@ -27,6 +27,10 @@ #include "wx/gtk/private.h" #include +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON + IMPLEMENT_CLASS(wxMessageDialog, wxDialog) wxMessageDialog::wxMessageDialog(wxWindow *parent, @@ -34,81 +38,165 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& caption, long style, const wxPoint& WXUNUSED(pos)) + : wxMessageDialogBase(GetParentForModalDialog(parent), + message, + caption, + style) { - m_caption = caption; - m_message = message; - SetMessageDialogStyle(style); - m_parent = wxGetTopLevelParent(parent); +} +void wxMessageDialog::GTKCreateMsgDialog() +{ + GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL; + +#if wxUSE_LIBHILDON + const char *stockIcon; + 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 = ""; + + // there is no generic note creation function in public API so we have no + // choice but to use g_object_new() directly + m_widget = (GtkWidget *)g_object_new + ( + HILDON_TYPE_NOTE, + "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE, + "description", (const char *)GetFullMessage().utf8_str(), + "icon", stockIcon, + NULL + ); +#else // !wxUSE_LIBHILDON GtkMessageType type = GTK_MESSAGE_ERROR; GtkButtonsType buttons = GTK_BUTTONS_OK; - if (style & wxYES_NO) + if (m_dialogStyle & wxYES_NO) { - if (style & wxCANCEL) + if (m_dialogStyle & wxCANCEL) buttons = GTK_BUTTONS_NONE; else buttons = GTK_BUTTONS_YES_NO; } - if (style & wxOK) + if (m_dialogStyle & wxOK) { - if (style & wxCANCEL) + if (m_dialogStyle & wxCANCEL) buttons = GTK_BUTTONS_OK_CANCEL; else buttons = GTK_BUTTONS_OK; } - if (style & wxICON_EXCLAMATION) + if (m_dialogStyle & wxICON_EXCLAMATION) type = GTK_MESSAGE_WARNING; - else if (style & wxICON_ERROR) + else if (m_dialogStyle & wxICON_ERROR) type = GTK_MESSAGE_ERROR; - else if (style & wxICON_INFORMATION) + else if (m_dialogStyle & wxICON_INFORMATION) type = GTK_MESSAGE_INFO; - else if (style & wxICON_QUESTION) + else if (m_dialogStyle & wxICON_QUESTION) type = GTK_MESSAGE_QUESTION; else { // GTK+ doesn't have a "typeless" msg box, so try to auto detect... - type = style & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO; + type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO; + } + + wxString message; +#if GTK_CHECK_VERSION(2, 6, 0) + bool needsExtMessage = false; + if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() ) + { + message = m_message; + needsExtMessage = true; + } + else // extended message not needed or not supported +#endif // GTK+ 2.6+ + { + message = GetFullMessage(); } - m_widget = gtk_message_dialog_new(m_parent ? - GTK_WINDOW(m_parent->m_widget) : NULL, + m_widget = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, - type, buttons, - "%s", (const char*)wxGTK_CONV(m_message)); + type, + buttons, + "%s", + (const char*)wxGTK_CONV(message)); + +#if GTK_CHECK_VERSION(2, 6, 0) + if ( needsExtMessage ) + { + gtk_message_dialog_format_secondary_text + ( + (GtkMessageDialog *)m_widget, + "%s", + (const char *)wxGTK_CONV(m_extendedMessage) + ); + } +#endif // GTK+ 2.6+ +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON + if (m_caption != wxMessageBoxCaptionStr) gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption)); - if (style & wxYES_NO) + // 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 (style & wxCANCEL) + if ( m_dialogStyle & wxCANCEL ) { - gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_NO, - GTK_RESPONSE_NO); - gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_YES, - GTK_RESPONSE_YES); + 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); } - if (style & wxNO_DEFAULT) - gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO); - else - gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES); - } +#if wxUSE_LIBHILDON + else // just Yes/No + { + gtk_dialog_add_button(dlg, GTK_STOCK_NO, GTK_RESPONSE_NO); + gtk_dialog_add_button(dlg, GTK_STOCK_YES, GTK_RESPONSE_YES); + } +#endif // wxUSE_LIBHILDON - if (m_parent) - gtk_window_set_transient_for(GTK_WINDOW(m_widget), - GTK_WINDOW(m_parent->m_widget)); -} + 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 + { + gtk_dialog_add_button(dlg, GTK_STOCK_OK, GTK_RESPONSE_OK); + if ( m_dialogStyle & wxCANCEL ) + gtk_dialog_add_button(dlg, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + } +#endif // wxUSE_LIBHILDON -wxMessageDialog::~wxMessageDialog() -{ + // VZ: isn't this done by GTK+ itself? + if (parent) + gtk_window_set_transient_for(GTK_WINDOW(m_widget), parent); } int wxMessageDialog::ShowModal() { + // break the mouse capture as it would interfere with modal dialog (see + // wxDialog::ShowModal) + wxWindow * const win = wxWindow::GetCapture(); + if ( win ) + win->GTKReleaseMouseAndNotify(); + + if ( !m_widget ) + { + GTKCreateMsgDialog(); + wxCHECK_MSG( m_widget, wxID_CANCEL, + _T("failed to create GtkMessageDialog") ); + } + // This should be necessary, but otherwise the // parent TLW will disappear.. if (m_parent) @@ -138,4 +226,4 @@ int wxMessageDialog::ShowModal() } -#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__) +#endif // wxUSE_MSGDLG && !defined(__WXGPE__)