X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47e118ba9a99f27050c3fa5f19f0edd6917d5df5..a83ea9c15a7ac7bbdc6686164cfcbbc21ae5031a:/src/gtk1/msgdlg.cpp?ds=sidebyside diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp index 1d68787535..6ca4915481 100644 --- a/src/gtk1/msgdlg.cpp +++ b/src/gtk1/msgdlg.cpp @@ -22,10 +22,10 @@ #if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__) +#include "wx/msgdlg.h" #include "wx/gtk/private.h" #include -#include "wx/msgdlg.h" #include "wx/intl.h" IMPLEMENT_CLASS(wxMessageDialog, wxDialog) @@ -39,15 +39,11 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, m_caption = caption; m_message = message; m_dialogStyle = style; - m_parent = parent; -} + m_parent = wxGetTopLevelParent(parent); -int wxMessageDialog::ShowModal() -{ - GtkWidget *dlg; - GtkMessageType type; + GtkMessageType type = GTK_MESSAGE_ERROR; GtkButtonsType buttons = GTK_BUTTONS_OK; - + if (m_dialogStyle & wxYES_NO) { buttons = GTK_BUTTONS_YES_NO; @@ -60,7 +56,7 @@ int wxMessageDialog::ShowModal() else buttons = GTK_BUTTONS_OK; } - + if (m_dialogStyle & wxICON_EXCLAMATION) type = GTK_MESSAGE_WARNING; else if (m_dialogStyle & wxICON_ERROR) @@ -69,28 +65,45 @@ int wxMessageDialog::ShowModal() type = GTK_MESSAGE_INFO; 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 = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO; + } - dlg = gtk_message_dialog_new(m_parent ? - GTK_WINDOW(m_parent->m_widget) : NULL, - GTK_DIALOG_MODAL, - type, buttons, - "%s", (const char*)wxGTK_CONV(m_message)); + m_widget = gtk_message_dialog_new(m_parent ? + GTK_WINDOW(m_parent->m_widget) : NULL, + GTK_DIALOG_MODAL, + type, buttons, + "%s", (const char*)wxGTK_CONV(m_message)); if (m_caption != wxMessageBoxCaptionStr) - gtk_window_set_title(GTK_WINDOW(dlg), wxGTK_CONV(m_caption)); + gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption)); if (m_dialogStyle & wxYES_NO) { if (m_dialogStyle & wxCANCEL) - gtk_dialog_add_button(GTK_DIALOG(dlg), GTK_STOCK_CANCEL, + gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); if (m_dialogStyle & wxNO_DEFAULT) - gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_NO); + gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO); else - gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES); + gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES); } - - gint result = gtk_dialog_run(GTK_DIALOG(dlg)); - gtk_widget_destroy(dlg); + + if (parent) + gtk_window_set_transient_for(GTK_WINDOW(m_widget), + GTK_WINDOW(m_parent->m_widget)); +} + +wxMessageDialog::~wxMessageDialog() +{ +} + +int wxMessageDialog::ShowModal() +{ + gint result = gtk_dialog_run(GTK_DIALOG(m_widget)); + gtk_widget_destroy(m_widget); + m_widget = NULL; switch (result) { @@ -98,7 +111,9 @@ int wxMessageDialog::ShowModal() wxFAIL_MSG(_T("unexpected GtkMessageDialog return code")); // fall through - case GTK_RESPONSE_CANCEL: + case GTK_RESPONSE_CANCEL: + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CLOSE: return wxID_CANCEL; case GTK_RESPONSE_OK: return wxID_OK; @@ -109,5 +124,6 @@ int wxMessageDialog::ShowModal() } } + #endif // wxUSE_MSGDLG && defined(__WXGTK20__)