more MSLU fixes

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 6b4a8821316662861fc5c13b38d5f95f0fec34b6..0646ed78148501e57b575d6e82760790e5e7cf1d 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -280,7 +280,7 @@ bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
                       0, LVS_EX_FULLROWSELECT);
     }
 
                       0, LVS_EX_FULLROWSELECT);
     }
 

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

     SetForegroundColour(GetParent()->GetForegroundColour());
 
     SubclassWin(m_hWnd);
     SetForegroundColour(GetParent()->GetForegroundColour());
 
     SubclassWin(m_hWnd);


@@ -1501,7 +1501,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     // if your compiler is as broken as this, you should really change it: this
     // code is needed for normal operation! #ifdef below is only useful for
     // automatic rebuilds which are done with a very old compiler version
     // if your compiler is as broken as this, you should really change it: this
     // code is needed for normal operation! #ifdef below is only useful for
     // automatic rebuilds which are done with a very old compiler version

-#ifdef LVM_FIRST
+#ifdef HDN_BEGINTRACKA

 
     // check for messages from the header (in report view)
     HWND hwndHdr = ListView_GetHeader(GetHwnd());
 
     // check for messages from the header (in report view)
     HWND hwndHdr = ListView_GetHeader(GetHwnd());


@@ -1509,11 +1509,8 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     // is it a message from the header?
     if ( nmhdr->hwndFrom == hwndHdr )
     {
     // is it a message from the header?
     if ( nmhdr->hwndFrom == hwndHdr )
     {

-#ifdef __WATCOMC__

         HD_NOTIFY *nmHDR = (HD_NOTIFY *)nmhdr;
         HD_NOTIFY *nmHDR = (HD_NOTIFY *)nmhdr;

-#else
-        NMHEADER *nmHDR = (NMHEADER *)nmhdr;
-#endif
+

         event.m_itemIndex = -1;
 
         switch ( nmhdr->code )
         event.m_itemIndex = -1;
 
         switch ( nmhdr->code )


@@ -1589,7 +1586,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         }
     }
     else
         }
     }
     else

-#endif // defined(LVM_FIRST)
+#endif // defined(HDN_BEGINTRACKA)

         if ( nmhdr->hwndFrom == GetHwnd() )
     {
         // almost all messages use NM_LISTVIEW
         if ( nmhdr->hwndFrom == GetHwnd() )
     {
         // almost all messages use NM_LISTVIEW


@@ -2025,7 +2022,7 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
     if ((GetWindowStyle() & wxLC_REPORT) == 0)
         return;
 
     if ((GetWindowStyle() & wxLC_REPORT) == 0)
         return;
 

-    wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+    wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);

     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
 


@@ -2342,7 +2339,7 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
         lvItem.mask |= LVIF_PARAM;
 }
 
         lvItem.mask |= LVIF_PARAM;
 }
 

-static void wxConvertToMSWListCol(int col, const wxListItem& item,
+static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,

                                   LV_COLUMN& lvCol)
 {
     wxZeroMemory(lvCol);
                                   LV_COLUMN& lvCol)
 {
     wxZeroMemory(lvCol);