Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 6732bf7adddffc737313af2dcee6a684b3f849b9..e48e1d49195709eafc031bbd6dee2947bdff3716 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMessageDialog class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxMessageDialog class
 // Author:      Julian Smart
 // Modified by:


@@ -12,36 +12,30 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
-#include "wx/dialog.h"
+class WXDLLIMPEXP_CORE 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)
+    {
+        m_hook = NULL;
+    }

 
 

-/*
- * Message box dialog
- */

 
 

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

 
 

-class WXDLLEXPORT wxMessageDialog: public wxDialog
-{
-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);
+private:
+    static WXLRESULT wxCALLBACK HookFunction(int code, WXWPARAM, WXLPARAM);

 
 

-    int ShowModal(void);
+    WXHANDLE m_hook; // HHOOK used to position the message box

 
 

+    DECLARE_DYNAMIC_CLASS(wxMessageDialog)

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

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