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

rename OnResize() to OnSize() to avoid conflict with base class OnResize(void) virtual

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-25 12:40:37 +00:00
parent c57cdbd8d6
commit 012967ef1b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/bmpcbox.h
View File

@@ -138,7 +138,7 @@ protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
// Event handlers // Event handlers
void OnResize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
// Recalculates amount of empty space needed in front of // Recalculates amount of empty space needed in front of
// text in control itself. // text in control itself.

4
src/generic/bmpcboxg.cpp
View File

@@ -66,7 +66,7 @@ const wxChar wxBitmapComboBoxNameStr[] = wxT("bitmapComboBox");
BEGIN_EVENT_TABLE(wxBitmapComboBox, wxOwnerDrawnComboBox) BEGIN_EVENT_TABLE(wxBitmapComboBox, wxOwnerDrawnComboBox)
EVT_SIZE(wxBitmapComboBox::OnResize) EVT_SIZE(wxBitmapComboBox::OnSize)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -326,7 +326,7 @@ void wxBitmapComboBox::DetermineIndent()
SetCustomPaintWidth(indent); SetCustomPaintWidth(indent);
} }
void wxBitmapComboBox::OnResize(wxSizeEvent& event) void wxBitmapComboBox::OnSize(wxSizeEvent& event)
{ {
// Prevent infinite looping // Prevent infinite looping
if ( !m_inResize ) if ( !m_inResize )