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

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

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index e6b97d405d41823cac3cd70f120f2bfd0593b4cc..c84f551994626c1a98174a29885b214e80a107eb 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,11 +12,11 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 

-class WXDLLIMPEXP_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_ADV wxCalendarCtrl;
-class WXDLLIMPEXP_ADV wxCalendarEvent;
-class WXDLLIMPEXP_ADV wxComboCtrl;
-class WXDLLIMPEXP_ADV wxCalendarComboPopup;
+class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
+class WXDLLIMPEXP_FWD_ADV wxGenericCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
+class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;

 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {


@@ -58,8 +58,8 @@ public:
                       const wxDateTime& upperdate = wxDefaultDateTime);
 
     // extra methods available only in this (generic) implementation
                       const wxDateTime& upperdate = wxDefaultDateTime);
 
     // extra methods available only in this (generic) implementation

-    bool SetFormat(const wxChar *fmt);
-    wxCalendarCtrl *GetCalendar() const { return m_cal; }
+    bool SetFormat(const wxString& fmt);
+    wxGenericCalendarCtrl *GetCalendar() const;

 
 
     // implementation only from now on
 
 
     // implementation only from now on


@@ -78,7 +78,6 @@ private:
     void OnSize(wxSizeEvent& event);
     void OnFocus(wxFocusEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnFocus(wxFocusEvent& event);
 

-    wxCalendarCtrl *m_cal;

     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 
     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;