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
This commit is contained in:
@@ -70,7 +70,10 @@ int wxMessageDialog::ShowModal()
|
|||||||
else if (m_dialogStyle & wxICON_QUESTION)
|
else if (m_dialogStyle & wxICON_QUESTION)
|
||||||
type = GTK_MESSAGE_QUESTION;
|
type = GTK_MESSAGE_QUESTION;
|
||||||
else
|
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 ?
|
dlg = gtk_message_dialog_new(m_parent ?
|
||||||
GTK_WINDOW(m_parent->m_widget) : NULL,
|
GTK_WINDOW(m_parent->m_widget) : NULL,
|
||||||
|
@@ -70,7 +70,10 @@ int wxMessageDialog::ShowModal()
|
|||||||
else if (m_dialogStyle & wxICON_QUESTION)
|
else if (m_dialogStyle & wxICON_QUESTION)
|
||||||
type = GTK_MESSAGE_QUESTION;
|
type = GTK_MESSAGE_QUESTION;
|
||||||
else
|
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 ?
|
dlg = gtk_message_dialog_new(m_parent ?
|
||||||
GTK_WINDOW(m_parent->m_widget) : NULL,
|
GTK_WINDOW(m_parent->m_widget) : NULL,
|
||||||
|
Reference in New Issue
Block a user