added cmdline.h/.cpp to the makefiles

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 31b86aac5ae44ce6249f1259087e9aeb5199d5c0..a9bf6a29bc4eb29f03c48377323fb597fad2dfe4 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -59,7 +59,7 @@ enum
     wxLIST_NEXT_ALL,            // Searches for subsequent item by index
     wxLIST_NEXT_BELOW,          // Searches for an item below the specified item
     wxLIST_NEXT_LEFT,           // Searches for an item to the left of the specified item
     wxLIST_NEXT_ALL,            // Searches for subsequent item by index
     wxLIST_NEXT_BELOW,          // Searches for an item below the specified item
     wxLIST_NEXT_LEFT,           // Searches for an item to the left of the specified item

-    wxLIST_NEXT_RIGHT,          // Searches for an item to the right of the specified item
+    wxLIST_NEXT_RIGHT           // Searches for an item to the right of the specified item

 };
 
 // Alignment flags for Arrange (MSW only except wxLIST_ALIGN_LEFT)
 };
 
 // Alignment flags for Arrange (MSW only except wxLIST_ALIGN_LEFT)


@@ -148,6 +148,10 @@ public:
     wxListItem();
     ~wxListItem() { delete m_attr; }
 
     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; }
     // setters
     void SetMask(long mask) { m_mask = mask; }
     void SetId(long id) { m_itemId = id; }


@@ -184,12 +188,12 @@ public:
     wxListItemAttr *GetAttributes() const { return m_attr; }
     bool HasAttributes() const { return m_attr != NULL; }
 
     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; }
         { return HasAttributes() ? m_attr->GetTextColour() : wxNullColour; }

-    const wxColour& GetBackgroundColour() const
+    wxColour GetBackgroundColour() const

         { return HasAttributes() ? m_attr->GetBackgroundColour()
                                  : wxNullColour; }
         { 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
         { return HasAttributes() ? m_attr->GetFont() : wxNullFont; }
 
     // these members are public for compatibility


@@ -280,9 +284,7 @@ public:
     inline long GetMask() { return m_item.m_mask; }
     inline const wxListItem &GetItem() const { return m_item; }
 
     inline long GetMask() { return m_item.m_mask; }
     inline const wxListItem &GetItem() const { return m_item; }
 

-#ifndef __WXMSW__

     void CopyObject(wxObject& object_dest) const;
     void CopyObject(wxObject& object_dest) const;

-#endif

 
 private:
     DECLARE_DYNAMIC_CLASS(wxListEvent)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxListEvent)