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

use type-safe Connect()s

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-15 11:59:55 +00:00
parent 6981afa11f
commit b62613041d
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/generic/datectlg.cpp
View File

@@ -169,12 +169,12 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
InheritAttributes(); InheritAttributes();
m_txt = new wxTextCtrl(this, CTRLID_TXT); m_txt = new wxTextCtrl(this, CTRLID_TXT);
m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, m_txt->Connect(wxEVT_KEY_DOWN,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnEditKey, wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),
0, this); NULL, this);
m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS, m_txt->Connect(wxEVT_KILL_FOCUS,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnKillFocus, wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
0, this); NULL, this);
const int height = m_txt->GetBestSize().y - 4; // FIXME: fudge const int height = m_txt->GetBestSize().y - 4; // FIXME: fudge
wxBitmap bmp(height, height); wxBitmap bmp(height, height);
@@ -202,29 +202,29 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime, m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
wxPoint(0, 0), wxDefaultSize, wxPoint(0, 0), wxDefaultSize,
wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER); wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED, m_cal->Connect(wxEVT_CALENDAR_SEL_CHANGED,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
0, this); NULL, this);
m_cal->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, m_cal->Connect(wxEVT_KEY_DOWN,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnCalKey, wxKeyEventHandler(wxDatePickerCtrlGeneric::OnCalKey),
0, this); NULL, this);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DOUBLECLICKED, m_cal->Connect(wxEVT_CALENDAR_DOUBLECLICKED,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
0, this); NULL, this);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_DAY_CHANGED, m_cal->Connect(wxEVT_CALENDAR_DAY_CHANGED,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
0, this); NULL, this);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_MONTH_CHANGED, m_cal->Connect(wxEVT_CALENDAR_MONTH_CHANGED,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
0, this); NULL, this);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_YEAR_CHANGED, m_cal->Connect(wxEVT_CALENDAR_YEAR_CHANGED,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSelChange, wxCalendarEventHandler(wxDatePickerCtrlGeneric::OnSelChange),
0, this); NULL, this);
wxWindow *yearControl = m_cal->GetYearControl(); wxWindow *yearControl = m_cal->GetYearControl();
Connect(wxID_ANY, wxID_ANY, wxEVT_SET_FOCUS, Connect(wxEVT_SET_FOCUS,
(wxObjectEventFunction)&wxDatePickerCtrlGeneric::OnSetFocus); wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus));
wxClientDC dc(yearControl); wxClientDC dc(yearControl);
dc.SetFont(m_font); dc.SetFont(m_font);