Standard frame resource defines for OS/2

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 8807a74488ed8f1fa66552a9d45d763b1829ad63..2165244e32f4197c7764c88136ff1f34b0f75dd1 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_
 
 #ifndef _WX_LISTCTRL_H_BASE_
 #define _WX_LISTCTRL_H_BASE_
 

+#ifdef __GNUG__
+    #pragma interface "listctrlbase.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------


@@ -188,14 +192,18 @@ 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; }
 
         { return HasAttributes() ? m_attr->GetFont() : wxNullFont; }
 

+    // this conversion is necessary to make old code using GetItem() to
+    // compile
+    operator long() const { return m_itemId; }
+

     // these members are public for compatibility
 
     long            m_mask;     // Indicates what fields are valid
     // these members are public for compatibility
 
     long            m_mask;     // Indicates what fields are valid


@@ -269,24 +277,21 @@ public:
 
     wxListItem    m_item;
 
 
     wxListItem    m_item;
 

-    inline int GetCode() { return m_code; }
-    inline long GetIndex() { return m_itemIndex; }
-    inline long GetOldIndex() { return m_oldItemIndex; }
-    inline long GetItem() { return m_itemIndex; }
-    inline long GetOldItem() { return m_oldItemIndex; }
-    inline int GetColumn() { return m_col; }
-    inline bool Cancelled() { return m_cancelled; }
-    inline wxPoint GetPoint() { return m_pointDrag; }
-    inline const wxString &GetLabel() const { return m_item.m_text; }
-    inline const wxString &GetText() const { return m_item.m_text; }
-    inline int GetImage() { return m_item.m_image; }
-    inline long GetData() { return m_item.m_data; }
-    inline long GetMask() { return m_item.m_mask; }
-    inline const wxListItem &GetItem() const { return m_item; }
-
-#ifndef __WXMSW__
+    int GetCode() const { return m_code; }
+    long GetIndex() const { return m_itemIndex; }
+    long GetOldIndex() const { return m_oldItemIndex; }
+    long GetOldItem() const { return m_oldItemIndex; }
+    int GetColumn() const { return m_col; }
+    bool Cancelled() const { return m_cancelled; }
+    wxPoint GetPoint() const { return m_pointDrag; }
+    const wxString& GetLabel() const { return m_item.m_text; }
+    const wxString& GetText() const { return m_item.m_text; }
+    int GetImage() const { return m_item.m_image; }
+    long GetData() const { return m_item.m_data; }
+    long GetMask() const { return m_item.m_mask; }
+    const wxListItem& GetItem() const { return m_item; }
+

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

-#endif

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