cleaning up image mess for os/2

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index d5817da5bda44cdec0c4a9711cfcc31a31f6653c..2108abc01c3bc38bcb581d70a97d27692701ffc3 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)


@@ -124,6 +124,10 @@ public:
     void SetFont(const wxFont& font) { m_font = font; }
 
     // accessors
     void SetFont(const wxFont& font) { m_font = font; }
 
     // accessors

+    bool HasTextColour() const { return m_colText.Ok(); }
+    bool HasBackgroundColour() const { return m_colBack.Ok(); }
+    bool HasFont() const { return m_font.Ok(); }
+

     const wxColour& GetTextColour() const { return m_colText; }
     const wxColour& GetBackgroundColour() const { return m_colBack; }
     const wxFont& GetFont() const { return m_font; }
     const wxColour& GetTextColour() const { return m_colText; }
     const wxColour& GetBackgroundColour() const { return m_colBack; }
     const wxFont& GetFont() const { return m_font; }


@@ -142,6 +146,11 @@ class WXDLLEXPORT wxListItem : public wxObject
 {
 public:
     wxListItem();
 {
 public:
     wxListItem();

+    ~wxListItem() { delete m_attr; }
+
+    // resetting
+    void Clear();
+    void ClearAttributes();

 
     // setters
     void SetMask(long mask) { m_mask = mask; }
 
     // setters
     void SetMask(long mask) { m_mask = mask; }


@@ -275,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)