Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another patch from Tim Kosse for using images on more than one column

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-31 02:37:23 +00:00
parent e731cb64e6
commit e062c6a4d0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/listctrl.cpp
View File

@@ -341,6 +341,9 @@ public:
void SetImage( int image ) { SetImage(0, image); } void SetImage( int image ) { SetImage(0, image); }
int GetImage() const { return GetImage(0); } int GetImage() const { return GetImage(0); }
void SetImage( int index, int image );
int GetImage( int index ) const;
bool HasImage() const { return GetImage() != -1; } bool HasImage() const { return GetImage() != -1; }
bool HasText() const { return !GetText(0).empty(); } bool HasText() const { return !GetText(0).empty(); }
@@ -390,11 +393,6 @@ private:
// draw the text on the DC with the correct justification; also add an // draw the text on the DC with the correct justification; also add an
// ellipsis if the text is too large to fit in the current width // ellipsis if the text is too large to fit in the current width
void DrawTextFormatted(wxDC *dc, const wxString &text, int col, int x, int y, int width); void DrawTextFormatted(wxDC *dc, const wxString &text, int col, int x, int y, int width);
// these are only used by GetImage/SetImage above, we don't support images
// with subitems at the public API level yet
void SetImage( int index, int image );
int GetImage( int index ) const;
}; };
WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray); WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
@@ -2226,7 +2224,7 @@ void wxListMainWindow::CacheLineData(size_t line)
for ( size_t col = 0; col < countCol; col++ ) for ( size_t col = 0; col < countCol; col++ )
{ {
ld->SetText(col, listctrl->OnGetItemText(line, col)); ld->SetText(col, listctrl->OnGetItemText(line, col));
ld->SetImage(listctrl->OnGetItemColumnImage(line, col)); ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));
} }
ld->SetAttr(listctrl->OnGetItemAttr(line)); ld->SetAttr(listctrl->OnGetItemAttr(line));