From: Vadim Zeitlin Date: Sun, 24 Jul 2011 22:19:41 +0000 (+0000) Subject: No changes, just remove unnecessary wxPickerBase::OnSize(). X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f0e5d5d22ce012e9312a63175d79c0f4a8d444be?hp=-c 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 --- f0e5d5d22ce012e9312a63175d79c0f4a8d444be diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index 1d6b383cd8..56a30d0873 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -121,8 +121,6 @@ protected: void OnTextCtrlUpdate(wxCommandEvent &); void OnTextCtrlKillFocus(wxFocusEvent &); - void OnSize(wxSizeEvent &); - // returns the set of styles for the attached wxTextCtrl // from given wxPickerBase's styles virtual long GetTextCtrlStyle(long style) const @@ -178,7 +176,6 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxPickerBase) - DECLARE_EVENT_TABLE() }; diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp index 43215b3cfe..797c946876 100644 --- a/src/common/pickerbase.cpp +++ b/src/common/pickerbase.cpp @@ -43,11 +43,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl) -BEGIN_EVENT_TABLE(wxPickerBase, wxControl) - EVT_SIZE(wxPickerBase::OnSize) -END_EVENT_TABLE() - - // ---------------------------------------------------------------------------- // wxPickerBase // ---------------------------------------------------------------------------- @@ -177,11 +172,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &) UpdatePickerFromTextCtrl(); } -void wxPickerBase::OnSize(wxSizeEvent &event) -{ - if (GetAutoLayout()) - Layout(); - event.Skip(); -} - #endif // Any picker in use