fix recently introduced memory leak of m_conv (bug 1466559)

[wxWidgets.git] / src / common / lboxcmn.cpp

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 26bc0951884dddc774ed405fe06a99f1a8b18f58..02d5c94b8125d3cf1e94f4c0d7c5b5c36d754e18 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/lboxcmn.cpp
+// Name:        src/common/lboxcmn.cpp

 // Purpose:     wxListBox class methods common to all platforms
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxListBox class methods common to all platforms
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listboxbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -49,10 +45,10 @@ wxListBoxBase::~wxListBoxBase()
 // adding items
 // ----------------------------------------------------------------------------
 
 // adding items
 // ----------------------------------------------------------------------------
 

-void wxListBoxBase::InsertItems(int nItems, const wxString *items, int pos)
+void wxListBoxBase::InsertItems(unsigned int nItems, const wxString *items, unsigned int pos)

 {
     wxArrayString aItems;
 {
     wxArrayString aItems;

-    for ( int n = 0; n < nItems; n++ )
+    for ( unsigned int n = 0; n < nItems; n++ )

     {
         aItems.Add(items[n]);
     }
     {
         aItems.Add(items[n]);
     }


@@ -118,7 +114,7 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {

-    SetSelection(event.m_commandInt, event.m_extraLong != 0);
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);

     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }