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

wxImageList::Add() returned wrong index.

Browse Source 
made list ctrl sample more Unicode friendly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-01 10:39:10 +00:00
parent c7abc967cd
commit b00c560766
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/listctrl/listtest.cpp
View File

@@ -65,7 +65,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxListCtrl Test", 50, 50, 450, 340); MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxListCtrl Test", 50, 50, 450, 340);
// This reduces flicker effects - even better would be to define OnEraseBackground // This reduces flicker effects - even better would be to define OnEraseBackground
// to do nothing. When the list control's scrollbars are show or hidden, the // to do nothing. When the list control's scrollbars are show or hidden, the
@@ -159,8 +159,8 @@ bool MyApp::OnInit(void)
for ( int i=0; i < 30; i++) for ( int i=0; i < 30; i++)
{ {
char buf[20]; wxChar buf[20];
sprintf(buf, "Item %d", i); wxSprintf(buf, _T("Item %d"), i);
frame->m_listCtrl->InsertItem(i, buf); frame->m_listCtrl->InsertItem(i, buf);
} }
@@ -228,8 +228,8 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
for ( int i=0; i < 30; i++) for ( int i=0; i < 30; i++)
{ {
char buf[20]; wxChar buf[20];
sprintf(buf, "Item %d", i); wxSprintf(buf, _T("Item %d"), i);
m_listCtrl->InsertItem(i, buf); m_listCtrl->InsertItem(i, buf);
} }
} }
@@ -247,11 +247,11 @@ void MyFrame::OnReportView(wxCommandEvent& WXUNUSED(event))
for ( int i=0; i < 30; i++) for ( int i=0; i < 30; i++)
{ {
char buf[20]; wxChar buf[50];
sprintf(buf, "Item %d, col 1", i); wxSprintf(buf, _T("Item %d, col 1"), i);
long tmp = m_listCtrl->InsertItem(i, buf, 0); long tmp = m_listCtrl->InsertItem(i, buf, 0);
sprintf(buf, "Item %d, col 2", i); wxSprintf(buf, _T("Item %d, broad column 2"), i);
tmp = m_listCtrl->SetItem(i, 1, buf); tmp = m_listCtrl->SetItem(i, 1, buf);
} }
} }
@@ -280,8 +280,8 @@ void MyFrame::OnIconTextView(wxCommandEvent& WXUNUSED(event))
for ( int i=0; i < 9; i++) for ( int i=0; i < 9; i++)
{ {
char buf[20]; wxChar buf[20];
sprintf(buf, "Label %d", i); wxSprintf(buf, _T("Label %d"), i);
m_listCtrl->InsertItem(i, buf, i); m_listCtrl->InsertItem(i, buf, i);
} }
} }

2
src/generic/imaglist.cpp
View File

@@ -55,7 +55,7 @@ int wxImageList::Add( const wxBitmap &bitmap )
m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
else else
m_images.Append( new wxBitmap(bitmap) ); m_images.Append( new wxBitmap(bitmap) );
return m_images.Number(); return m_images.Number()-1;
} }
const wxBitmap *wxImageList::GetBitmap( int index ) const const wxBitmap *wxImageList::GetBitmap( int index ) const