X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39df3acde9a009f9aafe4b218cdfab5bee59724d..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/generic/datectrl.h

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index e064777469..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,80 +12,85 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
-class WXDLLIMPEXP_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_ADV wxCalendarCtrl;
-class WXDLLIMPEXP_ADV wxCalendarEvent;
+#include "wx/compositewin.h"
 
-class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase
+class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
+
+class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
+
+class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric
+    : public wxCompositeWindow<wxDatePickerCtrlBase>
 {
 public:
-    wxDatePickerCtrl() { Init(); }
-    wxDatePickerCtrl(wxWindow *parent,
-                   wxWindowID id,
-                   const wxDateTime& date = wxDefaultDateTime,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS, const wxString& name=wxDatePickerCtrlNameStr);
-
-    bool Create(wxWindow *parent,
+    // creating the control
+    wxDatePickerCtrlGeneric() { Init(); }
+    virtual ~wxDatePickerCtrlGeneric();
+    wxDatePickerCtrlGeneric(wxWindow *parent,
                             wxWindowID id,
-                            const wxDateTime& date,
-                            const wxPoint& pos,
-                            const wxSize& size,
-                            long style,
-                            const wxString& name=wxDatePickerCtrlNameStr);
+                            const wxDateTime& date = wxDefaultDateTime,
+                            const wxPoint& pos = wxDefaultPosition,
+                            const wxSize& size = wxDefaultSize,
+                            long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
+                            const wxValidator& validator = wxDefaultValidator,
+                            const wxString& name = wxDatePickerCtrlNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, date, pos, size, style, validator, name);
+    }
 
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxDateTime& date = wxDefaultDateTime,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxDatePickerCtrlNameStr);
+
+    // wxDatePickerCtrl methods
     void SetValue(const wxDateTime& date);
     wxDateTime GetValue() const;
+
     bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
     void SetRange(const wxDateTime &dt1, const wxDateTime &dt2);
 
-    bool Destroy();
+    bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
+                      const wxDateTime& upperdate = wxDefaultDateTime);
 
-    bool SetLowerDateLimit(const wxDateTime& date = wxDefaultDateTime) { return m_cal->SetLowerDateLimit(date); }
-    const wxDateTime& GetLowerDateLimit() const { return m_cal->GetLowerDateLimit(); }
-    bool SetUpperDateLimit(const wxDateTime& date = wxDefaultDateTime) { return m_cal->SetUpperDateLimit(date); }
-    const wxDateTime& GetUpperDateLimit() const { return m_cal->GetUpperDateLimit(); }
+    // extra methods available only in this (generic) implementation
+    wxCalendarCtrl *GetCalendar() const;
 
-    bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, const wxDateTime& upperdate = wxDefaultDateTime)
-    { return m_cal->SetDateRange(lowerdate, upperdate); }
 
-    wxCalendarDateAttr *GetAttr(size_t day) const { return m_cal->GetAttr(day); }
-    void SetAttr(size_t day, wxCalendarDateAttr *attr) { m_cal->SetAttr(day, attr); }
-    void SetHoliday(size_t day) { m_cal->SetHoliday(day); }
-    void ResetAttr(size_t day) { m_cal->ResetAttr(day); }
-    bool SetFormat(const wxChar *fmt);
+    // implementation only from now on
+    // -------------------------------
 
-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    // overridden base class methods
+    virtual bool Destroy();
 
+protected:
     virtual wxSize DoGetBestSize() const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
-    wxDialog *m_dlg;
-    wxTextCtrl *m_txt;
-    wxCalendarCtrl *m_cal;
-    wxButton *m_btn;
-    wxString m_format;
+    void Init();
 
-    bool m_dropped, m_ignoreDrop;
+    // return the list of the windows composing this one
+    virtual wxWindowList GetCompositeWindowParts() const;
+
+    void OnText(wxCommandEvent &event);
+    void OnSize(wxSizeEvent& event);
+    void OnFocus(wxFocusEvent& event);
+
+#ifdef __WXOSX_COCOA__
+    virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { }
+#endif
+
+    wxComboCtrl* m_combo;
+    wxCalendarComboPopup* m_popup;
 
-    void Init();
-    void DropDown(bool down=true);
-
-    void OnText(wxCommandEvent &ev);
-    void OnEditKey(wxKeyEvent & event);
-    void OnCalKey(wxKeyEvent & event);
-    void OnClick(wxCommandEvent &ev);
-    void OnSelChange(wxCalendarEvent &ev);
-    void OnSetFocus(wxFocusEvent &ev);
-    void OnKillFocus(wxFocusEvent &ev);
-    void OnChildSetFocus(wxChildFocusEvent &ev);
-
-    DECLARE_DYNAMIC_CLASS(wxDatePickerCtrl)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDatePickerCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric);
 };
 
 #endif // _WX_GENERIC_DATECTRL_H_