Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h
index c9995b04239a8ee74ce60320545291d75673dcd6..8f7aee9904b5c0c26639eb0cc3b34885211cbadc 100644 (file)
--- a/include/wx/os2/listctrl.h
+++ b/include/wx/os2/listctrl.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/os2/listctrl.h
 // Purpose:     wxListCtrl class
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/os2/listctrl.h
 // Purpose:     wxListCtrl class

-// Author:      
+// Author:

 // Modified by:
 // Modified by:

-// Created:     
-// RCS-ID:      $Id$
+// Created:

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -20,11 +19,11 @@
 #include "wx/textctrl.h"
 
 
 #include "wx/textctrl.h"
 
 

-class WXDLLEXPORT wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxImageList;

 
 typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData);
 
 
 typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData);
 

-class WXDLLEXPORT wxListCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxListCtrl: public wxControl

 {
 public:
     wxListCtrl() { Init(); }
 {
 public:
     wxListCtrl() { Init(); }


@@ -133,6 +132,10 @@ public:
                       ,int  nImage
                       ,int  lSelImage
                      );
                       ,int  nImage
                       ,int  lSelImage
                      );

+    bool SetItemColumnImage( long lItem
+                            ,long lColumn
+                            ,int  nImage
+                           );

 
     //
     // Item text
 
     //
     // Item text


@@ -146,9 +149,8 @@ public:
     // Item data
     //
     long GetItemData(long lItem) const;
     // Item data
     //
     long GetItemData(long lItem) const;

-    bool SetItemData( long lItem
-                     ,long lData
-                    );
+    bool SetItemPtrData(long item, wxUIntPtr data);
+    bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }

 
     //
     // Gets the item rectangle
 
     //
     // Gets the item rectangle


@@ -305,7 +307,7 @@ public:
     // Edit the label
     //
     wxTextCtrl* EditLabel( long         lItem
     // Edit the label
     //
     wxTextCtrl* EditLabel( long         lItem

-                          ,wxClassInfo* pTextControlClass = CLASSINFO(wxTextCtrl)
+                          ,wxClassInfo* pTextControlClass = wxCLASSINFO(wxTextCtrl)

                          );
 
     //
                          );
 
     //


@@ -503,10 +505,17 @@ protected:
                                   ) const;
 
     //
                                   ) const;
 
     //

-    // Return the icon for the given item
+    // Return the icon for the given item. In report view, OnGetItemImage will
+    // only be called for the first column. See OnGetItemColumnImage for
+    // details.

     //
     virtual int OnGetItemImage(long lItem) const;
 
     //
     virtual int OnGetItemImage(long lItem) const;
 

+    //
+    // Return the icon for the given item and column
+    //
+    virtual int OnGetItemColumnImage(long lItem, long lColumn) const;
+

     //
     // Return the attribute for the item (may return NULL if none)
     //
     //
     // Return the attribute for the item (may return NULL if none)
     //


@@ -521,7 +530,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxListCtrl);

 }; // end of CLASS wxListCtrl
 
 #endif // wxUSE_LISTCTRL
 }; // end of CLASS wxListCtrl
 
 #endif // wxUSE_LISTCTRL