From: Vadim Zeitlin Date: Mon, 22 Mar 2004 17:42:49 +0000 (+0000) Subject: auto detect the icon if none given instead of asserting (MSW and Mac do allow this) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e0ae1a0ae945f6d6cb7ffbb3eadcb6952f805dd6 auto detect the icon if none given instead of asserting (MSW and Mac do allow this) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp index 9026e34f67..610b4ec11a 100644 --- a/src/gtk/msgdlg.cpp +++ b/src/gtk/msgdlg.cpp @@ -70,7 +70,10 @@ int wxMessageDialog::ShowModal() else if (m_dialogStyle & wxICON_QUESTION) type = GTK_MESSAGE_QUESTION; else - wxFAIL_MSG( _T("Unknown wxMessageDialog type") ); + { + // 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, diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp index 9026e34f67..610b4ec11a 100644 --- a/src/gtk1/msgdlg.cpp +++ b/src/gtk1/msgdlg.cpp @@ -70,7 +70,10 @@ int wxMessageDialog::ShowModal() else if (m_dialogStyle & wxICON_QUESTION) type = GTK_MESSAGE_QUESTION; else - wxFAIL_MSG( _T("Unknown wxMessageDialog type") ); + { + // 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,