merging back XTI branch part 2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
parent f0c6b96336
commit 2895324520
244 changed files with 4364 additions and 5859 deletions
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -88,8 +88,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8

-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-
 wxColour::wxColour(const GdkColor& gdkColor)
 {
    m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);