Misc small changes, some for VC++ 1.5

[wxWidgets.git] / include / wx / msw / brush.h

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 71367662a470a6e79849ed2f3e545e524e9cba3f..05ae288300eec6458a2cb47100b6f06994f6d117 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxBrush;
 public:
     wxBrushRefData(void);
     friend class WXDLLEXPORT wxBrush;
 public:
     wxBrushRefData(void);

+    wxBrushRefData(const wxBrushRefData& data);

     ~wxBrushRefData(void);
 
 protected:
     ~wxBrushRefData(void);
 
 protected:


@@ -46,15 +47,12 @@ 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); }
   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }

-  inline wxBrush(const wxBrush* brush) { /* UnRef(); */ if (brush) Ref(*brush); }

   ~wxBrush(void);
 
   virtual void SetColour(const wxColour& col)  ;
   ~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)  ;
 


@@ -72,12 +70,8 @@ public:
   bool RealizeResource(void);
   WXHANDLE GetResourceHandle(void) ;
   bool FreeResource(bool force = FALSE);
   bool RealizeResource(void);
   WXHANDLE GetResourceHandle(void) ;
   bool FreeResource(bool force = FALSE);

-/*
-  bool UseResource(void);
-  bool ReleaseResource(void);
-*/
-
-  bool IsFree(void);
+  bool IsFree() const;
+  void Unshare();

 };
 
 #endif
 };
 
 #endif