Add wxListCtrl::Get/SetItemFont, patch 1236820 Francesco Montorsi

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex
index 3cc184d6df93cfffabaefbc172ce8e54e6d9ef82..31f5e41f380a9eee2100ab9cc6880305d8c0309c 100644 (file)
--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -377,6 +377,13 @@ Returns the number of items in the list control.
 Gets the application-defined data associated with this item.
 
 
+\membersection{wxListCtrl::GetItemFont}\label{wxlistctrlgetitemfont}
+
+\constfunc{wxFont}{GetItemFont}{\param{long }{item}}
+
+Returns the item's font.
+
+
 \membersection{wxListCtrl::GetItemPosition}\label{wxlistctrlgetitemposition}
 
 \constfunc{bool}{GetItemPosition}{\param{long }{item}, \param{wxPoint\& }{pos}}
@@ -866,6 +873,13 @@ from $0$ to {\it count}.
 Associates application-defined data with this item.
 
 
+\membersection{wxListCtrl::SetItemFont}\label{wxlistctrlsetitemfont}
+
+\func{void}{SetItemFont}{\param{long }{item}, \param{const wxFont\& }{font}}
+
+Sets the item's font.
+
+
 \membersection{wxListCtrl::SetItemImage}\label{wxlistctrlsetitemimage}
 
 \func{bool}{SetItemImage}{\param{long }{item}, \param{int }{image}}

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 8a31822b8076b908e924698911c169b6a5e58f38..1aa689c28411e7f31be517bdc8e67d6a2d5d3ddd 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -118,6 +118,10 @@ public:
     wxColour GetItemTextColour( long item ) const;
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
+#if wxABI_VERSION >= 20602
+    void SetItemFont( long item, const wxFont &f);
+    wxFont GetItemFont( long item ) const;
+#endif
     int GetSelectedItemCount() const;
     wxColour GetTextColour() const;
     void SetTextColour(const wxColour& col);

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 711e1f93c68ba83ac3fe6cfbb0cc58e0f76ad27d..eb08f739c0c0d4c4786fa1a3f9ca34867065fb9e 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -200,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;
 

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 99013eec8f6c91a36fca2bd4fc4c6aaaca868e61..28d151f6cc643a29e360829fbc584500fc71be57 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -494,6 +494,9 @@ void MyFrame::InitWithReportItems()
     m_listCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE );
     m_listCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE );
     m_listCtrl->SetColumnWidth( 2, wxLIST_AUTOSIZE );
+
+    // test SetItemFont too
+    m_listCtrl->SetItemFont(0, *wxITALIC_FONT);
 }
 
 void MyFrame::InitWithIconItems(bool withText, bool sameIcon)

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index d7677af92dbbc841ed12770c10309b9282a81f82..28e4547c3cf0539a9275df093041593ec4240b33 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -5094,6 +5094,22 @@ wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
     return info.GetBackgroundColour();
 }
 
+void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetFont( f );
+    m_mainWin->SetItem( info );
+}
+
+wxFont wxGenericListCtrl::GetItemFont( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetFont();
+}
+
 int wxGenericListCtrl::GetSelectedItemCount() const
 {
     return m_mainWin->GetSelectedItemCount();

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 3769867501d607527e8ce923fbc4abf5430dc2a0..578af99fef7253bc69e59507d9b54b271920779e 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1092,6 +1092,24 @@ wxColour wxListCtrl::GetItemBackgroundColour( long item ) const
     return col;
 }
 
+void wxListCtrl::SetItemFont( long item, const wxFont &f )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetFont( f );
+    SetItem( info );
+}
+
+wxFont wxListCtrl::GetItemFont( long item ) const
+{
+    wxFont f;
+    wxListItemInternalData *data = wxGetInternalData(this, item);
+    if ( data && data->attr )
+        f = data->attr->GetFont();
+
+    return f;
+}
+
 // Gets the number of selected items in the list control
 int wxListCtrl::GetSelectedItemCount() const
 {

diff --git a/version-script.in b/version-script.in
index bc3bd11276134562ec7bf753d211c31427a33486..42526223b0e67f4fdfd25980d15d6a44561fe000 100644 (file)
--- a/version-script.in
+++ b/version-script.in
@@ -18,6 +18,8 @@
         *wxXmlResource*Unload*wxString*;
         *wxXmlResource*IsArchive*wxString*;
         *wxShadowObject*;
+        *wxGenericListCtrl*SetItemFont*wxFont*;
+        *wxGenericListCtrl*GetItemFont*;
 };