Minor corrections to make dist after reports

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

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 642a6936476081c3e807b00107cac8afabb1f8c7..75172a2d44612a4d4f67e40bbb5b50370e2e3ce5 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,11 +12,10 @@
 #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 wxComboCtrl;
-class WXDLLIMPEXP_ADV wxCalendarComboPopup;
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+
+class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 {
@@ -58,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
@@ -76,12 +75,11 @@ private:
 
     void OnText(wxCommandEvent &event);
     void OnSize(wxSizeEvent& event);
+    void OnFocus(wxFocusEvent& event);
 
-    wxCalendarCtrl *m_cal;
     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 
-
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
 };