Compilationf fixes according to patch #1828105.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2007-11-08 08:29:06 +00:00
parent 37f68a7945
commit 6d8eb95b35
2 changed files with 3 additions and 3 deletions

View File

@ -193,7 +193,7 @@ int wxFileDialog::ShowModal()
else
sTheFilter = m_wildCard;
wxStrtok(sTheFilter.char_str(), wxT("|"), &pzFilterBuffer);
wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer);
while(pzFilterBuffer != NULL)
{
if (nCount > 0 && !(nCount % 2))

View File

@ -510,9 +510,9 @@ void wxListBox::SetString(unsigned int n, const wxString& rsString)
void* pOldData = NULL;
wxClientData* pOldObjData = NULL;
if (m_clientDataItemsType == wxClientData_Void)
if ( HasClientUntypedData() )
pOldData = GetClientData(n);
else if (m_clientDataItemsType == wxClientData_Object)
else if ( HasClientObjectData() )
pOldObjData = GetClientObject(n);
//