fix another memory leak in SetCommand() (coverity checker CID 52)

[wxWidgets.git] / src / motif / checklst.cpp

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index 0d9bb1dc238aa658c19e5751a8256980deb84893..b2e28eb366ab6ea370b1536e4d4c50841cf1b912 100644 (file)
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.cpp
+// Name:        src/motif/checklst.cpp

 // Purpose:     implementation of wxCheckListBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Julian Smart
 // Modified by:


@@ -13,10 +13,6 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checklst.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"
 


@@ -58,7 +54,7 @@ static void CopyStringsAddingPrefix(const wxArrayString& orig,
     copy.Clear();
 
     for(size_t i = 0; i < orig.GetCount(); ++i )
     copy.Clear();
 
     for(size_t i = 0; i < orig.GetCount(); ++i )

-        copy.Add( Prefix(FALSE) + orig[i] );
+        copy.Add( Prefix(false) + orig[i] );

 }
 
 // def ctor: use Create() to really create the control
 }
 
 // def ctor: use Create() to really create the control


@@ -101,7 +97,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     bool retVal = wxListBox::Create(parent, id, pos, size, n, choices,
                                     style, validator, name);
     return retVal;
     bool retVal = wxListBox::Create(parent, id, pos, size, n, choices,
                                     style, validator, name);
     return retVal;

-}   
+}

 
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                             const wxPoint& pos,
 
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                             const wxPoint& pos,


@@ -115,7 +111,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     bool retVal = wxListBox::Create(parent, id, pos, size, choices,
                                     style, validator, name);
     return retVal;
     bool retVal = wxListBox::Create(parent, id, pos, size, choices,
                                     style, validator, name);
     return retVal;

-}   
+}

 
 // check items
 // -----------
 
 // check items
 // -----------


@@ -147,7 +143,7 @@ void wxCheckListBox::DoToggleItem( int n, int x )
         else if( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );
         event.SetInt(n);
         else if( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );
         event.SetInt(n);

-        event.SetExtraLong(TRUE);
+        event.SetExtraLong(true);

         event.SetEventObject(this);
         event.SetString( GetString( n ) );
 
         event.SetEventObject(this);
         event.SetString( GetString( n ) );
 


@@ -157,13 +153,13 @@ void wxCheckListBox::DoToggleItem( int n, int x )
 
 int wxCheckListBox::DoAppend(const wxString& item)
 {
 
 int wxCheckListBox::DoAppend(const wxString& item)
 {

-    return wxListBox::DoAppend( Prefix(FALSE) + item );
+    return wxListBox::DoAppend( Prefix(false) + item );

 }
 
 }
 

-int wxCheckListBox::FindString(const wxString& s) const
+int wxCheckListBox::FindString(const wxString& s, bool bCase) const

 {
 {

-    int n1 = wxListBox::FindString(Prefix(FALSE) + s);
-    int n2 = wxListBox::FindString(Prefix(TRUE) + s);
+    int n1 = wxListBox::FindString(Prefix(false) + s, bCase);
+    int n2 = wxListBox::FindString(Prefix(true) + s, bCase);

     int min = wxMin(n1, n2), max = wxMax(n1, n2);
 
     // why this works:
     int min = wxMin(n1, n2), max = wxMax(n1, n2);
 
     // why this works: