clean up wxEvtHandler::m_eventsLocker weirdness: there is no need to allocate it...

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 3f85f6bbb7598bfab4231adec36e932c5f6feb1d..ae8535a88f56bc271b540938b4be47abd28b84df 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -198,7 +198,7 @@ bool wxListBox::Create(wxWindow *parent,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

-    Free();
+    Clear();

 }
 
 WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 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;
 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;

-    if ( m_clientDataItemsType == wxClientData_Void )
+    if ( HasClientUntypedData() )

         oldData = GetClientData(n);
         oldData = GetClientData(n);

-    else if ( m_clientDataItemsType == wxClientData_Object )
+    else if ( HasClientObjectData() )

         oldObjData = GetClientObject(n);
 
     // delete and recreate it
         oldObjData = GetClientObject(n);
 
     // delete and recreate it


@@ -658,7 +658,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 
     event.SetInt(n);
 
 
     event.SetInt(n);
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------