Build fix for wxMSWUniv makefile driven builds. univ/setup0.h should be autoregenerat...

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

diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index 31bbf814cf5ed6aa55fc277b13089b13c702a83e..2e2879af5e690ae692a26114bf8e149b65744ba7 100644 (file)
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -1,37 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.h
+// Name:        wx/gtk1/msgdlg.h
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __MSGDLG_H__
 #define __MSGDLG_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
 #include "wx/dialog.h"
 
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
 
-class WXDLLEXPORT wxMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent, const wxString& message,
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
-    ~wxMessageDialog();
+    virtual ~wxMessageDialog();
 
     int ShowModal();
     virtual bool Show( bool WXUNUSED(show) = true ) { return false; };
@@ -48,7 +44,6 @@ protected:
 private:
     wxString m_caption;
     wxString m_message;
-    long m_dialogStyle;
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };