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

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 4b3eb201ca..37734a803e 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/datectrl.h
+// Name:        wx/generic/datectrl.h
 // Purpose:     generic wxDatePickerCtrl implementation
 // Author:      Andreas Pflug
 // Modified by:
@@ -12,20 +12,20 @@
 #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;
+#include "wx/compositewin.h"
 
-class WXDLLIMPEXP_ADV wxDatePopupInternal;
+class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
 
-class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
+class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
+
+class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric
+    : public wxCompositeWindow<wxDatePickerCtrlBase>
 {
 public:
     // creating the control
     wxDatePickerCtrlGeneric() { Init(); }
+    virtual ~wxDatePickerCtrlGeneric();
     wxDatePickerCtrlGeneric(wxWindow *parent,
                             wxWindowID id,
                             const wxDateTime& date = wxDefaultDateTime,
@@ -60,8 +60,7 @@ public:
                       const wxDateTime& upperdate = wxDefaultDateTime);
 
     // extra methods available only in this (generic) implementation
-    bool SetFormat(const wxChar *fmt);
-    wxCalendarCtrl *GetCalendar() const { return m_cal; }
+    wxCalendarCtrl *GetCalendar() const;
 
 
     // implementation only from now on
@@ -70,41 +69,28 @@ 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);
+
+    // return the list of the windows composing this one
+    virtual wxWindowList GetCompositeWindowParts() const;
 
     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);
 
+#ifdef __WXOSX_COCOA__
+    virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { }
+#endif
 
-    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()
-    DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
+    wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric);
 };
 
 #endif // _WX_GENERIC_DATECTRL_H_