X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cafbad8f17e0c3f1f4453dfd098ac3fa09eaa4a0..0c05fdf3570e8066b8a9a16627562e544306a678:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index ccc307e118..4b0b124af4 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -12,7 +12,7 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "brush.h" #endif @@ -30,7 +30,7 @@ class WXDLLEXPORT wxBrush : public wxGDIObject { public: wxBrush(); - wxBrush(const wxColour& col, int style); + wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); wxBrush(const wxBrush& brush) { Ref(brush); } virtual ~wxBrush(); @@ -50,8 +50,8 @@ public: bool Ok() const { return m_refData != NULL; } - // create (if necessary) and return the HBRUSH for this brush - WXHBRUSH GetResourceHandle() const; + // return the HBRUSH for this brush + virtual WXHANDLE GetResourceHandle() const; protected: virtual wxObjectRefData *CreateRefData() const;