fixing 10.5 only compiles

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

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 27c10ef6e126dad5b98c9b1787024b07fb1580ba..95c61af4e3e396e2157ac056a78a192499880d0e 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -1,49 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMessageDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxMessageDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MSGBOXDLGH__
-#define __MSGBOXDLGH__
+#ifndef _WX_MSGBOXDLG_H_
+#define _WX_MSGBOXDLG_H_

 
 

-#ifdef __GNUG__
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
-#include "wx/dialog.h"
+class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase
+{
+public:
+    wxMessageDialog(wxWindow *parent,
+                    const wxString& message,
+                    const wxString& caption = wxMessageBoxCaptionStr,
+                    long style = wxOK|wxCENTRE,
+                    const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
+        : wxMessageDialogBase(parent, message, caption, style)
+    {
+    }

 
 

-/*
- * Message box dialog
- */

 
 

-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+    virtual int ShowModal();

 
 

-class WXDLLEXPORT wxMessageDialog: public wxDialog
-{
-DECLARE_DYNAMIC_CLASS(wxMessageDialog)

 protected:
 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(void);
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    DECLARE_NO_COPY_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
-    // __MSGBOXDLGH__
+#endif // _WX_MSGBOXDLG_H_