Implemented Chuck Messenger's naming and simplification improvements,

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

diff --git a/include/wx/stubs/brush.h b/include/wx/stubs/brush.h
index cdedb4045e1efdb896da2d3d7d304dc957dccf92..a0a1bd7471b880ae9d4fe6505853bd1cbf997423 100644 (file)
--- a/include/wx/stubs/brush.h
+++ b/include/wx/stubs/brush.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxBrush;
 public:
     wxBrushRefData();
     friend class WXDLLEXPORT wxBrush;
 public:
     wxBrushRefData();

+    wxBrushRefData(const wxBrushRefData& data);

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


@@ -49,15 +50,12 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
   wxBrush();
   wxBrush(const wxColour& col, int style);
 public:
   wxBrush();
   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) { if (brush) Ref(*brush); }

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


@@ -70,6 +68,15 @@ public:
   inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
 
   virtual bool Ok() const { return (m_refData != NULL) ; }
   inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
 
   virtual bool Ok() const { return (m_refData != NULL) ; }

+
+// Implementation
+
+  // Useful helper: create the brush resource
+  bool RealizeResource();
+
+  // When setting properties, we must make sure we're not changing
+  // another object
+  void Unshare();

 };
 
 #endif
 };
 
 #endif