X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..b5d43d1d73da3d4c690af39466fd1d73889df2db:/include/wx/mac/brush.h diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h index 0fbf591753..12e60e06d1 100644 --- a/include/wx/mac/brush.h +++ b/include/wx/mac/brush.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: brush.h // Purpose: wxBrush class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "brush.h" #endif @@ -37,9 +37,11 @@ class WXDLLEXPORT wxBrush: public wxGDIObject public: wxBrush(); wxBrush(short macThemeBrush ) ; - wxBrush(const wxColour& col, int style); + wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - inline wxBrush(const wxBrush& brush) { Ref(brush); } + wxBrush(const wxBrush& brush) + : wxGDIObject() + { Ref(brush); } ~wxBrush(); virtual void SetColour(const wxColour& col) ; @@ -49,9 +51,12 @@ public: virtual void SetMacTheme(short macThemeBrush) ; virtual void SetMacThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ; - inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; } - inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; } - inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; } + wxBrush& operator = (const wxBrush& brush) + { if (*this == brush) return (*this); Ref(brush); return *this; } + bool operator == (const wxBrush& brush) + { return m_refData == brush.m_refData; } + bool operator != (const wxBrush& brush) + { return m_refData != brush.m_refData; } wxMacBrushKind MacGetBrushKind() const ;