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:
@@ -193,7 +193,7 @@ int wxFileDialog::ShowModal()
|
|||||||
else
|
else
|
||||||
sTheFilter = m_wildCard;
|
sTheFilter = m_wildCard;
|
||||||
|
|
||||||
wxStrtok(sTheFilter.char_str(), wxT("|"), &pzFilterBuffer);
|
wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer);
|
||||||
while(pzFilterBuffer != NULL)
|
while(pzFilterBuffer != NULL)
|
||||||
{
|
{
|
||||||
if (nCount > 0 && !(nCount % 2))
|
if (nCount > 0 && !(nCount % 2))
|
||||||
|
@@ -510,9 +510,9 @@ void wxListBox::SetString(unsigned int n, const wxString& rsString)
|
|||||||
void* pOldData = NULL;
|
void* pOldData = NULL;
|
||||||
wxClientData* pOldObjData = NULL;
|
wxClientData* pOldObjData = NULL;
|
||||||
|
|
||||||
if (m_clientDataItemsType == wxClientData_Void)
|
if ( HasClientUntypedData() )
|
||||||
pOldData = GetClientData(n);
|
pOldData = GetClientData(n);
|
||||||
else if (m_clientDataItemsType == wxClientData_Object)
|
else if ( HasClientObjectData() )
|
||||||
pOldObjData = GetClientObject(n);
|
pOldObjData = GetClientObject(n);
|
||||||
|
|
||||||
//
|
//
|
||||||
|
Reference in New Issue
Block a user