X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/123865f20a601da4692ce808f69832cd808bf31d..6c5d62917d14278d8925a73d754965713e11e32f:/include/wx/msw/scrolbar.h diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h index 4f45dc975b..45e6dec23b 100644 --- a/include/wx/msw/scrolbar.h +++ b/include/wx/msw/scrolbar.h @@ -12,10 +12,6 @@ #ifndef _WX_SCROLBAR_H_ #define _WX_SCROLBAR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "scrolbar.h" -#endif - // Scrollbar item class WXDLLEXPORT wxScrollBar: public wxScrollBarBase { @@ -57,12 +53,14 @@ public: virtual bool MSWOnScroll(int orientation, WXWORD wParam, WXWORD pos, WXHWND control); -protected: + // override wxControl version to not use solid background here + virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); - virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd); - wxSize DoGetBestSize() const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; +protected: + virtual wxSize DoGetBestSize() const; + int m_pageSize; int m_viewSize; int m_objectSize;