Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxComboCtrl instead of custom popup window (patch 1575343)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-22 14:15:46 +00:00
parent 90a6ac27c7
commit 85fa9d60c4
2 changed files with 295 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/generic/datectrl.h
View File

@@ -12,21 +12,18 @@
#ifndef _WX_GENERIC_DATECTRL_H_ #ifndef _WX_GENERIC_DATECTRL_H_
#define _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_
class WXDLLIMPEXP_ADV 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 wxDatePopup; class WXDLLIMPEXP_ADV wxComboCtrl;
class WXDLLIMPEXP_ADV wxTextCtrl; class WXDLLIMPEXP_ADV wxCalendarComboPopup;
class WXDLLIMPEXP_ADV wxDatePopupInternal;
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
{ {
public: public:
// creating the control // creating the control
wxDatePickerCtrlGeneric() { Init(); } wxDatePickerCtrlGeneric() { Init(); }
virtual ~wxDatePickerCtrlGeneric() ; virtual ~wxDatePickerCtrlGeneric();
wxDatePickerCtrlGeneric(wxWindow *parent, wxDatePickerCtrlGeneric(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxDateTime& date = wxDefaultDateTime, const wxDateTime& date = wxDefaultDateTime,
@@ -71,37 +68,18 @@ public:
// overridden base class methods // overridden base class methods
virtual bool Destroy(); virtual bool Destroy();
virtual bool Enable(bool enable = true);
virtual bool Show(bool show = true);
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height);
private: private:
void Init(); 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);
wxDatePopupInternal *m_popup;
wxTextCtrl *m_txt;
wxCalendarCtrl *m_cal; wxCalendarCtrl *m_cal;
wxButton *m_btn; wxComboCtrl* m_combo;
wxString m_format; wxCalendarComboPopup* m_popup;
wxDateTime m_currentDate;
bool m_dropped,
m_ignoreDrop;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

1005
src/generic/datectlg.cpp
View File

File diff suppressed because it is too large Load Diff