Replace incorrect uses of wxString::empty() with the intended clear().

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

diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp
index e9bccfc59fba116e5d0cb54b7c600aa17284ae9a..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()


@@ -31,36 +29,29 @@ void wxColour::Init()
     m_red =
     m_blue =
     m_green = 0;
     m_red =
     m_blue =
     m_green = 0;

+    m_alpha = wxALPHA_OPAQUE;

     m_isInit = false;
 }
 
     m_isInit = false;
 }
 

-wxColour::wxColour()
+void wxColour::InitRGBA(unsigned char r,
+                        unsigned char g,
+                        unsigned char b,
+                        unsigned char a)

 {
 {

-    Init();
-}
-
-wxColour::wxColour(const wxColour& col)
-{
-    *this = col;
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_alpha = a;
+    m_isInit = true;

 }
 
 }
 

-wxColour& wxColour::operator =(const wxColour& col)
+wxColour& wxColour::operator=(const wxColour& col)

 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;

+    m_alpha = col.m_alpha;

     m_isInit = col.m_isInit;
     return *this;
 }
 
     m_isInit = col.m_isInit;
     return *this;
 }
 

-wxColour::~wxColour()
-{
-}
-
-void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = true;
-}