Adapted printing samples makefiles.

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1d6af59568770abed3640bc99a47430ec029aa11..dece7fb5ebfed8cc8ca39b4a21b350b594067b2c 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -3868,7 +3868,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         iconSpacing = 0;
 
     // Note that we do not call GetClientSize() here but
         iconSpacing = 0;
 
     // Note that we do not call GetClientSize() here but

-    // GetSize() and substract the border size for sunken
+    // GetSize() and subtract the border size for sunken

     // borders manually. This is technically incorrect,
     // but we need to know the client area's size WITHOUT
     // scrollbars here. Since we don't know if there are
     // borders manually. This is technically incorrect,
     // but we need to know the client area's size WITHOUT
     // scrollbars here. Since we don't know if there are


@@ -4399,7 +4399,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     wxListLineData *line = new wxListLineData(this);
 
 
     wxListLineData *line = new wxListLineData(this);
 

-    line->SetItem( 0, item );
+    line->SetItem( item.m_col, item );

 
     m_lines.Insert( line, id );
 
 
     m_lines.Insert( line, id );
 


@@ -4662,7 +4662,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
 
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
 

-#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+#ifdef  __WXMAC_CARBON__ 

     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {


@@ -4824,19 +4824,8 @@ bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
     return true;
 }
 
     return true;
 }
 

-#if WXWIN_COMPATIBILITY_2_4
-bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
-{
-    wxListItem info;
-    info.m_image = image;
-    info.m_mask = wxLIST_MASK_IMAGE;
-    info.m_itemId = item;
-    m_mainWin->SetItem( info );
-    return true;
-}
-#endif
-
-bool wxGenericListCtrl::SetItemImage( long item, int image )
+bool
+wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )

 {
     wxListItem info;
     info.m_image = image;
 {
     wxListItem info;
     info.m_image = image;


@@ -5394,9 +5383,9 @@ wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col
 
 int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {
 
 int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {

-    // same as above
-    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );
-
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                wxT("List control has an image list, OnGetItemImage should be overridden."));

     return -1;
 }
 
     return -1;
 }