X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..f463afe347cce23a4ff565ecab990c2dfe61827a:/src/gtk/brush.cpp

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index daa94416cb..4c54c10897 100644
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -4,20 +4,18 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "brush.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"
-#include "wx/colour.h"
 
-#include <gdk/gdk.h>
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -30,7 +28,7 @@ public:
     {
         m_style = 0;
     }
-    
+
     wxBrushRefData( const wxBrushRefData& data )
         : wxObjectRefData()
     {
@@ -38,14 +36,14 @@ public:
         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_stipple.IsSameAs(data.m_stipple) &&
                 m_colour == data.m_colour);
     }
-    
+
     int       m_style;
     wxColour  m_colour;
     wxBitmap  m_stipple;
@@ -94,10 +92,10 @@ wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
 
 bool wxBrush::operator == ( const wxBrush& brush ) const
 {
-    if (m_refData == brush.m_refData) return TRUE;
-    
-    if (!m_refData || !brush.m_refData) return FALSE;
-    
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
     return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
 }
 
@@ -137,28 +135,28 @@ wxBitmap *wxBrush::GetStipple() const
 void wxBrush::SetColour( const wxColour& col )
 {
     AllocExclusive();
-    
+
     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
     AllocExclusive();
-    
+
     M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 
 void wxBrush::SetStyle( int style )
 {
     AllocExclusive();
-    
+
     M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple( const wxBitmap& stipple )
 {
     AllocExclusive();
-    
+
     M_BRUSHDATA->m_stipple = stipple;
     if (M_BRUSHDATA->m_stipple.GetMask())
     {
@@ -169,4 +167,3 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
         M_BRUSHDATA->m_style = wxSTIPPLE;
     }
 }
-