no message

[wxWidgets.git] / src / gtk / brush.cpp

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index e8bfb069689e26d9c1a3c18ba54fce8c44b6ee3f..9b36dfce3d3571f4cab95c728264b3b3893a3d20 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -23,7 +23,8 @@ class wxBrushRefData: public wxObjectRefData
   public:
   
     wxBrushRefData(void);
   public:
   
     wxBrushRefData(void);

-  
+    wxBrushRefData( const wxBrushRefData& data );
+ 

     int        m_style;
     wxBitmap   m_stipple;
     wxColour   m_colour;
     int        m_style;
     wxBitmap   m_stipple;
     wxColour   m_colour;


@@ -32,7 +33,14 @@ class wxBrushRefData: public wxObjectRefData
 wxBrushRefData::wxBrushRefData(void)
 {
   m_style = 0;
 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;
+}

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -43,25 +51,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 wxBrush::wxBrush(void)
 {
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 wxBrush::wxBrush(void)
 {
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );

-};
+}

 
 

-wxBrush::wxBrush( const wxColour &colour, const int style )
+wxBrush::wxBrush( const wxColour &colour, int style )

 {
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colour;
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 {
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colour;
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );

-};
+}

 
 

-wxBrush::wxBrush( const wxString &colourName, const int style )
+wxBrush::wxBrush( const wxString &colourName, int style )

 {
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colourName;
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 {
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colourName;
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );

-};
+}

 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {


@@ -71,62 +79,123 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
   M_BRUSHDATA->m_stipple = stippleBitmap;
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
   M_BRUSHDATA->m_stipple = stippleBitmap;
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );

-};
+}

 
 wxBrush::wxBrush( const wxBrush &brush )
 {
   Ref( brush );
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 
 wxBrush::wxBrush( const wxBrush &brush )
 {
   Ref( brush );
   
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );

-};
+}

 
 wxBrush::wxBrush( const wxBrush *brush )
 {
   if (brush) Ref( *brush );
   
   if (wxTheBrushList) wxTheBrushList->Append( this );
 
 wxBrush::wxBrush( const wxBrush *brush )
 {
   if (brush) Ref( *brush );
   
   if (wxTheBrushList) wxTheBrushList->Append( this );

-};
+}

 
 wxBrush::~wxBrush(void)
 {
   if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
 
 wxBrush::~wxBrush(void)
 {
   if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );

-};
+}

 
 wxBrush& wxBrush::operator = ( const wxBrush& brush )
 {
   if (*this == brush) return (*this); 
   Ref( brush ); 
   return *this; 
 
 wxBrush& wxBrush::operator = ( const wxBrush& brush )
 {
   if (*this == brush) return (*this); 
   Ref( brush ); 
   return *this; 

-};
+}

   
 bool wxBrush::operator == ( const wxBrush& brush )
 {
   return m_refData == brush.m_refData; 
   
 bool wxBrush::operator == ( const wxBrush& brush )
 {
   return m_refData == brush.m_refData; 

-};
+}

 
 bool wxBrush::operator != ( const wxBrush& brush )
 {
   return m_refData != brush.m_refData; 
 
 bool wxBrush::operator != ( const wxBrush& brush )
 {
   return m_refData != brush.m_refData; 

-};
+}

 
 bool wxBrush::Ok(void) const
 {
   return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 
 bool wxBrush::Ok(void) const
 {
   return ((m_refData) && M_BRUSHDATA->m_colour.Ok());

-};
+}

 
 int wxBrush::GetStyle(void) const
 {
 
 int wxBrush::GetStyle(void) const
 {

+  if (m_refData == NULL)
+  {
+    wxFAIL_MSG( "invalid brush" );
+    return 0;
+  }
+

   return M_BRUSHDATA->m_style;
   return M_BRUSHDATA->m_style;

-};
+}

 
 wxColour &wxBrush::GetColour(void) const
 {
 
 wxColour &wxBrush::GetColour(void) const
 {

+  if (m_refData == NULL)
+  {
+    wxFAIL_MSG( "invalid brush" );
+    return wxNullColour;
+  }
+  

   return M_BRUSHDATA->m_colour;
   return M_BRUSHDATA->m_colour;

-};
+}

 
 wxBitmap *wxBrush::GetStipple(void) const
 {
 
 wxBitmap *wxBrush::GetStipple(void) const
 {

+  if (m_refData == NULL)
+  {
+    wxFAIL_MSG( "invalid brush" );
+    return &wxNullBitmap;
+  }
+  

   return &M_BRUSHDATA->m_stipple;
   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;
+  }
+}