X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..9c039d08bfbb59c0abcbc705fb49f9b2cb321edf:/src/gtk1/brush.cpp

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 1229a9516e..9b36dfce3d 100644
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -23,7 +23,8 @@ class wxBrushRefData: public wxObjectRefData
   public:
   
     wxBrushRefData(void);
-  
+    wxBrushRefData( const wxBrushRefData& data );
+ 
     int        m_style;
     wxBitmap   m_stipple;
     wxColour   m_colour;
@@ -34,6 +35,13 @@ wxBrushRefData::wxBrushRefData(void)
   m_style = 0;
 }
 
+wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
+{
+  m_style = data.m_style;
+  m_stipple = data.m_stipple;
+  m_colour = data.m_colour;
+}
+
 //-----------------------------------------------------------------------------
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
@@ -116,17 +124,78 @@ bool wxBrush::Ok(void) const
 
 int wxBrush::GetStyle(void) const
 {
+  if (m_refData == NULL)
+  {
+    wxFAIL_MSG( "invalid brush" );
+    return 0;
+  }
+
   return M_BRUSHDATA->m_style;
 }
 
 wxColour &wxBrush::GetColour(void) const
 {
+  if (m_refData == NULL)
+  {
+    wxFAIL_MSG( "invalid brush" );
+    return wxNullColour;
+  }
+  
   return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple(void) const
 {
+  if (m_refData == NULL)
+  {
+    wxFAIL_MSG( "invalid brush" );
+    return &wxNullBitmap;
+  }
+  
   return &M_BRUSHDATA->m_stipple;
 }
 
+void wxBrush::SetColour( const wxColour& col )
+{
+  Unshare();
+  M_BRUSHDATA->m_colour = col;
+}
+
+void wxBrush::SetColour( const wxString& col )
+{
+  Unshare();
+  M_BRUSHDATA->m_colour = col;
+}
+
+void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
+{
+  Unshare();
+  M_BRUSHDATA->m_colour.Set( r, g, b );
+}
+
+void wxBrush::SetStyle( int style )
+{
+  Unshare();
+  M_BRUSHDATA->m_style = style;
+}
+
+void wxBrush::SetStipple( const wxBitmap& stipple )
+{
+  Unshare();
+  M_BRUSHDATA->m_stipple = stipple;
+}
+
+void wxBrush::Unshare(void)
+{
+  if (!m_refData)
+  {
+    m_refData = new wxBrushRefData();
+  }
+  else
+  {
+    wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
+    UnRef();
+    m_refData = ref;
+  }
+}