sorry... forgot to commit these 2 files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-10-20 15:08:30 +00:00
parent e1822f7053
commit 4d94751752
2 changed files with 2 additions and 6 deletions

View File

@@ -47,15 +47,13 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
public: public:
wxBrush(void); wxBrush(void);
wxBrush(const wxColour& col, int style); wxBrush(const wxColour& col, int style);
wxBrush(const wxString& col, int style);
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
inline wxBrush(const wxBrush& brush) { Ref(brush); } inline wxBrush(const wxBrush& brush) { Ref(brush); }
inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); } inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }
~wxBrush(void); ~wxBrush(void);
virtual void SetColour(const wxColour& col) ; virtual void SetColour(const wxColour& col) ;
virtual void SetColour(const wxString& col) ; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
virtual void SetStyle(int style) ; virtual void SetStyle(int style) ;
virtual void SetStipple(const wxBitmap& stipple) ; virtual void SetStipple(const wxBitmap& stipple) ;

View File

@@ -51,7 +51,6 @@ class WXDLLEXPORT wxPen: public wxGDIObject
public: public:
wxPen(); wxPen();
wxPen(const wxColour& col, int width, int style); wxPen(const wxColour& col, int width, int style);
wxPen(const wxString& col, int width, int style);
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); } inline wxPen(const wxPen& pen) { Ref(pen); }
inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); } inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }
@@ -65,8 +64,7 @@ public:
// Override in order to recreate the pen // Override in order to recreate the pen
void SetColour(const wxColour& col) ; void SetColour(const wxColour& col) ;
void SetColour(const wxString& col) ; void SetColour(unsigned char r, unsigned char g, unsigned char b);
void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ;
void SetWidth(int width) ; void SetWidth(int width) ;
void SetStyle(int style) ; void SetStyle(int style) ;