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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index b0296e860ed1d64088e535f72ddfcb5bd566d792..80b36ec6841b064083723cfc983695de847dbb4f 100644 (file)
--- 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
 //-----------------------------------------------------------------------------
 
 //               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
 #define wxCOLOUR_IS_GDIOBJECT 0
 #else
 #define wxCOLOUR_IS_GDIOBJECT 1

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index d1add0c9c3e7fb9c3dc25c8f361acf00dc8de09f..7dea13b85ac1531942e61debb9b4cf6fadc6a4d5 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -22,7 +22,7 @@
 #define INCL_PM
 #include<os2.h>
 
 #define INCL_PM
 #include<os2.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

 
 // Colour
 
 
 // Colour