X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b134bb2ce1cba6a0033bdc553817d45de5b2cf7..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/generic/datectrl.h

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index b0d27c63de..6f83acb042 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,30 +12,42 @@
 #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 wxDatePickerCtrl : public wxDatePickerCtrlBase
+class WXDLLIMPEXP_ADV wxDatePopupInternal;
+
+class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {
 public:
     // creating the control
-    wxDatePickerCtrl() { Init(); }
-    wxDatePickerCtrl(wxWindow *parent,
-                   wxWindowID id,
-                   const wxDateTime& date = wxDefaultDateTime,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxString& name = wxDatePickerCtrlNameStr);
+    wxDatePickerCtrlGeneric() { Init(); }
+    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, validator, name);
+    }
 
     bool Create(wxWindow *parent,
-                            wxWindowID id,
-                            const wxDateTime& date,
-                            const wxPoint& pos,
-                            const wxSize& size,
-                            long style,
-                            const wxString& name=wxDatePickerCtrlNameStr);
+                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);
@@ -58,37 +70,40 @@ public:
     // overridden base class methods
     virtual bool Destroy();
 
-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    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:
-    wxDialog *m_dlg;
+    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);
+
+
+    wxDatePopupInternal *m_popup;
     wxTextCtrl *m_txt;
     wxCalendarCtrl *m_cal;
     wxButton *m_btn;
     wxString m_format;
+    wxDateTime m_currentDate;
 
-    bool m_dropped, m_ignoreDrop;
-
-    void Init();
-    void DropDown(bool down=true);
+    bool m_dropped,
+         m_ignoreDrop;
 
-    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)
+    DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
 };
 
 #endif // _WX_GENERIC_DATECTRL_H_