wxDateTime starting to work, more tests for it and for threads in console sample

[wxWidgets.git] / include / wx / stubs / pen.h

diff --git a/include/wx/stubs/pen.h b/include/wx/stubs/pen.h
index 2d0aa7b84657ddce2597e9ff1f2da17fb890457a..938908b56be96ad67d784c31278619e7fd13ef5a 100644 (file)
--- a/include/wx/stubs/pen.h
+++ b/include/wx/stubs/pen.h
@@ -55,10 +55,8 @@ class WXDLLEXPORT wxPen: public wxGDIObject
 public:
   wxPen();
   wxPen(const wxColour& col, int width, int style);
 public:
   wxPen();
   wxPen(const wxColour& col, int width, int style);

-  wxPen(const wxString& col, int width, int style);

   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }

-  inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }

   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }


@@ -69,8 +67,7 @@ public:
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;

-  void SetColour(const wxString& col)  ;
-  void SetColour(const unsigned char r, const unsigned char g, const unsigned char b)  ;
+  void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;

 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;
 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;