add ka_GE, ku_TR and ne_NP; some cleanup and better handling of sr_XX (patch 1858926)

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

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index c6b35cc4a26b4b11504f715bc2820fe3fcd327fd..0106125d9a4da55272915133473a7045f9c97089 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -7,40 +7,43 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/brush.h"
 
-#include <gdk/gdk.h>
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData: public wxGDIRefData
 {
 public:
     wxBrushRefData()
     {
         m_style = 0;
     }
-    
+
     wxBrushRefData( const wxBrushRefData& data )
+        : wxGDIRefData()
     {
         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_stipple.IsSameAs(data.m_stipple) &&
                 m_colour == data.m_colour);
     }
-    
+
     int       m_style;
     wxColour  m_colour;
     wxBitmap  m_stipple;
@@ -77,22 +80,22 @@ wxBrush::~wxBrush()
     // m_refData unrefed in ~wxObject
 }
 
-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const
 {
     return new wxBrushRefData;
 }
 
-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }
 
-bool wxBrush::operator == ( const wxBrush& brush ) 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 );
 }
 
@@ -132,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())
     {
@@ -164,4 +167,3 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
         M_BRUSHDATA->m_style = wxSTIPPLE;
     }
 }
-