X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ae712f56622968fd7b23d14d22e076e3cb4c65a..ca9e2173a63d0e5a56fa9c2f8e1ff6ff32a9b71f:/include/wx/generic/datectrl.h?ds=sidebyside

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index d363ade157..75172a2d44 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,27 +12,29 @@
 #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 wxPopupWindow;
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+
+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,
                             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, name);
+        (void)Create(parent, id, date, pos, size, style, validator, name);
     }
 
     bool Create(wxWindow *parent,
@@ -41,6 +43,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
+                const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxDatePickerCtrlNameStr);
 
     // wxDatePickerCtrl methods
@@ -54,8 +57,8 @@ public:
                       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);
+    wxCalendarCtrl *GetCalendar() const;
 
 
     // implementation only from now on
@@ -64,33 +67,18 @@ 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:
-    wxPopupWindow *m_popup;
-    wxTextCtrl *m_txt;
-    wxCalendarCtrl *m_cal;
-    wxButton *m_btn;
-    wxString m_format;
+    void Init();
 
-    bool m_dropped, m_ignoreDrop;
+    void OnText(wxCommandEvent &event);
+    void OnSize(wxSizeEvent& event);
+    void OnFocus(wxFocusEvent& event);
 
-    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);
+    wxComboCtrl* m_combo;
+    wxCalendarComboPopup* m_popup;
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)