From 001828ed69cd0fd34231bf1c52a6ede3933bf25d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 5 Jan 2008 00:04:34 +0000
Subject: [PATCH] compilation fix (remove default ctor already implemented by
 DEFINE_STD_WXCOLOUR_CONSTRUCTORS); make copy ctor inline and remove empty
 dtor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/colour.h |  9 +++++----
 src/generic/colour.cpp      | 25 -------------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 24fefe2f6b..ca1ebf05b9 100644
--- 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
-    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; }
diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp
index 6cda3d1e84..70600717d7 100644
--- a/src/generic/colour.cpp
+++ b/src/generic/colour.cpp
@@ -35,16 +35,6 @@ void wxColour::Init()
     m_isInit = false;
 }
 
-wxColour::wxColour()
-{
-    Init();
-}
-
-wxColour::wxColour(const wxColour& col)
-{
-    *this = col;
-}
-
 wxColour& wxColour::operator=(const wxColour& col)
 {
     m_red = col.m_red;
@@ -55,18 +45,3 @@ wxColour& wxColour::operator=(const wxColour& col)
     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;
-}
-- 
2.45.2