Rebake from clean wx tree.

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

diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index af7a32d0466231870cae8c3613453943acd60d5a..10d24e83460ce9780c2d602f11dc6260cfbc5e88 100644 (file)
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -1,55 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.h
+// Name:        wx/os2/msgdlg.h

 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#include "wx/setup.h"
-#include "wx/dialog.h"
-
-/*
- * Message box dialog
- */
-
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
-
-class WXDLLEXPORT wxMessageDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxMessageDialog)

 public:
     wxMessageDialog( wxWindow*       pParent
                     ,const wxString& rsMessage
                     ,const wxString& rsCaption = wxMessageBoxCaptionStr
                     ,long            lStyle = wxOK|wxCENTRE
 public:
     wxMessageDialog( wxWindow*       pParent
                     ,const wxString& rsMessage
                     ,const wxString& rsCaption = wxMessageBoxCaptionStr
                     ,long            lStyle = wxOK|wxCENTRE

-                    ,const wxPoint&  rPos = wxDefaultPosition
-                   );
+                    ,const wxPoint&  WXUNUSED(rPos) = wxDefaultPosition
+                   )
+        : wxMessageDialogBase(pParent, rsMessage, rsCaption, lStyle)
+    {
+    }

 
     int ShowModal(void);
 
 protected:
 
     int ShowModal(void);
 
 protected:

-    wxString                        m_sCaption;
-    wxString                        m_sMessage;
-    long                            m_lDialogStyle;
-    wxWindow*                       m_pParent;
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)

 }; // end of CLASS wxMessageDialog
 
 }; // end of CLASS wxMessageDialog
 

-
-int WXDLLEXPORT wxMessageBox( const wxString& rsMessage
-                             ,const wxString& rsCaption = wxMessageBoxCaptionStr
-                             ,long            lStyle = wxOK|wxCENTRE
-                             ,wxWindow*       pParent = NULL
-                             ,int             nX = -1
-                             ,int             nY = -1
-                            );
-
-#endif
-    // _WX_MSGBOXDLG_H_
+#endif // _WX_MSGBOXDLG_H_