fix memory leak (coverity checker CID 53)

[wxWidgets.git] / src / gtk1 / pen.cpp

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 176463b69d23c99b9eac083718478332a91f1afd..b88a212c19ec02b2c998e90755a02625a80504e1 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/gtk1/pen.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,10 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/pen.h"
 #include "wx/colour.h"
 
 #include "wx/pen.h"
 #include "wx/colour.h"


@@ -33,7 +31,7 @@ public:
         m_dash = (wxGTKDash*) NULL;
         m_countDashes = 0;
     }
         m_dash = (wxGTKDash*) NULL;
         m_countDashes = 0;
     }

-    
+

     wxPenRefData( const wxPenRefData& data )
         : wxObjectRefData()
     {
     wxPenRefData( const wxPenRefData& data )
         : wxObjectRefData()
     {


@@ -43,27 +41,35 @@ public:
         m_capStyle = data.m_capStyle;
         m_colour = data.m_colour;
         m_countDashes = data.m_countDashes;
         m_capStyle = data.m_capStyle;
         m_colour = data.m_colour;
         m_countDashes = data.m_countDashes;

-/*
-        if (data.m_dash)  TODO
-            m_dash = new
-*/

         m_dash = data.m_dash;
     }
 
     bool operator == (const wxPenRefData& data) const
     {
         m_dash = data.m_dash;
     }
 
     bool operator == (const wxPenRefData& data) const
     {

-        // It is impossible to tell if the dashes have changed
-        // so the only thing to do is assume they have
-        if (m_countDashes != 0 || data.m_countDashes != 0)
+        if ( m_countDashes != data.m_countDashes )
+            return false;
+
+        if ( m_dash )
+        {
+            if ( !data.m_dash ||
+                 memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
+            {
+                return false;
+            }
+        }
+        else if ( data.m_dash )
+        {

             return false;
             return false;

+        }

 
 

-        return (m_style == data.m_style &&
-                m_width == data.m_width &&
-                m_joinStyle == data.m_joinStyle &&
-                m_capStyle == data.m_capStyle &&
-                m_colour == data.m_colour);
+
+        return m_style == data.m_style &&
+               m_width == data.m_width &&
+               m_joinStyle == data.m_joinStyle &&
+               m_capStyle == data.m_capStyle &&
+               m_colour == data.m_colour;

     }
     }

-            
+

     int        m_width;
     int        m_style;
     int        m_joinStyle;
     int        m_width;
     int        m_style;
     int        m_joinStyle;


@@ -104,60 +110,60 @@ wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
 
 bool wxPen::operator == ( const wxPen& pen ) const
 {
 
 bool wxPen::operator == ( const wxPen& pen ) const
 {

-    if (m_refData == pen.m_refData) return TRUE;
-    
-    if (!m_refData || !pen.m_refData) return FALSE;
-    
+    if (m_refData == pen.m_refData) return true;
+
+    if (!m_refData || !pen.m_refData) return false;
+

     return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {
     AllocExclusive();
     return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     AllocExclusive();
     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_countDashes = number_of_dashes;
     M_PENDATA->m_countDashes = number_of_dashes;

-    M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
+    M_PENDATA->m_dash = (wxGTKDash *)dash;

 }
 
 }
 

-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )

 {
     AllocExclusive();
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
 void wxPen::SetCap( int capStyle )
 {
     AllocExclusive();
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
 void wxPen::SetCap( int capStyle )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin( int joinStyle )
 {
     AllocExclusive();
     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin( int joinStyle )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle( int style )
 {
     AllocExclusive();
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle( int style )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
     AllocExclusive();
     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_width = width;
 }
 
     M_PENDATA->m_width = width;
 }
 


@@ -211,4 +217,3 @@ wxColour &wxPen::GetColour() const
 
     return M_PENDATA->m_colour;
 }
 
     return M_PENDATA->m_colour;
 }

-