Oops, I left an extra { in there.

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

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index e8bfb069689e26d9c1a3c18ba54fce8c44b6ee3f..1c08f89f07deba06ef9ef626b06f804c2b9f9148 100644 (file)
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -1,18 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "brush.h"
 #endif
 
 #pragma implementation "brush.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/brush.h"
 #include "wx/brush.h"

+#include "wx/colour.h"
+
+#include <gdk/gdk.h>

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


@@ -20,18 +25,30 @@
 
 class wxBrushRefData: public wxObjectRefData
 {
 
 class wxBrushRefData: public wxObjectRefData
 {

-  public:
-  
-    wxBrushRefData(void);
-  
-    int        m_style;
-    wxBitmap   m_stipple;
-    wxColour   m_colour;
-};
-
-wxBrushRefData::wxBrushRefData(void)
-{
-  m_style = 0;
+public:
+    wxBrushRefData()
+    {
+        m_style = 0;
+    }
+    
+    wxBrushRefData( const wxBrushRefData& data )
+        : wxObjectRefData()
+    {
+        m_style = data.m_style;
+        m_stipple = data.m_stipple;
+        m_colour = data.m_colour;
+    }
+    
+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_style == data.m_style &&
+                m_stipple == data.m_stipple &&
+                m_colour == data.m_colour);
+    }
+    
+    int       m_style;
+    wxColour  m_colour;
+    wxBitmap  m_stipple;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -40,93 +57,116 @@ wxBrushRefData::wxBrushRefData(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

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

 {
 {

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

 
 

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

 {
 {

-  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_colour = *wxBLACK;

 
 

-wxBrush::wxBrush( const wxString &colourName, const int style )
-{
-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = style;
-  M_BRUSHDATA->m_colour = colourName;
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-};
+    M_BRUSHDATA->m_stipple = stippleBitmap;

 
 

-wxBrush::wxBrush( const wxBitmap &stippleBitmap )
-{
-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = wxSTIPPLE;
-  M_BRUSHDATA->m_colour = *wxBLACK;
-  M_BRUSHDATA->m_stipple = stippleBitmap;
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-};
+    if (M_BRUSHDATA->m_stipple.GetMask())
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxSTIPPLE;
+}

 
 

-wxBrush::wxBrush( const wxBrush &brush )
+wxBrush::~wxBrush()

 {
 {

-  Ref( brush );
-  
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-};
+    // m_refData unrefed in ~wxObject
+}

 
 

-wxBrush::wxBrush( const wxBrush *brush )
+wxObjectRefData *wxBrush::CreateRefData() const

 {
 {

-  if (brush) Ref( *brush );
-  
-  if (wxTheBrushList) wxTheBrushList->Append( this );
-};
+    return new wxBrushRefData;
+}

 
 

-wxBrush::~wxBrush(void)
+wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const

 {
 {

-  if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
-};
+    return new wxBrushRefData(*(wxBrushRefData *)data);
+}

 
 

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

 {
 {

-  if (*this == brush) return (*this); 
-  Ref( brush ); 
-  return *this; 
-};
-  
-bool wxBrush::operator == ( const wxBrush& brush )
+    if (m_refData == brush.m_refData) return TRUE;
+    
+    if (!m_refData || !brush.m_refData) return FALSE;
+    
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+}
+
+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;
+    }

 
 

-bool wxBrush::Ok(void) const
+    return M_BRUSHDATA->m_colour;
+}
+
+wxBitmap *wxBrush::GetStipple() const

 {
 {

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

 
 

-int wxBrush::GetStyle(void) const
+    return &M_BRUSHDATA->m_stipple;
+}
+
+void wxBrush::SetColour( const wxColour& col )

 {
 {

-  return M_BRUSHDATA->m_style;
-};
+    AllocExclusive();
+    
+    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;
-};
+    AllocExclusive();
+    
+    M_BRUSHDATA->m_colour.Set( r, g, b );
+}

 
 

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

 {
 {

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

 
 

+void wxBrush::SetStipple( const wxBitmap& stipple )
+{
+    AllocExclusive();
+    
+    M_BRUSHDATA->m_stipple = stipple;
+    if (M_BRUSHDATA->m_stipple.GetMask())
+    {
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    }
+    else
+    {
+        M_BRUSHDATA->m_style = wxSTIPPLE;
+    }
+}