X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ed64378076af9e28d1c3f896d4b85bdc6aa1b2a..3c029873c66cfdc0dcbf52958970273435ba02fc:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 16c7419422..a2e56f7159 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -59,8 +59,8 @@ public: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); // For ownerdraw items - 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; } const wxArrayLong& GetSubcontrols() const { return m_subControls; } @@ -68,6 +68,9 @@ public: // could call it virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); + // default style for the control include WS_TABSTOP if it AcceptsFocus() + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + protected: // choose the default border for this window virtual wxBorder GetDefaultBorder() const; @@ -111,9 +114,6 @@ protected: const wxString& label = wxEmptyString, WXDWORD exstyle = (WXDWORD)-1); - // default style for the control include WS_TABSTOP if it AcceptsFocus() - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - // call this from the derived class MSWControlColor() if you want to show // the control greyed out (and opaque) WXHBRUSH MSWControlColorDisabled(WXHDC pDC);