diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index c8e1e94644..2549f9b989 100644 --- 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; }; - wxArrayLong GetSubcontrols() { return m_subControls; } + const wxArrayLong& GetSubcontrols() const { return m_subControls; } void OnEraseBackground(wxEraseEvent& event); diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp index cec5c0f8ed..0ab90686a8 100644 --- 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 ) { - const wxArrayLong subcontrols = control->GetSubcontrols(); + const wxArrayLong& subcontrols = control->GetSubcontrols(); size_t count = subcontrols.GetCount(); for ( size_t n = 0; n < count; n++ ) {