Compilationf fixes according to patch #1828105.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 06028d0a696d275eb9c15a0f4925c60cb45d0930..77dcc5c30db45f9ab1a2b0e76ed14ee6f7629272 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -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))

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 334fd18f48bfff955857d7c7ef9f2ed13112f8ed..7d226adb3b4c5255dd01968276cd20bb650eadfd 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -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);
 
     //