part of SF patch #904166 (DMC fix)

[wxWidgets.git] / include / wx / msw / control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 512f308afa3784435b759781ee10ceeda564a7d2..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; };
 
-    wxArrayLong GetSubcontrols() { return m_subControls; }
+    const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
     void OnEraseBackground(wxEraseEvent& event);
 
@@ -69,6 +69,7 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 
+    // return default best size (doesn't really make any sense, override this)
     virtual wxSize DoGetBestSize() const;
 
     // create the control of the given Windows class: this is typically called