sorry... forgot to commit these 2 files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index e68db683b576352552d8aa2eae6073c4ef99be99..5ba87d90d1ac62c9882450b4cd858e31e3e98469 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -47,15 +47,13 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
   wxBrush(void);
   wxBrush(const wxColour& col, int style);
 public:
   wxBrush(void);
   wxBrush(const wxColour& col, int style);

-  wxBrush(const wxString& col, int style);

   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }
   inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }
   ~wxBrush(void);
 
   virtual void SetColour(const wxColour& col)  ;
   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }
   inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }
   ~wxBrush(void);
 
   virtual void SetColour(const wxColour& col)  ;

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

   virtual void SetStyle(int style)  ;
   virtual void SetStipple(const wxBitmap& stipple)  ;
 
   virtual void SetStyle(int style)  ;
   virtual void SetStipple(const wxBitmap& stipple)  ;
 

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 9915f97622044b10e91e26b15930020b49136956..49339320783b129d25cc7ff680dd288d9263f227 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -51,7 +51,6 @@ 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); }
   inline wxPen(const wxPen* pen) { if (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); }


@@ -65,8 +64,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)  ;