Fixes for OS/2 wxUniv merge.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 21:47:52 +00:00
parent 537760597b
commit 0367c1c0e8
11 changed files with 851 additions and 1523 deletions
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -502,9 +502,9 @@ void wxListBox::SetString(int N, const wxString& s)

    void *oldData = NULL;
    wxClientData *oldObjData = NULL;
-    if ( m_clientDataItemsType == ClientData_Void )
+    if ( m_clientDataItemsType == wxClientData_Void )
        oldData = GetClientData(N);
-    else if ( m_clientDataItemsType == ClientData_Object )
+    else if ( m_clientDataItemsType == wxClientData_Object )
        oldObjData = GetClientObject(N);
 // TODO:
 /*