From f6b77239295c92072f13e88d49284fb647f79971 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sat, 4 Dec 1999 11:56:28 +0000
Subject: [PATCH]   Two missing #includes in image code.   Corrected item
 coloring in wxListCtrl report mode (incl sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/listctrl/listtest.cpp | 15 +++++++++++++++
 src/common/imaggif.cpp        |  1 +
 src/common/imagpcx.cpp        |  2 +-
 src/generic/listctrl.cpp      |  5 ++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 3582c99cf4..d7e1acbf4b 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -287,6 +287,21 @@ void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
         wxSprintf(buf, _T("Item %d in column 2"), i);
         tmp = m_listCtrl->SetItem(i, 2, buf);
     }
+    
+#ifndef __WXMSW__
+    // we leave all mask fields to 0 and only change the colour
+    wxListItem first;
+    first.m_itemId = 0;
+    first.m_colour = wxBLUE;
+    m_listCtrl->SetItem( first );
+    
+    first.m_itemId = 2;
+    first.m_colour = wxLIGHT_GREY;
+    m_listCtrl->SetItem( first );
+    first.m_itemId = 3;
+    first.m_colour = wxLIGHT_GREY;
+    m_listCtrl->SetItem( first );
+#endif
 
     m_listCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE );
     m_listCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE );
diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index c487e75fa6..eec1778dcb 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -29,6 +29,7 @@
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"
+#include "wx/intl.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 37cf4182d1..ee9c9a0c21 100644
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -30,7 +30,7 @@
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/log.h"
-
+#include "wx/intl.h"
 
 //-----------------------------------------------------------------------------
 // PCX decoding
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index ec4f79d94a..7e251dbf37 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -609,6 +609,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
     if (m_mode == wxLC_REPORT)
     {
         wxString s;
+	wxColour *colour = (wxColour*) NULL;
         wxNode *node = m_items.First();
         while (node)
         {
@@ -622,13 +623,15 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
                 m_owner->GetImageSize( item->GetImage(), x, y );
                 x += item->GetX() + 5;
             }
+	    if (!colour)
+	        colour = item->GetColour();
             if (item->HasText())
             {
                 item->GetText( s );
                 if (hilight)
                     dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
                 else
-                    dc->SetTextForeground( *item->GetColour() );
+                    dc->SetTextForeground( *colour );
                 dc->DrawText( s, x, item->GetY() );
             }
             dc->DestroyClippingRegion();
-- 
2.45.2