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

more changes to make wx compile without implicit wxString->char* conversion (for STL build)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-20 07:44:45 +00:00
parent d38f70b249
commit e0a050e347
55 changed files with 183 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/listbox.cpp
View File

@@ -279,7 +279,7 @@ void wxListBox::Delete(unsigned int n)
int wxListBox::DoAppend(const wxString& item)
{
int index = ListBox_AddString(GetHwnd(), item);
int index = ListBox_AddString(GetHwnd(), item.wx_str());
m_noItems++;
#if wxUSE_OWNER_DRAWN
@@ -312,7 +312,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
unsigned int i;
for (i = 0; i < m_noItems; i++)
{
ListBox_AddString(GetHwnd(), choices[i]);
ListBox_AddString(GetHwnd(), choices[i].wx_str());
if ( clientData )
{
SetClientData(i, clientData[i]);
@@ -349,7 +349,7 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
if (bCase)
return wxItemContainerImmutable::FindString( s, bCase );
int pos = ListBox_FindStringExact(GetHwnd(), -1, s);
int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());
if (pos == LB_ERR)
return wxNOT_FOUND;
else
@@ -520,7 +520,7 @@ wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
unsigned int nItems = items.GetCount();
for ( unsigned int i = 0; i < nItems; i++ )
{
int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i].wx_str());
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW )
@@ -574,7 +574,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
if ( n == (m_noItems - 1) )
newN = -1;
ListBox_InsertString(GetHwnd(), newN, s);
ListBox_InsertString(GetHwnd(), newN, s.wx_str());
// restore the client data
if ( oldData )