X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..c10f20703e5b4e9c605b908f480b863c89ca31ee:/src/gtk1/brush.cpp

diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index a324ecea66..70a2790e4a 100644
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/brush.h"
 
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -21,8 +21,7 @@
 
 class wxBrushRefData: public wxObjectRefData
 {
-  public:
-
+public:
     wxBrushRefData();
     wxBrushRefData( const wxBrushRefData& data );
 
@@ -33,14 +32,14 @@ class wxBrushRefData: public wxObjectRefData
 
 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;
+    m_style = data.m_style;
+    m_stipple = data.m_stipple;
+    m_colour = data.m_colour;
 }
 
 //-----------------------------------------------------------------------------
@@ -51,130 +50,143 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 wxBrush::wxBrush()
 {
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
 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 );
+    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
-  m_refData = new wxBrushRefData();
-  M_BRUSHDATA->m_style = wxSTIPPLE;
-  M_BRUSHDATA->m_colour = *wxBLACK;
-  M_BRUSHDATA->m_stipple = stippleBitmap;
+    m_refData = new wxBrushRefData();
+    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;
+
+    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
 wxBrush::wxBrush( const wxBrush &brush )
 {
-  Ref( brush );
+    Ref( brush );
 
-  if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
 }
 
 wxBrush::~wxBrush()
 {
-  if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+    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 ) const
 {
-  return m_refData == brush.m_refData;
+    return m_refData == brush.m_refData;
 }
 
-bool wxBrush::operator != ( const wxBrush& brush )
+bool wxBrush::operator != ( const wxBrush& brush ) const
 {
-  return m_refData != brush.m_refData;
+    return m_refData != brush.m_refData;
 }
 
 bool wxBrush::Ok() const
 {
-  return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 
 int wxBrush::GetStyle() const
 {
-  if (m_refData == NULL)
-  {
-    wxFAIL_MSG( T("invalid brush") );
-    return 0;
-  }
+    if (m_refData == NULL)
+    {
+        wxFAIL_MSG( wxT("invalid brush") );
+        return 0;
+    }
 
-  return M_BRUSHDATA->m_style;
+    return M_BRUSHDATA->m_style;
 }
 
 wxColour &wxBrush::GetColour() const
 {
-  if (m_refData == NULL)
-  {
-    wxFAIL_MSG( T("invalid brush") );
-    return wxNullColour;
-  }
+    if (m_refData == NULL)
+    {
+        wxFAIL_MSG( wxT("invalid brush") );
+        return wxNullColour;
+    }
 
-  return M_BRUSHDATA->m_colour;
+    return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
-  if (m_refData == NULL)
-  {
-    wxFAIL_MSG( T("invalid brush") );
-    return &wxNullBitmap;
-  }
+    if (m_refData == NULL)
+    {
+        wxFAIL_MSG( wxT("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;
+    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 );
+    Unshare();
+    M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 
 void wxBrush::SetStyle( int style )
 {
-  Unshare();
-  M_BRUSHDATA->m_style = style;
+    Unshare();
+    M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple( const wxBitmap& stipple )
 {
-  Unshare();
-  M_BRUSHDATA->m_stipple = 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;
-  }
+    if (!m_refData)
+    {
+        m_refData = new wxBrushRefData();
+    }
+    else
+    {
+        wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
+        UnRef();
+        m_refData = ref;
+    }
 }