projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ 1945434 ] Changing method wxComboCtrlBase::DrawButton to virtual one
[wxWidgets.git]
/
include
/
wx
/
generic
/
datectrl.h
diff --git
a/include/wx/generic/datectrl.h
b/include/wx/generic/datectrl.h
index 6e108292311ab3a7702825f663e18c60aeb2f8cd..c84f551994626c1a98174a29885b214e80a107eb 100644
(file)
--- a/
include/wx/generic/datectrl.h
+++ b/
include/wx/generic/datectrl.h
@@
-13,9
+13,9
@@
#define _WX_GENERIC_DATECTRL_H_
class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
#define _WX_GENERIC_DATECTRL_H_
class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
-class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
+class WXDLLIMPEXP_FWD_ADV wx
Generic
CalendarCtrl;
class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
-class WXDLLIMPEXP_FWD_
ADV
wxComboCtrl;
+class WXDLLIMPEXP_FWD_
CORE
wxComboCtrl;
class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
@@
-59,7
+59,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);
- wx
CalendarCtrl *GetCalendar() const { return m_cal; }
+ wx
GenericCalendarCtrl *GetCalendar() const;
// implementation only from now on
// implementation only from now on
@@
-78,7
+78,6
@@
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;