GetMenuBar() now traverses up the hierarchy so it no longer has to be done here.

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 96b6cc0a678e36d1446f6dae4dbfa6add6dfa71f..8a3db3ba9d281859d99adb4331fc0036f1745c12 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 && !defined(__WXGTK20__)
+#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXGPE__))
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -67,9 +67,7 @@ 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 );
 
@@ -101,31 +99,24 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                 bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
                 break;
         }
-#if wxUSE_STATIC_BITMAP
         wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap);
         if (is_pda)
             topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
         else
             icon_text->Add( icon, 0, wxCENTER );
-#endif
     }
 
     // 2) text
-#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
-#endif
 
     topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 
-#if wxUSE_STATLINE
     // 3) static line
     topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
 
     // 4) buttons
-#if wxUSE_BUTTON
-    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
- #endif
+    topsizer->Add( CreateButtonSizer( style & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ),
+                   0, wxCENTRE | wxALL, 10 );
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );