compilation fix (remove default ctor already implemented by DEFINE_STD_WXCOLOUR_CONST...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 24fefe2f6be054f26b8467e01c9afa0bdf6d9d07..ca1ebf05b960ccfce8fbdf4517d4689b5afe4fdc 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -23,11 +23,12 @@ public:
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators

-    wxColour(const wxColour& col);
-    wxColour& operator=(const wxColour& col);
+    wxColour(const wxColour& col)
+    {
+        *this = col;
+    }

 
 

-    // dtor
-    virtual ~wxColour();
+    wxColour& operator=(const wxColour& col);

 
     // accessors
     virtual bool IsOk() const { return m_isInit; }
 
     // accessors
     virtual bool IsOk() const { return m_isInit; }

diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp
index 6cda3d1e84adf32793bfea27cf4ea9b77c2e5cd0..70600717d7f7c64cb78fcb24af618c5fb1a43afb 100644 (file)
--- a/src/generic/colour.cpp
+++ b/src/generic/colour.cpp
@@ -35,16 +35,6 @@ void wxColour::Init()
     m_isInit = false;
 }
 
     m_isInit = false;
 }
 

-wxColour::wxColour()
-{
-    Init();
-}
-
-wxColour::wxColour(const wxColour& col)
-{
-    *this = col;
-}
-

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


@@ -55,18 +45,3 @@ wxColour& wxColour::operator=(const wxColour& col)
     return *this;
 }
 
     return *this;
 }
 

-wxColour::~wxColour()
-{
-}
-
-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;
-}