winundef.h serves for other compilators too with STL turned on.

[wxWidgets.git] / include / wx / motif / msgdlg.h

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index cc4d9e9a3fadfb0fe223f385b36de05cc68b62e4..008f64b8cd646f6d93b000e7667355cad2b72fa0 100644 (file)
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.h
+// Name:        wx/motif/msgdlg.h
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      Julian Smart
@@ -13,7 +13,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "msgdlg.h"
 #endif
 
@@ -26,27 +26,26 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
 
-class WXDLLEXPORT wxMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-        
+
 public:
     wxMessageDialog(wxWindow *parent,
         const wxString& message,
         const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK | wxCENTRE,
         const wxPoint& pos = wxDefaultPosition);
-    
+
     int ShowModal();
-    
+
     // implementation only from now on
     // called by the Motif callback
     void SetResult(long result) { m_result = result; }
-    
+
 protected:
     wxString    m_caption;
     wxString    m_message;
-    long        m_dialogStyle;
     wxWindow *  m_parent;
     long        m_result;
 };