m_caption = caption;
m_message = message;
m_dialogStyle = style;
+ m_parent = wxGetTopLevelParent(parent);
- if (parent)
- {
- while (!parent->IsTopLevel())
- parent = parent->GetParent();
- }
-
- m_parent = parent;
-}
-
-int wxMessageDialog::ShowModal()
-{
- GtkWidget *dlg;
GtkMessageType type = GTK_MESSAGE_ERROR;
GtkButtonsType buttons = GTK_BUTTONS_OK;
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,
- 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));
+}
+
+int wxMessageDialog::ShowModal()
+{
+ gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+ gtk_widget_destroy(m_widget);
+ m_widget = NULL;
switch (result)
{
}
}
+
#endif // wxUSE_MSGDLG && defined(__WXGTK20__)