Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / generic / colour.cpp

diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp
index 70600717d7f7c64cb78fcb24af618c5fb1a43afb..d4c9ed20135cc45ec5e08cfb48a38a0868d76a7c 100644 (file)
--- a/src/generic/colour.cpp
+++ b/src/generic/colour.cpp
@@ -22,8 +22,6 @@
     #include "wx/gdicmn.h"
 #endif
 
     #include "wx/gdicmn.h"
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-

 // Colour
 
 void wxColour::Init()
 // Colour
 
 void wxColour::Init()


@@ -35,6 +33,18 @@ void wxColour::Init()
     m_isInit = false;
 }
 
     m_isInit = false;
 }
 

+void wxColour::InitRGBA(unsigned char r,
+                        unsigned char g,
+                        unsigned char b,
+                        unsigned char a)
+{
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_alpha = a;
+    m_isInit = true;
+}
+

 wxColour& wxColour::operator=(const wxColour& col)
 {
     m_red = col.m_red;
 wxColour& wxColour::operator=(const wxColour& col)
 {
     m_red = col.m_red;