X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..af33c0ec5f817ca4285cd9ef6f3285cf31e320dd:/src/msw/listbox.cpp diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 3f85f6bbb7..ae8535a88f 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -198,7 +198,7 @@ bool wxListBox::Create(wxWindow *parent, wxListBox::~wxListBox() { - Free(); + Clear(); } WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -486,9 +486,9 @@ void wxListBox::SetString(unsigned int n, const wxString& s) void *oldData = NULL; wxClientData *oldObjData = NULL; - if ( m_clientDataItemsType == wxClientData_Void ) + if ( HasClientUntypedData() ) oldData = GetClientData(n); - else if ( m_clientDataItemsType == wxClientData_Object ) + else if ( HasClientObjectData() ) oldObjData = GetClientObject(n); // delete and recreate it @@ -658,7 +658,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) event.SetInt(n); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } // ----------------------------------------------------------------------------