Rebake from clean wx tree.

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

diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h
index 8aba96302beccee9f3adaf67ec54af9c0ed893c5..6c3a69371e83d445f515f0357b817a4002c9cbf4 100644 (file)
--- a/include/wx/os2/listctrl.h
+++ b/include/wx/os2/listctrl.h
@@ -1,9 +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:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence


@@ -20,11 +20,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 +133,10 @@ public:
                       ,int  nImage
                       ,int  lSelImage
                      );
                       ,int  nImage
                       ,int  lSelImage
                      );

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

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


@@ -146,9 +150,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


@@ -504,7 +507,7 @@ protected:
 
     //
     // Return the icon for the given item. In report view, OnGetItemImage will
 
     //
     // Return the icon for the given item. In report view, OnGetItemImage will

-    // only be called for the first column. See OnGetItemColumnImage for 
+    // only be called for the first column. See OnGetItemColumnImage for

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


@@ -528,7 +531,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