X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3627a004d0333ec7bfc88e2a397d7d7f9752ea9..644e896d3f855f2a85cc2f8bd1532b352cf30768:/include/wx/msw/listctrl.h?ds=inline

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 8d8fd8a7a8..eb08f739c0 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -95,7 +95,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = _T("wxListCtrl"))
+               const wxString& name = wxListCtrlNameStr)
     {
         Init();
 
@@ -110,7 +110,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = _T("wxListCtrl"));
+                const wxString& name = wxListCtrlNameStr);
 
 
     // Attributes
@@ -160,10 +160,7 @@ public:
     bool SetItemState(long item, long state, long stateMask) ;
 
     // Sets the item image
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED(bool SetItemImage(long item, int image, int selImage)) ;
-#endif
-    bool SetItemImage(long item, int image) ;
+    bool SetItemImage(long item, int image, int selImage = -1) ;
 
     // Gets the item text
     wxString GetItemText(long item) const ;
@@ -203,6 +200,12 @@ public:
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
 
+#if wxABI_VERSION >= 20602
+    // Font of an item.
+    void SetItemFont( long item, const wxFont &f);
+    wxFont GetItemFont( long item ) const;
+#endif
+
     // Gets the number of selected items in the list control
     int GetSelectedItemCount() const;
 
@@ -378,6 +381,11 @@ protected:
     // 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