Revert Cygwin changes

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 47ddda9e99941d45e3c69dcc79cb14f585b9d562..711e1f93c68ba83ac3fe6cfbb0cc58e0f76ad27d 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -63,8 +63,8 @@ class WXDLLEXPORT wxImageList;
     which item. Each image in an image list can contain a mask, and can be made out
     of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
 
     which item. Each image in an image list can contain a mask, and can be made out
     of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
 

-    Notifications are passed via the wxWindows 2.0 event system, or using virtual
-    functions in wxWindows 1.66.
+    Notifications are passed via the wxWidgets 2.0 event system, or using virtual
+    functions in wxWidgets 1.66.

 
     See the sample wxListCtrl app for API usage.
 
 
     See the sample wxListCtrl app for API usage.
 


@@ -90,12 +90,12 @@ public:
     wxListCtrl() { Init(); }
 
     wxListCtrl(wxWindow *parent,
     wxListCtrl() { Init(); }
 
     wxListCtrl(wxWindow *parent,

-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,

-               const wxString& name = _T("wxListCtrl"))
+               const wxString& name = wxListCtrlNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -105,12 +105,12 @@ public:
     virtual ~wxListCtrl();
 
     bool Create(wxWindow *parent,
     virtual ~wxListCtrl();
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = _T("wxListCtrl"));
+                const wxString& name = wxListCtrlNameStr);

 
 
     // Attributes
 
 
     // Attributes


@@ -160,7 +160,7 @@ public:
     bool SetItemState(long item, long state, long stateMask) ;
 
     // Sets the item image
     bool SetItemState(long item, long state, long stateMask) ;
 
     // Sets the item image

-    bool SetItemImage(long item, int image, int selImage) ;
+    bool SetItemImage(long item, int image, int selImage = -1) ;

 
     // Gets the item text
     wxString GetItemText(long item) const ;
 
     // Gets the item text
     wxString GetItemText(long item) const ;


@@ -169,7 +169,7 @@ public:
     void SetItemText(long item, const wxString& str) ;
 
     // Gets the item data
     void SetItemText(long item, const wxString& str) ;
 
     // Gets the item data

-    long GetItemData(long item) const ;
+    wxUIntPtr GetItemData(long item) const ;

 
     // Sets the item data
     bool SetItemData(long item, long data) ;
 
     // Sets the item data
     bool SetItemData(long item, long data) ;


@@ -214,7 +214,7 @@ public:
     long GetTopItem() const ;
 
     // Add or remove a single window style
     long GetTopItem() const ;
 
     // Add or remove a single window style

-    void SetSingleStyle(long style, bool add = TRUE) ;
+    void SetSingleStyle(long style, bool add = true) ;

 
     // Set the whole window style
     void SetWindowStyleFlag(long style) ;
 
     // Set the whole window style
     void SetWindowStyleFlag(long style) ;


@@ -280,11 +280,11 @@ public:
 
     // Find an item whose label matches this string, starting from the item after 'start'
     // or the beginning if 'start' is -1.
 
     // Find an item whose label matches this string, starting from the item after 'start'
     // or the beginning if 'start' is -1.

-    long FindItem(long start, const wxString& str, bool partial = FALSE);
+    long FindItem(long start, const wxString& str, bool partial = false);

 
     // Find an item whose data matches this data, starting from the item after 'start'
     // or the beginning if 'start' is -1.
 
     // Find an item whose data matches this data, starting from the item after 'start'
     // or the beginning if 'start' is -1.

-    long FindItem(long start, long data);
+    long FindItem(long start, wxUIntPtr data);

 
     // Find an item nearest this position in the specified direction, starting from
     // the item after 'start' or the beginning if 'start' is -1.
 
     // Find an item nearest this position in the specified direction, starting from
     // the item after 'start' or the beginning if 'start' is -1.


@@ -375,6 +375,11 @@ protected:
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+    // special Windows message handling
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);
+

 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons
 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons


@@ -390,10 +395,10 @@ protected:
                                     // ListView_GetItemCount
     bool              m_ignoreChangeMessages;
 
                                     // ListView_GetItemCount
     bool              m_ignoreChangeMessages;
 

-    // TRUE if we have any internal data (user data & attributes)
+    // true if we have any internal data (user data & attributes)

     bool m_AnyInternalData;
 
     bool m_AnyInternalData;
 

-    // TRUE if we have any items with custom attributes
+    // true if we have any items with custom attributes

     bool m_hasAnyAttr;
 
     // these functions are only used for virtual list view controls, i.e. the
     bool m_hasAnyAttr;
 
     // these functions are only used for virtual list view controls, i.e. the