wxDC::StretchBlit() for wxMac and wxMSW (patch 1611973)

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

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 4dac18355ad7d148e715c56d7382dd038d53f53c..e6b97d405d41823cac3cd70f120f2bfd0593b4cc 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,21 +12,18 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
 #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 wxCalendarDateAttr;
 class WXDLLIMPEXP_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_ADV wxCalendarEvent;

-class WXDLLIMPEXP_ADV wxDatePopup;
-class WXDLLIMPEXP_ADV wxTextCtrl;
-
-class WXDLLIMPEXP_ADV wxDatePopupInternal;
+class WXDLLIMPEXP_ADV wxComboCtrl;
+class WXDLLIMPEXP_ADV wxCalendarComboPopup;

 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {
 public:
     // creating the control
     wxDatePickerCtrlGeneric() { Init(); }
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {
 public:
     // creating the control
     wxDatePickerCtrlGeneric() { Init(); }

-    ~wxDatePickerCtrlGeneric() ;
+    virtual ~wxDatePickerCtrlGeneric();

     wxDatePickerCtrlGeneric(wxWindow *parent,
                             wxWindowID id,
                             const wxDateTime& date = wxDefaultDateTime,
     wxDatePickerCtrlGeneric(wxWindow *parent,
                             wxWindowID id,
                             const wxDateTime& date = wxDefaultDateTime,


@@ -71,37 +68,19 @@ public:
     // overridden base class methods
     virtual bool Destroy();
 
     // overridden base class methods
     virtual bool Destroy();
 

-    virtual bool Enable(bool enable = true);
-    virtual bool Show(bool show = true);
-

 protected:
     virtual wxSize DoGetBestSize() const;
 protected:
     virtual wxSize DoGetBestSize() const;

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

 
 private:
     void Init();
 
 private:
     void Init();

-    void DropDown(bool down = true);

 
     void OnText(wxCommandEvent &event);
 
     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 OnSize(wxSizeEvent& event);

+    void OnFocus(wxFocusEvent& event);

 
 

-
-    wxDatePopupInternal *m_popup;
-    wxTextCtrl *m_txt;

     wxCalendarCtrl *m_cal;
     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_EVENT_TABLE()