X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..71ba5d266c4c9cc5fdd826acd09d17f68a758986:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 430aa7cfdb..4c566bfb15 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -16,6 +16,8 @@ #pragma interface "control.h" #endif +#include "wx/dynarray.h" + // General item class class WXDLLEXPORT wxControl : public wxControlBase { @@ -43,10 +45,13 @@ public: virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; }; virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; }; - wxList& GetSubcontrols() { return m_subControls; } + wxArrayLong GetSubcontrols() { return m_subControls; } void OnEraseBackground(wxEraseEvent& event); + virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, + WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + #if WXWIN_COMPATIBILITY virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { } wxColour* GetButtonColour() const { return NULL; } @@ -66,8 +71,9 @@ protected: #endif // WXWIN_COMPATIBILITY protected: - // For controls like radiobuttons which are really composite - wxList m_subControls; + // for controls like radiobuttons which are really composite this array + // holds the ids (not HWNDs!) of the sub controls + wxArrayLong m_subControls; virtual wxSize DoGetBestSize() const;