projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix confusion with (Do)DrawSplines() overloads; don't allocate points on the heap...
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
brush.h
diff --git
a/include/wx/gtk1/brush.h
b/include/wx/gtk1/brush.h
index ecdfe463981e55686594dcba1ce547b08e321546..c7ea67babecba5ce1c9a3fa3495cb06b4793cb14 100644
(file)
--- a/
include/wx/gtk1/brush.h
+++ b/
include/wx/gtk1/brush.h
@@
-21,7
+21,7
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_
FWD_
CORE wxBrush;
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
// wxBrush
@@
-32,33
+32,28
@@
class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
public:
wxBrush() { }
public:
wxBrush() { }
- wxBrush( const wxColour &colour, int style = wxSOLID );
+ wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif
wxBrush( const wxBitmap &stippleBitmap );
wxBrush( const wxBitmap &stippleBitmap );
- ~wxBrush();
+
virtual
~wxBrush();
- wxBrush( const wxBrush &brush )
- : wxBrushBase()
- { Ref(brush); }
- wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
+ bool operator==(const wxBrush& brush) const;
+ bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
- bool Ok() const { return m_refData != NULL; }
-
- bool operator == ( const wxBrush& brush ) const;
- bool operator != (const wxBrush& brush) const { return !(*this == brush); }
-
- virtual int GetStyle() const;
- wxColour &GetColour() const;
+ wxBrushStyle GetStyle() const;
+ wxColour GetColour() const;
wxBitmap *GetStipple() const;
void SetColour( const wxColour& col );
void SetColour( unsigned char r, unsigned char g, unsigned char b );
wxBitmap *GetStipple() const;
void SetColour( const wxColour& col );
void SetColour( unsigned char r, unsigned char g, unsigned char b );
- void SetStyle(
int
style );
+ void SetStyle(
wxBrushStyle
style );
void SetStipple( const wxBitmap& stipple );
private:
void SetStipple( const wxBitmap& stipple );
private:
- // ref counting code
- virtual wxObjectRefData *CreateRefData() const;
- virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
DECLARE_DYNAMIC_CLASS(wxBrush)
};
DECLARE_DYNAMIC_CLASS(wxBrush)
};