fix crash in wxExecuteModule::OnExit() (never noticed before because it wasn't execut...

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

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index 736dcc6cfde15cf61be7e6c23a772fcfd7da22c6..7ac5842b351f0f5f1165fdbad288481b34a2685a 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -12,16 +12,19 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/utils.h"
 #include "wx/brush.h"
-#include "wx/bitmap.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData : public wxGDIRefData
 {
 public:
     wxBrushRefData()
@@ -39,7 +42,7 @@ public:
     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);
     }
 
@@ -79,12 +82,12 @@ 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);
 }