test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

[wxWidgets.git] / include / wx / generic / datectrl.h

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index e064777469d6923144e35a3beee1fbf953c019cf..e6b97d405d41823cac3cd70f120f2bfd0593b4cc 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -15,77 +15,76 @@
 class WXDLLIMPEXP_ADV wxCalendarDateAttr;
 class WXDLLIMPEXP_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_ADV wxCalendarEvent;
 class WXDLLIMPEXP_ADV wxCalendarDateAttr;
 class WXDLLIMPEXP_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_ADV wxCalendarEvent;

+class WXDLLIMPEXP_ADV wxComboCtrl;
+class WXDLLIMPEXP_ADV wxCalendarComboPopup;

 
 

-class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase
+class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase

 {
 public:
 {
 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,
                             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;
     void SetValue(const wxDateTime& date);
     wxDateTime GetValue() const;

+

     bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
     void SetRange(const wxDateTime &dt1, const wxDateTime &dt2);
 
     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
+    bool SetFormat(const wxChar *fmt);
+    wxCalendarCtrl *GetCalendar() const { return m_cal; }

 
 

-    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 wxSize DoGetBestSize() const;

-    virtual void DoMoveWindow(int x, int y, int width, int height);

 
 private:
 
 private:

-    wxDialog *m_dlg;
-    wxTextCtrl *m_txt;
+    void Init();
+
+    void OnText(wxCommandEvent &event);
+    void OnSize(wxSizeEvent& event);
+    void OnFocus(wxFocusEvent& event);
+

     wxCalendarCtrl *m_cal;
     wxCalendarCtrl *m_cal;

-    wxButton *m_btn;
-    wxString m_format;
+    wxComboCtrl* m_combo;
+    wxCalendarComboPopup* m_popup;

 
 

-    bool m_dropped, m_ignoreDrop;

 
 

-    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_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxDatePickerCtrl)
+    DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)

 };
 
 #endif // _WX_GENERIC_DATECTRL_H_
 };
 
 #endif // _WX_GENERIC_DATECTRL_H_