No changes, just remove unnecessary wxPickerBase::OnSize().
This method did the same thing as the base wxWindow class event handler. Also remove wxPickerBase event table which became empty after removing this method. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -121,8 +121,6 @@ protected:
|
|||||||
void OnTextCtrlUpdate(wxCommandEvent &);
|
void OnTextCtrlUpdate(wxCommandEvent &);
|
||||||
void OnTextCtrlKillFocus(wxFocusEvent &);
|
void OnTextCtrlKillFocus(wxFocusEvent &);
|
||||||
|
|
||||||
void OnSize(wxSizeEvent &);
|
|
||||||
|
|
||||||
// returns the set of styles for the attached wxTextCtrl
|
// returns the set of styles for the attached wxTextCtrl
|
||||||
// from given wxPickerBase's styles
|
// from given wxPickerBase's styles
|
||||||
virtual long GetTextCtrlStyle(long style) const
|
virtual long GetTextCtrlStyle(long style) const
|
||||||
@@ -178,7 +176,6 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
DECLARE_ABSTRACT_CLASS(wxPickerBase)
|
DECLARE_ABSTRACT_CLASS(wxPickerBase)
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -43,11 +43,6 @@
|
|||||||
|
|
||||||
IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
|
IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxPickerBase, wxControl)
|
|
||||||
EVT_SIZE(wxPickerBase::OnSize)
|
|
||||||
END_EVENT_TABLE()
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxPickerBase
|
// wxPickerBase
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -177,11 +172,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &)
|
|||||||
UpdatePickerFromTextCtrl();
|
UpdatePickerFromTextCtrl();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxPickerBase::OnSize(wxSizeEvent &event)
|
|
||||||
{
|
|
||||||
if (GetAutoLayout())
|
|
||||||
Layout();
|
|
||||||
event.Skip();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // Any picker in use
|
#endif // Any picker in use
|
||||||
|
Reference in New Issue
Block a user