Force wide char environment version initialization in wxGetEnvMap().

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

diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index 58fa8e51ae571267a98c103d8c659c66e23a3088..10d24e83460ce9780c2d602f11dc6260cfbc5e88 100644 (file)
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -1,50 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msgdlg.h
+// Name:        wx/os2/msgdlg.h
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/12/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-#ifdef __GNUG__
-#pragma interface "msgdlg.h"
-#endif
-
-#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)
-protected:
-    wxString    m_caption;
-    wxString    m_message;
-    long        m_dialogStyle;
-    wxWindow *  m_parent;
 public:
-    wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-        long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
-
-    int ShowModal();
-};
+    wxMessageDialog( wxWindow*       pParent
+                    ,const wxString& rsMessage
+                    ,const wxString& rsCaption = wxMessageBoxCaptionStr
+                    ,long            lStyle = wxOK|wxCENTRE
+                    ,const wxPoint&  WXUNUSED(rPos) = wxDefaultPosition
+                   )
+        : wxMessageDialogBase(pParent, rsMessage, rsCaption, lStyle)
+    {
+    }
+
+    int ShowModal(void);
 
+protected:
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+}; // end of CLASS wxMessageDialog
 
-int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-  long style = wxOK|wxCENTRE,
-  wxWindow *parent = NULL, int x = -1, int y = -1);
-
-#endif
-    // _WX_MSGBOXDLG_H_
+#endif // _WX_MSGBOXDLG_H_