call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consist...

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

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 214007898251e7ec0cf4cb692ebcb3518a952ba8..0106125d9a4da55272915133473a7045f9c97089 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -21,7 +21,7 @@
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData: public wxGDIRefData

 {
 public:
     wxBrushRefData()
 {
 public:
     wxBrushRefData()


@@ -30,7 +30,7 @@ public:
     }
 
     wxBrushRefData( const wxBrushRefData& data )
     }
 
     wxBrushRefData( const wxBrushRefData& data )

-        : wxObjectRefData()
+        : wxGDIRefData()

     {
         m_style = data.m_style;
         m_stipple = data.m_stipple;
     {
         m_style = data.m_style;
         m_stipple = data.m_stipple;


@@ -40,7 +40,7 @@ public:
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
     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);
     }
 
                 m_colour == data.m_colour);
     }
 


@@ -80,17 +80,17 @@ wxBrush::~wxBrush()
     // m_refData unrefed in ~wxObject
 }
 
     // m_refData unrefed in ~wxObject
 }
 

-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const

 {
     return new wxBrushRefData;
 }
 
 {
     return new wxBrushRefData;
 }
 

-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }
 
 {
     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 true;