From 050e7ed73b61d8503656297fc12799ffd0f5bbfe Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 8 May 2002 22:29:57 +0000
Subject: [PATCH] added missing wxListItem copy ctor to wxMSW, moved wxListItem
 to the header to avoid duplicating it in wxMSW and the generic versions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/listctrl.h    | 45 ++++++++++++++++++++++++++++++------
 src/generic/listctrl.cpp | 50 ----------------------------------------
 src/msw/listctrl.cpp     | 44 -----------------------------------
 3 files changed, 38 insertions(+), 101 deletions(-)

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index ac807f0c9e..484670d111 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -187,16 +187,30 @@ private:
 
 class WXDLLEXPORT wxListItem : public wxObject
 {
-    wxListItem& operator=(const wxListItem& item);
-    
 public:
-    wxListItem();
-    wxListItem(const wxListItem& item);
-    ~wxListItem() { delete m_attr; }
+    wxListItem() { Init(); m_attr = NULL; }
+    wxListItem(const wxListItem& item)
+        : wxObject(),
+          m_mask(item.m_mask),
+          m_itemId(item.m_itemId),
+          m_col(item.m_col),
+          m_state(item.m_state),
+          m_stateMask(item.m_stateMask),
+          m_text(item.m_text),
+          m_image(item.m_image),
+          m_data(item.m_data),
+          m_format(item.m_format),
+          m_width(item.m_width),
+          m_attr(NULL)
+    {
+        // copy list item attributes
+        m_attr = new wxListItemAttr(*item.GetAttributes());
+    }
+    virtual ~wxListItem() { delete m_attr; }
 
     // resetting
-    void Clear();
-    void ClearAttributes();
+    void Clear() { Init(); m_text.clear(); ClearAttributes(); }
+    void ClearAttributes() { if ( m_attr ) { delete m_attr; m_attr = NULL; } }
 
     // setters
     void SetMask(long mask) { m_mask = mask; }
@@ -271,9 +285,26 @@ protected:
         return *m_attr;
     }
 
+    void Init()
+    {
+        m_mask = 0;
+        m_itemId = 0;
+        m_col = 0;
+        m_state = 0;
+        m_stateMask = 0;
+        m_image = 0;
+        m_data = 0;
+
+        m_format = wxLIST_FORMAT_CENTRE;
+        m_width = 0;
+    }
+
     wxListItemAttr *m_attr;     // optional pointer to the items style
 
 private:
+    // VZ: this is strange, we have a copy ctor but not operator=(), why?
+    wxListItem& operator=(const wxListItem& item);
+
     DECLARE_DYNAMIC_CLASS(wxListItem)
 };
 
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 48b0ca5226..2fee597386 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4492,56 +4492,6 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 
 IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
-wxListItem::wxListItem()
-{
-    m_attr = NULL;
-
-    Clear();
-}
-
-wxListItem::wxListItem(const wxListItem& item)
-    : wxObject()
-    , m_mask(item.m_mask)
-    , m_itemId(item.m_itemId)
-    , m_col(item.m_col)
-    , m_state(item.m_state)
-    , m_stateMask(item.m_stateMask)
-    , m_text(item.m_text)
-    , m_image(item.m_image)
-    , m_data(item.m_data)
-    , m_format(item.m_format)
-    , m_width(item.m_width)
-    , m_attr(NULL)
-{
-    // copy list item attributes
-    m_attr = new wxListItemAttr(*item.GetAttributes());
-}
-
-void wxListItem::Clear()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = -1;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text.clear();
-
-    ClearAttributes();
-}
-
-void wxListItem::ClearAttributes()
-{
-    if (m_attr)
-    {
-        delete m_attr;
-        m_attr = NULL;
-    }
-}
-
 // -------------------------------------------------------------------------------------
 // wxListCtrl
 // -------------------------------------------------------------------------------------
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index c0a29caeac..3d7cbc65aa 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -2192,50 +2192,6 @@ void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
     RefreshRect(rect);
 }
 
-// ----------------------------------------------------------------------------
-// wxListItem
-// ----------------------------------------------------------------------------
-
-// List item structure
-wxListItem::wxListItem()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-
-    m_attr = NULL;
-}
-
-void wxListItem::Clear()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text = wxEmptyString;
-
-    if (m_attr) delete m_attr;
-    m_attr = NULL;
-}
-
-void wxListItem::ClearAttributes()
-{
-    if (m_attr) delete m_attr;
-    m_attr = NULL;
-}
-
 static void wxConvertFromMSWListItem(HWND hwndListCtrl,
                                      wxListItem& info,
                                      LV_ITEM& lvItem)
-- 
2.45.2