don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 6e108292311ab3a7702825f663e18c60aeb2f8cd..28461eb130bb9a9b16a07d46c48b6a3dbf7ff8c3 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,10 +12,9 @@
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 
 #ifndef _WX_GENERIC_DATECTRL_H_
 #define _WX_GENERIC_DATECTRL_H_
 

-class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
-class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
-class WXDLLIMPEXP_FWD_ADV wxComboCtrl;
+#include "wx/calctrl.h"
+#include "wx/combo.h"
+

 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase


@@ -59,7 +58,7 @@ public:
 
     // extra methods available only in this (generic) implementation
     bool SetFormat(const wxString& fmt);
 
     // extra methods available only in this (generic) implementation
     bool SetFormat(const wxString& fmt);

-    wxCalendarCtrl *GetCalendar() const { return m_cal; }
+    wxCalendarCtrl *GetCalendar() const;

 
 
     // implementation only from now on
 
 
     // implementation only from now on


@@ -78,13 +77,11 @@ private:
     void OnSize(wxSizeEvent& event);
     void OnFocus(wxFocusEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnFocus(wxFocusEvent& event);
 

-    wxCalendarCtrl *m_cal;

     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 
     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 

-

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
+    wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric);

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