GetSubcontrols now const

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index c8e1e94644756cbb793a06d5647d27e3892e144b..2549f9b989a16310535a404f3388cec3b7634c63 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -58,7 +58,7 @@ public:
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
     virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
     virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 

-    wxArrayLong GetSubcontrols() { return m_subControls; }
+    const wxArrayLong& GetSubcontrols() const { return m_subControls; }

 
     void OnEraseBackground(wxEraseEvent& event);
 
 
     void OnEraseBackground(wxEraseEvent& event);
 

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index cec5c0f8eda641398c906534965a2312f6c2f281..0ab90686a80205ccd8b484149c0e7c9d5d05b688 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -350,7 +350,7 @@ void wxToolTip::SetWindow(wxWindow *win)
     wxControl *control = wxDynamicCast(m_window, wxControl);
     if ( control )
     {
     wxControl *control = wxDynamicCast(m_window, wxControl);
     if ( control )
     {

-        const wxArrayLong subcontrols = control->GetSubcontrols();
+        const wxArrayLong& subcontrols = control->GetSubcontrols();

         size_t count = subcontrols.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = subcontrols.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {