WinCE build fix according to eVC3 and eVC4 SDKs.

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index e0d25d8730d15226c4b2203a8df821bed301323b..c937308b00a711a778dad175add5f70573ccd2af 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listctrl.h"
-#endif
-

 #if wxUSE_LISTCTRL
 
 #include "wx/control.h"
 #if wxUSE_LISTCTRL
 
 #include "wx/control.h"


@@ -90,12 +86,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 +101,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


@@ -124,7 +120,7 @@ public:
     bool GetColumn(int col, wxListItem& item) const;
 
     // Sets information about this column
     bool GetColumn(int col, wxListItem& item) const;
 
     // Sets information about this column

-    bool SetColumn(int col, wxListItem& item) ;
+    bool SetColumn(int col, const wxListItem& item) ;

 
     // Gets the column width
     int GetColumnWidth(int col) const;
 
     // Gets the column width
     int GetColumnWidth(int col) const;


@@ -160,7 +156,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 +165,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) ;


@@ -200,6 +196,10 @@ public:
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
 
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
 

+    // Font of an item.
+    void SetItemFont( long item, const wxFont &f);
+    wxFont GetItemFont( long item ) const;
+

     // Gets the number of selected items in the list control
     int GetSelectedItemCount() const;
 
     // Gets the number of selected items in the list control
     int GetSelectedItemCount() const;
 


@@ -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.


@@ -296,7 +296,7 @@ public:
 
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.
 
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.

-    long InsertItem(wxListItem& info);
+    long InsertItem(const wxListItem& info);

 
     // Insert a string item
     long InsertItem(long index, const wxString& label);
 
     // Insert a string item
     long InsertItem(long index, const wxString& label);


@@ -308,7 +308,7 @@ public:
     long InsertItem(long index, const wxString& label, int imageIndex);
 
     // For list view mode (only), inserts a column.
     long InsertItem(long index, const wxString& label, int imageIndex);
 
     // For list view mode (only), inserts a column.

-    long InsertColumn(long col, wxListItem& info);
+    long InsertColumn(long col, const wxListItem& info);

 
     long InsertColumn(long col,
                       const wxString& heading,
 
     long InsertColumn(long col,
                       const wxString& heading,


@@ -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