X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18fefee7d1565c17d37ae3e0e35b5ffa476af9a4..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/generic/datectrl.h

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 4b3eb201ca..6e10829231 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,20 +12,18 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
-class WXDLLIMPEXP_ADV wxButton;
-class WXDLLIMPEXP_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_ADV wxCalendarCtrl;
-class WXDLLIMPEXP_ADV wxCalendarEvent;
-class WXDLLIMPEXP_ADV wxDatePopup;
-class WXDLLIMPEXP_ADV wxTextCtrl;
-
-class WXDLLIMPEXP_ADV wxDatePopupInternal;
+class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
+class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
+class WXDLLIMPEXP_FWD_ADV wxComboCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {
 public:
     // creating the control
     wxDatePickerCtrlGeneric() { Init(); }
+    virtual ~wxDatePickerCtrlGeneric();
     wxDatePickerCtrlGeneric(wxWindow *parent,
                             wxWindowID id,
                             const wxDateTime& date = wxDefaultDateTime,
@@ -60,7 +58,7 @@ public:
                       const wxDateTime& upperdate = wxDefaultDateTime);
 
     // extra methods available only in this (generic) implementation
-    bool SetFormat(const wxChar *fmt);
+    bool SetFormat(const wxString& fmt);
     wxCalendarCtrl *GetCalendar() const { return m_cal; }
 
 
@@ -70,37 +68,19 @@ public:
     // overridden base class methods
     virtual bool Destroy();
 
-    virtual bool Enable(bool enable = true);
-    virtual bool Show(bool show = true);
-
 protected:
     virtual wxSize DoGetBestSize() const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
     void Init();
-    void DropDown(bool down = true);
 
     void OnText(wxCommandEvent &event);
-    void OnEditKey(wxKeyEvent & event);
-    void OnCalKey(wxKeyEvent & event);
-    void OnClick(wxCommandEvent &event);
-    void OnSelChange(wxCalendarEvent &event);
-    void OnSetFocus(wxFocusEvent &event);
-    void OnKillFocus(wxFocusEvent &event);
-    void OnChildSetFocus(wxChildFocusEvent &event);
     void OnSize(wxSizeEvent& event);
+    void OnFocus(wxFocusEvent& event);
 
-
-    wxDatePopupInternal *m_popup;
-    wxTextCtrl *m_txt;
     wxCalendarCtrl *m_cal;
-    wxButton *m_btn;
-    wxString m_format;
-    wxDateTime m_currentDate;
-
-    bool m_dropped,
-         m_ignoreDrop;
+    wxComboCtrl* m_combo;
+    wxCalendarComboPopup* m_popup;
 
 
     DECLARE_EVENT_TABLE()