width and height arguments are no longer ignored in wxRadioBox::SetSize()

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

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index 1229a9516e0c6ddc145edcd63db41e7b23b6469a..be6d5e2e91de6c0d0390508614b00460dae33c33 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -2,9 +2,8 @@
 // Name:        brush.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        brush.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +13,8 @@
 
 #include "wx/brush.h"
 
 
 #include "wx/brush.h"
 

+#include "gdk/gdk.h"
+

 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------


@@ -21,26 +22,34 @@
 class wxBrushRefData: public wxObjectRefData
 {
   public:
 class wxBrushRefData: public wxObjectRefData
 {
   public:

-  
-    wxBrushRefData(void);
-  
+
+    wxBrushRefData();
+    wxBrushRefData( const wxBrushRefData& data );
+

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

-wxBrushRefData::wxBrushRefData(void)
+wxBrushRefData::wxBrushRefData()

 {
   m_style = 0;
 }
 
 {
   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)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 //-----------------------------------------------------------------------------
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

-wxBrush::wxBrush(void)
+wxBrush::wxBrush()

 {
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 {
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }


@@ -50,16 +59,7 @@ wxBrush::wxBrush( const wxColour &colour, int style )
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colour;
   m_refData = new wxBrushRefData();
   M_BRUSHDATA->m_style = style;
   M_BRUSHDATA->m_colour = colour;

-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}

 
 

-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 );
 }
 
   if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 


@@ -69,64 +69,112 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
   M_BRUSHDATA->m_style = wxSTIPPLE;
   M_BRUSHDATA->m_colour = *wxBLACK;
   M_BRUSHDATA->m_stipple = stippleBitmap;
   M_BRUSHDATA->m_style = wxSTIPPLE;
   M_BRUSHDATA->m_colour = *wxBLACK;
   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 );
+  if (wxTheBrushList) wxTheBrushList->AddBrush( this );

 }
 
 }
 

-wxBrush::~wxBrush(void)
+wxBrush::~wxBrush()

 {
   if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
 }
 
 wxBrush& wxBrush::operator = ( const wxBrush& brush )
 {
 {
   if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
 }
 
 wxBrush& wxBrush::operator = ( const wxBrush& brush )
 {

-  if (*this == brush) return (*this); 
-  Ref( brush ); 
-  return *this; 
+  if (*this == brush) return (*this);
+  Ref( brush );
+  return *this;

 }
 }

-  
+

 bool wxBrush::operator == ( const wxBrush& brush )
 {
 bool wxBrush::operator == ( const wxBrush& brush )
 {

-  return m_refData == brush.m_refData; 
+  return m_refData == brush.m_refData;

 }
 
 bool wxBrush::operator != ( const wxBrush& brush )
 {
 }
 
 bool wxBrush::operator != ( const wxBrush& brush )
 {

-  return m_refData != brush.m_refData; 
+  return m_refData != brush.m_refData;

 }
 
 }
 

-bool wxBrush::Ok(void) const
+bool wxBrush::Ok() const

 {
   return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 
 {
   return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 

-int wxBrush::GetStyle(void) const
+int wxBrush::GetStyle() 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() 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() 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( 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()
+{
+  if (!m_refData)
+  {
+    m_refData = new wxBrushRefData();
+  }
+  else
+  {
+    wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
+    UnRef();
+    m_refData = ref;
+  }
+}