X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/include/wx/os2/brush.h diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 07fcf1dc0f..365a4a0575 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -6,7 +6,7 @@ // Created: 10/13/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ @@ -37,7 +37,7 @@ protected: #define M_BRUSHDATA ((wxBrushRefData *)m_refData) // Brush -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) @@ -64,7 +64,7 @@ public: virtual void SetStipple(const wxBitmap& rStipple); inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); }; - inline int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); }; + virtual int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); }; inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); }; inline int GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); }; @@ -79,7 +79,7 @@ public: // bool RealizeResource(void); WXHANDLE GetResourceHandle(void) ; - bool FreeResource(bool bForce = FALSE); + bool FreeResource(bool bForce = false); bool IsFree(void) const; void Unshare(void); }; // end of CLASS wxBrush