Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / include / wx / listctrl.h

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 667d975b4d4f2065effba054fd7b216aaa1b6e03..41b350b38e22d7db6ac09d7c72d538f6e189a9d7 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_LISTCTRL_H_BASE_
 #define _WX_LISTCTRL_H_BASE_
 
+#ifdef __GNUG__
+    #pragma interface "listctrlbase.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
@@ -148,6 +152,10 @@ public:
     wxListItem();
     ~wxListItem() { delete m_attr; }
 
+    // resetting
+    void Clear();
+    void ClearAttributes();
+
     // setters
     void SetMask(long mask) { m_mask = mask; }
     void SetId(long id) { m_itemId = id; }
@@ -184,12 +192,12 @@ public:
     wxListItemAttr *GetAttributes() const { return m_attr; }
     bool HasAttributes() const { return m_attr != NULL; }
 
-    const wxColour& GetTextColour() const
+    wxColour GetTextColour() const
         { return HasAttributes() ? m_attr->GetTextColour() : wxNullColour; }
-    const wxColour& GetBackgroundColour() const
+    wxColour GetBackgroundColour() const
         { return HasAttributes() ? m_attr->GetBackgroundColour()
                                  : wxNullColour; }
-    const wxFont& GetFont() const
+    wxFont GetFont() const
         { return HasAttributes() ? m_attr->GetFont() : wxNullFont; }
 
     // these members are public for compatibility
@@ -280,9 +288,7 @@ public:
     inline long GetMask() { return m_item.m_mask; }
     inline const wxListItem &GetItem() const { return m_item; }
 
-#ifndef __WXMSW__
     void CopyObject(wxObject& object_dest) const;
-#endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxListEvent)