Implement wxChoice::Insert.

[wxWidgets.git] / src / msw / listctrl.cpp

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 174af29eb58d2511843065782ffd17f8d0ca1b45..b24b99daf0d2f39f6821dda51546d2811b8043e3 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -59,10 +54,11 @@
 // Currently gcc and watcom don't define NMLVFINDITEM, and DMC only defines
 // it by its old name NM_FINDTIEM.
 //
 // Currently gcc and watcom don't define NMLVFINDITEM, and DMC only defines
 // it by its old name NM_FINDTIEM.
 //

-#if defined __VISUALC__ || defined __BORLANDC__ || defined NMLVFINDITEM
+#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(NMLVFINDITEM)

     #define HAVE_NMLVFINDITEM 1
     #define HAVE_NMLVFINDITEM 1

-#elif defined __DMC__ || defined NM_FINDITEM
-    #define HAVE_NM_FINDITEM 1
+#elif defined(__DMC__) || defined(NM_FINDITEM)
+    #define HAVE_NMLVFINDITEM 1
+    #define NMLVFINDITEM NM_FINDITEM

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -123,7 +119,7 @@ public:
     }
 
     // init with conversion
     }
 
     // init with conversion

-    void Init(LV_ITEM_OTHER& item)
+    void Init(const LV_ITEM_OTHER& item)

     {
         // avoid unnecessary dynamic memory allocation, jjust make m_pItem
         // point to our own m_item
     {
         // avoid unnecessary dynamic memory allocation, jjust make m_pItem
         // point to our own m_item


@@ -663,7 +659,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 }
 
 // Sets information about this column
 }
 
 // Sets information about this column

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

 {
     LV_COLUMN lvCol;
     wxConvertToMSWListCol(col, item, lvCol);
 {
     LV_COLUMN lvCol;
     wxConvertToMSWListCol(col, item, lvCol);


@@ -1092,6 +1088,24 @@ wxColour wxListCtrl::GetItemBackgroundColour( long item ) const
     return col;
 }
 
     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
 {
 // Gets the number of selected items in the list control
 int wxListCtrl::GetSelectedItemCount() const
 {


@@ -1101,9 +1115,9 @@ int wxListCtrl::GetSelectedItemCount() const
 // Gets the text colour of the listview
 wxColour wxListCtrl::GetTextColour() const
 {
 // Gets the text colour of the listview
 wxColour wxListCtrl::GetTextColour() const
 {

-    COLORREF ref = ListView_GetTextColor(GetHwnd());
-    wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
-    return col;
+    // Use GetDefaultAttributes instead of ListView_GetTextColor because
+    // the latter seems to return black all the time (instead of the theme color)
+    return GetDefaultAttributes().colFg;

 }
 
 // Sets the text colour of the listview
 }
 
 // Sets the text colour of the listview


@@ -1472,7 +1486,7 @@ long wxListCtrl::HitTest(const wxPoint& point, int& flags)
 
 // 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 wxListCtrl::InsertItem(wxListItem& info)
+long wxListCtrl::InsertItem(const wxListItem& info)

 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual controls") );
 
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual controls") );
 


@@ -1545,7 +1559,7 @@ long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
 }
 
 // For list view mode (only), inserts a column.
 }
 
 // For list view mode (only), inserts a column.

-long wxListCtrl::InsertColumn(long col, wxListItem& item)
+long wxListCtrl::InsertColumn(long col, const wxListItem& item)

 {
     LV_COLUMN lvCol;
     wxConvertToMSWListCol(col, item, lvCol);
 {
     LV_COLUMN lvCol;
     wxConvertToMSWListCol(col, item, lvCol);


@@ -1638,7 +1652,7 @@ int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2,  LPARAM l
 
     return internalData->user_fn(d1, d2, internalData->data);
 
 
     return internalData->user_fn(d1, d2, internalData->data);
 

-};
+}

 
 bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {
 
 bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {


@@ -2142,7 +2156,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 }
                 break;
 
                 }
                 break;
 

-#if HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM
+#ifdef HAVE_NMLVFINDITEM

             case LVN_ODFINDITEM:
                 // this message is only used with the virtual list control but
                 // even there we don't want to always use it: in a control with
             case LVN_ODFINDITEM:
                 // this message is only used with the virtual list control but
                 // even there we don't want to always use it: in a control with


@@ -2151,11 +2165,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 // application waiting while it performs linear search
                 if ( IsVirtual() && GetItemCount() <= 1000 )
                 {
                 // application waiting while it performs linear search
                 if ( IsVirtual() && GetItemCount() <= 1000 )
                 {

-#if HAVE_NMLVFINDITEM

                     NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam;
                     NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam;

-#else
-                    NM_FINDTIEM* pFindInfo = (NM_FINDTIEM*)lParam;
-#endif

 
                     // no match by default
                     *result = -1;
 
                     // no match by default
                     *result = -1;


@@ -2216,7 +2226,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     processed = false;
                 }
                 break;
                     processed = false;
                 }
                 break;

-#endif // HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM
+#endif // HAVE_NMLVFINDITEM

 
             case LVN_GETDISPINFO:
                 if ( IsVirtual() )
 
             case LVN_GETDISPINFO:
                 if ( IsVirtual() )


@@ -2290,7 +2300,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case LVN_ENDLABELEDITA:
         case LVN_ENDLABELEDITW:
 
         case LVN_ENDLABELEDITA:
         case LVN_ENDLABELEDITW:

-            // logic here is inversed compared to all the other messages
+            // logic here is inverted compared to all the other messages

             *result = event.IsAllowed();
 
             // don't keep a stale wxTextCtrl around
             *result = event.IsAllowed();
 
             // don't keep a stale wxTextCtrl around


@@ -2571,20 +2581,20 @@ static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId)
         return NULL;
 
     return (wxListItemInternalData *) it.lParam;
         return NULL;
 
     return (wxListItemInternalData *) it.lParam;

-};
+}

 
 static
 wxListItemInternalData *wxGetInternalData(const wxListCtrl *ctl, long itemId)
 {
     return wxGetInternalData(GetHwndOf(ctl), itemId);
 
 static
 wxListItemInternalData *wxGetInternalData(const wxListCtrl *ctl, long itemId)
 {
     return wxGetInternalData(GetHwndOf(ctl), itemId);

-};
+}

 
 static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long itemId)
 {
     wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
 
     return data ? data->attr : NULL;
 
 static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long itemId)
 {
     wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
 
     return data ? data->attr : NULL;

-};
+}

 
 static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
 {
 
 static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
 {


@@ -2810,7 +2820,8 @@ static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,
             //
             // we don't use LVCFMT_COL_HAS_IMAGES because it doesn't seem to
             // make any difference in my tests -- but maybe we should?
             //
             // we don't use LVCFMT_COL_HAS_IMAGES because it doesn't seem to
             // make any difference in my tests -- but maybe we should?

-            lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT | LVCFMT_IMAGE;
+            if ( item.m_image != -1 )
+                lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT | LVCFMT_IMAGE;

 
             lvCol.iImage = item.m_image;
         }
 
             lvCol.iImage = item.m_image;
         }