set icons bundle, not single icon, for frames loaded from XRC

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

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index effcfc0cbe484b33b74511675ea428d11912b219..fbc5e3da215605432b3e089d5694753a9930479e 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -77,7 +77,7 @@ private:
     wxColour                        m_vColour;
     WXHPEN                          m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
 
-    DECLARE_NO_ASSIGN_CLASS(wxPenRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
@@ -168,6 +168,15 @@ 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
 );
@@ -399,7 +408,7 @@ wxGDIRefData* wxPen::CreateGDIRefData() 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 )
@@ -479,7 +488,7 @@ void wxPen::SetCap(
     RealizeResource();
 } // end of wxPen::SetCap
 
-wxColour& wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );