use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index a20b51b2aec5175dc10a924fb574105a6d6c8ac3..95c61af4e3e396e2157ac056a78a192499880d0e 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -12,31 +12,25 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#include "wx/defs.h"
-#include "wx/dialog.h"
-
-/*
- * Message box dialog
- */
-
-extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
-
-class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
+class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-protected:
-    wxString    m_caption;
-    wxString    m_message;
-    wxWindow *  m_parent;

 public:
 public:

-    wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-        long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+    wxMessageDialog(wxWindow *parent,
+                    const wxString& message,
+                    const wxString& caption = wxMessageBoxCaptionStr,
+                    long style = wxOK|wxCENTRE,
+                    const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
+        : wxMessageDialogBase(parent, message, caption, style)
+    {
+    }
+

 
 

-    int ShowModal(void);
+    virtual int ShowModal();

 
 

+protected:
+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)

     DECLARE_NO_COPY_CLASS(wxMessageDialog)
 };
 
 
     DECLARE_NO_COPY_CLASS(wxMessageDialog)
 };
 
 

-#endif
-    // _WX_MSGBOXDLG_H_
+#endif // _WX_MSGBOXDLG_H_