The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

[wxWidgets.git] / src / gtk1 / msgdlg.cpp

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 6ca49154810bada7180376d09d45ba4b0f230abe..666cbde6bc0587ab83e45ccfc50c5a88e6f55678 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.cpp
+// Name:        src/gtk/msgdlg.cpp
 // Purpose:     wxMessageDialog for GTK+2
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik, 2003
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -38,37 +38,37 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
 {
     m_caption = caption;
     m_message = message;
-    m_dialogStyle = style;
+    SetMessageDialogStyle(style);
     m_parent = wxGetTopLevelParent(parent);
 
     GtkMessageType type = GTK_MESSAGE_ERROR;
     GtkButtonsType buttons = GTK_BUTTONS_OK;
 
-    if (m_dialogStyle & wxYES_NO)
+    if (style & wxYES_NO)
     {
         buttons = GTK_BUTTONS_YES_NO;
     }
 
-    if (m_dialogStyle & wxOK)
+    if (style & wxOK)
     {
-        if (m_dialogStyle & wxCANCEL)
+        if (style & wxCANCEL)
             buttons = GTK_BUTTONS_OK_CANCEL;
         else
             buttons = GTK_BUTTONS_OK;
     }
 
-    if (m_dialogStyle & wxICON_EXCLAMATION)
+    if (style & wxICON_EXCLAMATION)
         type = GTK_MESSAGE_WARNING;
-    else if (m_dialogStyle & wxICON_ERROR)
+    else if (style & wxICON_ERROR)
         type = GTK_MESSAGE_ERROR;
-    else if (m_dialogStyle & wxICON_INFORMATION)
+    else if (style & wxICON_INFORMATION)
         type = GTK_MESSAGE_INFO;
-    else if (m_dialogStyle & wxICON_QUESTION)
+    else if (style & 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;
+        type = style & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
     }
 
     m_widget = gtk_message_dialog_new(m_parent ?
@@ -79,28 +79,33 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     if (m_caption != wxMessageBoxCaptionStr)
         gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
 
-    if (m_dialogStyle & wxYES_NO)
+    if (style & wxYES_NO)
     {
-        if (m_dialogStyle & wxCANCEL)
+        if (style & wxCANCEL)
             gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
                                   GTK_RESPONSE_CANCEL);
-        if (m_dialogStyle & wxNO_DEFAULT)
+        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 (parent)
+    if (m_parent)
         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
                                      GTK_WINDOW(m_parent->m_widget));
 }
- 
+
 wxMessageDialog::~wxMessageDialog()
 {
 }
 
 int wxMessageDialog::ShowModal()
 {
+    // This should be necessary, but otherwise the
+    // parent TLW will disappear..
+    if (m_parent)
+        gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
+
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_destroy(m_widget);
     m_widget = NULL;