From 34f0083726b6fd8d642df975e8999ca0dc8af903 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sat, 29 Mar 2008 21:18:36 +0000 Subject: [PATCH] Linker fixes for OS/2 build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/bitmap.cpp | 1 + src/os2/pen.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index d4c45a3099..bdd712eeee 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -39,6 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) // ============================================================================ // implementation diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 6dd16877ed..301c86059c 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -168,6 +168,15 @@ wxPen::wxPen( RealizeResource(); } // end of wxPen::wxPen +bool wxPen::operator==(const wxPen& pen) const +{ + const wxPenRefData * + penData = wx_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 ); -- 2.47.2