renamed wxWave to wxSound

[wxWidgets.git] / src / generic / msgdlgg.cpp

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 19e4307b25a9995ba10165805cc5160c4a611248..6359bd93173962c9360310572b47f2f63c806529 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "msgdlgg.h"
 #endif
 
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_MSGDLG
+#if wxUSE_MSGDLG && !defined(__WXGTK20__)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -67,7 +67,9 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 {
     m_dialogStyle = style;
 
+#if wxUSE_STATIC_BITMAP
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+#endif
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
@@ -122,7 +124,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 
     // 4) buttons
 #if wxUSE_BUTTON
-    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
+    topsizer->Add( CreateButtonSizer( style & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ),
+                   0, wxCENTRE | wxALL, 10 );
  #endif
 
     SetAutoLayout( TRUE );
@@ -160,5 +163,5 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-#endif // wxUSE_MSGDLG
+#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)