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

diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index 00706a0c9c279a2322fe357b40afd604ce980196..e1c963d4f1c4ec8aa09b4cde20403d35651a32d9 100644 (file)
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -138,7 +138,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     // Event handlers
     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.
 
     // 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 fb993f38adbbff90c4bc3388ee0d3f5143ceb072..d7af0024032027fc7aebb41d25ba896bb441f0de 100644 (file)
--- a/src/generic/bmpcboxg.cpp
+++ b/src/generic/bmpcboxg.cpp
@@ -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
     if ( !m_inResize )
 {
     // Prevent infinite looping
     if ( !m_inResize )