more forward declarations (trying to fix bug 1106829)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,10 +12,12 @@
|
|||||||
#ifndef _WX_GENERIC_DATECTRL_H_
|
#ifndef _WX_GENERIC_DATECTRL_H_
|
||||||
#define _WX_GENERIC_DATECTRL_H_
|
#define _WX_GENERIC_DATECTRL_H_
|
||||||
|
|
||||||
|
class WXDLLIMPEXP_CORE wxButton;
|
||||||
class WXDLLIMPEXP_ADV wxCalendarDateAttr;
|
class WXDLLIMPEXP_ADV wxCalendarDateAttr;
|
||||||
class WXDLLIMPEXP_ADV wxCalendarCtrl;
|
class WXDLLIMPEXP_ADV wxCalendarCtrl;
|
||||||
class WXDLLIMPEXP_ADV wxCalendarEvent;
|
class WXDLLIMPEXP_ADV wxCalendarEvent;
|
||||||
class WXDLLIMPEXP_ADV wxPopupWindow;
|
class WXDLLIMPEXP_CORE wxPopupWindow;
|
||||||
|
class WXDLLIMPEXP_CORE wxTextCtrl;
|
||||||
|
|
||||||
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
|
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
|
||||||
{
|
{
|
||||||
@@ -72,16 +74,8 @@ protected:
|
|||||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxPopupWindow *m_popup;
|
|
||||||
wxTextCtrl *m_txt;
|
|
||||||
wxCalendarCtrl *m_cal;
|
|
||||||
wxButton *m_btn;
|
|
||||||
wxString m_format;
|
|
||||||
|
|
||||||
bool m_dropped, m_ignoreDrop;
|
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
void DropDown(bool down=true);
|
void DropDown(bool down = true);
|
||||||
|
|
||||||
void OnText(wxCommandEvent &ev);
|
void OnText(wxCommandEvent &ev);
|
||||||
void OnEditKey(wxKeyEvent & event);
|
void OnEditKey(wxKeyEvent & event);
|
||||||
@@ -92,6 +86,17 @@ private:
|
|||||||
void OnKillFocus(wxFocusEvent &ev);
|
void OnKillFocus(wxFocusEvent &ev);
|
||||||
void OnChildSetFocus(wxChildFocusEvent &ev);
|
void OnChildSetFocus(wxChildFocusEvent &ev);
|
||||||
|
|
||||||
|
|
||||||
|
wxPopupWindow *m_popup;
|
||||||
|
wxTextCtrl *m_txt;
|
||||||
|
wxCalendarCtrl *m_cal;
|
||||||
|
wxButton *m_btn;
|
||||||
|
wxString m_format;
|
||||||
|
|
||||||
|
bool m_dropped,
|
||||||
|
m_ignoreDrop;
|
||||||
|
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
|
DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user