blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 1229a9516e0c6ddc145edcd63db41e7b23b6469a..68d4d985f9722bef02dac87bac37afae3935c41c 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/gtk/brush.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,24 +13,33 @@
 
 #include "wx/brush.h"
 
 
 #include "wx/brush.h"
 

+#include <gdk/gdk.h>
+

 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
 class wxBrushRefData: public wxObjectRefData
 {
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
 class wxBrushRefData: public wxObjectRefData
 {

-  public:
-  
-    wxBrushRefData(void);
-  
+public:
+    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;
+}
+
+wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )

 {
 {

-  m_style = 0;
+    m_style = data.m_style;
+    m_stipple = data.m_stipple;
+    m_colour = data.m_colour;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -40,93 +48,138 @@ wxBrushRefData::wxBrushRefData(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

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

 {
 {

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

 }
 
 wxBrush::wxBrush( const wxColour &colour, 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;

 }
 
 }
 

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

 {
 {

-  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_colour = *wxBLACK;
+
+    M_BRUSHDATA->m_stipple = stippleBitmap;
+
+    if (M_BRUSHDATA->m_stipple.GetMask())
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxSTIPPLE;

 }
 
 }
 

-wxBrush::wxBrush( const wxBitmap &stippleBitmap )
+wxBrush::wxBrush( const wxBrush &brush )

 {
 {

-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = wxSTIPPLE;
-  M_BRUSHDATA->m_colour = *wxBLACK;
-  M_BRUSHDATA->m_stipple = stippleBitmap;
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    Ref( brush );

 }
 
 }
 

-wxBrush::wxBrush( const wxBrush &brush )
+wxBrush::~wxBrush()
+{
+}
+
+wxBrush& wxBrush::operator = ( const wxBrush& brush )

 {
 {

-  Ref( brush );
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    if ( m_refData != brush.m_refData )
+        Ref( brush );
+
+    return *this;

 }
 
 }
 

-wxBrush::wxBrush( const wxBrush *brush )
+bool wxBrush::operator == ( const wxBrush& brush ) const

 {
 {

-  if (brush) Ref( *brush );
-  
-  if (wxTheBrushList) wxTheBrushList->Append( this );
+    return m_refData == brush.m_refData;

 }
 
 }
 

-wxBrush::~wxBrush(void)
+bool wxBrush::operator != ( const wxBrush& brush ) const

 {
 {

-  if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+    return m_refData != brush.m_refData;

 }
 
 }
 

-wxBrush& wxBrush::operator = ( const wxBrush& brush )
+bool wxBrush::Ok() const

 {
 {

-  if (*this == brush) return (*this); 
-  Ref( brush ); 
-  return *this; 
+    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());

 }
 }

-  
-bool wxBrush::operator == ( const wxBrush& brush )
+
+int wxBrush::GetStyle() const

 {
 {

-  return m_refData == brush.m_refData; 
+    if (m_refData == NULL)
+    {
+        wxFAIL_MSG( wxT("invalid brush") );
+        return 0;
+    }
+
+    return M_BRUSHDATA->m_style;

 }
 
 }
 

-bool wxBrush::operator != ( const wxBrush& brush )
+wxColour &wxBrush::GetColour() const

 {
 {

-  return m_refData != brush.m_refData; 
+    if (m_refData == NULL)
+    {
+        wxFAIL_MSG( wxT("invalid brush") );
+        return wxNullColour;
+    }
+
+    return M_BRUSHDATA->m_colour;

 }
 
 }
 

-bool wxBrush::Ok(void) const
+wxBitmap *wxBrush::GetStipple() const

 {
 {

-  return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+    if (m_refData == NULL)
+    {
+        wxFAIL_MSG( wxT("invalid brush") );
+        return &wxNullBitmap;
+    }
+
+    return &M_BRUSHDATA->m_stipple;

 }
 
 }
 

-int wxBrush::GetStyle(void) const
+void wxBrush::SetColour( const wxColour& col )

 {
 {

-  return M_BRUSHDATA->m_style;
+    Unshare();
+    M_BRUSHDATA->m_colour = col;

 }
 
 }
 

-wxColour &wxBrush::GetColour(void) const
+void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )

 {
 {

-  return M_BRUSHDATA->m_colour;
+    Unshare();
+    M_BRUSHDATA->m_colour.Set( r, g, b );

 }
 
 }
 

-wxBitmap *wxBrush::GetStipple(void) const
+void wxBrush::SetStyle( int style )

 {
 {

-  return &M_BRUSHDATA->m_stipple;
+    Unshare();
+    M_BRUSHDATA->m_style = style;

 }
 
 }
 

+void wxBrush::SetStipple( const wxBitmap& stipple )
+{
+    Unshare();
+    M_BRUSHDATA->m_stipple = stipple;
+    if (M_BRUSHDATA->m_stipple.GetMask())
+    {
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    }
+    else
+    {
+        M_BRUSHDATA->m_style = wxSTIPPLE;
+    }
+}
+
+void wxBrush::Unshare()
+{
+    if (!m_refData)
+    {
+        m_refData = new wxBrushRefData();
+    }
+    else
+    {
+        wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
+        UnRef();
+        m_refData = ref;
+    }
+}