From 012967ef1b0789a537452e36cdd7cafc5fdb51b7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 Sep 2006 12:40:37 +0000 Subject: [PATCH 1/1] rename OnResize() to OnSize() to avoid conflict with base class OnResize(void) virtual git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/bmpcbox.h | 2 +- src/generic/bmpcboxg.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h index 00706a0c9c..e1c963d4f1 100644 --- a/include/wx/generic/bmpcbox.h +++ b/include/wx/generic/bmpcbox.h @@ -138,7 +138,7 @@ protected: virtual wxSize DoGetBestSize() const; // Event handlers - void OnResize(wxSizeEvent& event); + void OnSize(wxSizeEvent& event); // Recalculates amount of empty space needed in front of // text in control itself. diff --git a/src/generic/bmpcboxg.cpp b/src/generic/bmpcboxg.cpp index fb993f38ad..d7af002403 100644 --- a/src/generic/bmpcboxg.cpp +++ b/src/generic/bmpcboxg.cpp @@ -66,7 +66,7 @@ const wxChar wxBitmapComboBoxNameStr[] = wxT("bitmapComboBox"); BEGIN_EVENT_TABLE(wxBitmapComboBox, wxOwnerDrawnComboBox) - EVT_SIZE(wxBitmapComboBox::OnResize) + EVT_SIZE(wxBitmapComboBox::OnSize) END_EVENT_TABLE() @@ -326,7 +326,7 @@ void wxBitmapComboBox::DetermineIndent() SetCustomPaintWidth(indent); } -void wxBitmapComboBox::OnResize(wxSizeEvent& event) +void wxBitmapComboBox::OnSize(wxSizeEvent& event) { // Prevent infinite looping if ( !m_inResize ) -- 2.45.2