Fix for crash when opening empty node

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

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index defdde27979e3ac4c02aabbb631e288981c89142..91b77c959e55679c07f6a1aaa37df0ab100633c9 100644 (file)
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -13,12 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/brush.h"
-#include "wx/log.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/brush.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"


@@ -34,9 +34,7 @@ wxBrushRefData::wxBrushRefData()
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 

-wxBrushRefData::wxBrushRefData(
-  const wxBrushRefData&             rData
-)
+wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData)

 {
     m_nStyle   = rData.m_nStyle;
     m_vStipple = rData.m_vStipple;
 {
     m_nStyle   = rData.m_nStyle;
     m_vStipple = rData.m_vStipple;


@@ -54,14 +52,10 @@ wxBrushRefData::~wxBrushRefData()
 //
 wxBrush::wxBrush()
 {
 //
 wxBrush::wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 } // end of wxBrush::wxBrush
 
 wxBrush::~wxBrush()
 {
 } // end of wxBrush::wxBrush
 
 wxBrush::~wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->RemoveBrush(this);

 } // end of wxBrush::~wxBrush
 
 wxBrush::wxBrush(
 } // end of wxBrush::~wxBrush
 
 wxBrush::wxBrush(


@@ -77,14 +71,9 @@ wxBrush::wxBrush(
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();

-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 } // end of wxBrush::wxBrush
 
 } // end of wxBrush::wxBrush
 

-wxBrush::wxBrush(
-  const wxBitmap&                   rStipple
-)
+wxBrush::wxBrush(const wxBitmap& rStipple)

 {
     m_refData = new wxBrushRefData;
 
 {
     m_refData = new wxBrushRefData;
 


@@ -94,9 +83,6 @@ wxBrush::wxBrush(
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();

-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 } // end of wxBrush::wxBrush
 
 bool wxBrush::RealizeResource()
 } // end of wxBrush::wxBrush
 
 bool wxBrush::RealizeResource()


@@ -211,8 +197,8 @@ bool wxBrush::RealizeResource()
         bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush
                                   ,PRIM_AREA
                                   ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |
         bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush
                                   ,PRIM_AREA
                                   ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |

-                                   ABB_SET | ABB_SYMBOL
-                                  ,ABB_REF_POINT
+                                   ABB_SET | ABB_SYMBOL | ABB_REF_POINT
+                                  ,ABB_SET | ABB_SYMBOL | ABB_REF_POINT

                                   ,&M_BRUSHDATA->m_vBundle
                                  );
         if (!bOk)
                                   ,&M_BRUSHDATA->m_vBundle
                                  );
         if (!bOk)


@@ -226,7 +212,7 @@ bool wxBrush::RealizeResource()
     return false;
 } // end of wxBrush::RealizeResource
 
     return false;
 } // end of wxBrush::RealizeResource
 

-WXHANDLE wxBrush::GetResourceHandle()
+WXHANDLE wxBrush::GetResourceHandle() const

 {
     if (!M_BRUSHDATA)
         return 0;
 {
     if (!M_BRUSHDATA)
         return 0;


@@ -305,3 +291,16 @@ void wxBrush::SetPS(
     M_BRUSHDATA->m_hBrush = hPS;
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS
     M_BRUSHDATA->m_hBrush = hPS;
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS

+
+
+bool wxBrush::operator == (
+    const wxBrush& brush
+) const
+{
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+} // end of wxBrush::operator ==
+