destructor for wxMenu deletes menu now

[wxWidgets.git] / include / wx / generic / msgdlgg.h

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index a2029036a5a0d5a516c4e0f09570fc993530368f..62dddb1b876522384fc50c6dceaf9ce61a562c12 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -22,29 +22,32 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 
 class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
-protected:
-    long m_dialogStyle;
+
 public:
-    wxGenericMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
+    wxGenericMessageDialog(wxWindow *parent, const wxString& message, 
+        const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
+    
+private:
+    int     m_dialogStyle;
 
 DECLARE_EVENT_TABLE()
 };
 
-#ifndef __WINDOWS__
+#if !defined( __WXMSW__ ) && !defined( __WXMAC__)
 #define wxMessageDialog wxGenericMessageDialog
 
 int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  const long style = wxOK|wxCENTRE, wxWindow *parent = NULL, const int x = -1, const int y = -1);
+  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
 
 #endif