adding explicit log.h include

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

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index effcfc0cbe484b33b74511675ea428d11912b219..e0af18abc5579bc37534eb06f785beea6ed3b9dd 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -168,6 +168,15 @@ wxPen::wxPen(
     RealizeResource();
 } // end of wxPen::wxPen
 
     RealizeResource();
 } // end of wxPen::wxPen
 

+bool wxPen::operator==(const wxPen& pen) const
+{
+    const wxPenRefData *
+        penData = static_cast<const wxPenRefData *>(pen.m_refData);
+
+    // an invalid pen is only equal to another invalid pen
+    return m_refData ? penData && *M_PENDATA == *penData : !penData;
+}
+

 int wx2os2PenStyle(
   wxPenStyle                               nWxStyle
 );
 int wx2os2PenStyle(
   wxPenStyle                               nWxStyle
 );


@@ -399,7 +408,7 @@ wxGDIRefData* wxPen::CreateGDIRefData() const
 
 wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
 {
 
 wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
 {

-    return new wxPenRefData(*wx_static_cast(const wxPenRefData*, data));
+    return new wxPenRefData(*static_cast<const wxPenRefData*>(data));

 }
 
 void wxPen::SetColour( const wxColour& rColour )
 }
 
 void wxPen::SetColour( const wxColour& rColour )


@@ -479,7 +488,7 @@ void wxPen::SetCap(
     RealizeResource();
 } // end of wxPen::SetCap
 
     RealizeResource();
 } // end of wxPen::SetCap
 

-wxColour& wxPen::GetColour() const
+wxColour wxPen::GetColour() const

 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );