From 2c0b3fd14ceccfb93c4e0163466b47519c86edd6 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sat, 12 Jan 2008 00:10:23 +0000 Subject: [PATCH 1/1] derive wxColourBase from wxObject on os2 as well git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/colour.h | 2 +- src/os2/colour.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/colour.h b/include/wx/colour.h index b0296e860e..80b36ec684 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -58,7 +58,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) // code redundancy in all native wxColour implementations //----------------------------------------------------------------------------- -#if defined( __WXMAC__ ) || defined( __WXMSW__ ) +#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXPM__ ) #define wxCOLOUR_IS_GDIOBJECT 0 #else #define wxCOLOUR_IS_GDIOBJECT 1 diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp index d1add0c9c3..7dea13b85a 100644 --- a/src/os2/colour.cpp +++ b/src/os2/colour.cpp @@ -22,7 +22,7 @@ #define INCL_PM #include -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) // Colour -- 2.45.2