Updated Makefiles for all but Motif; there is either a lock or a CVS problem.

[wxWidgets.git] / src / mac / carbon / listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 2d9a8708d13acb0de831308f2c5c8072c7da1d6a..f4ddc539b3942a36e993e29a73b5cf39c0c2972a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -246,7 +246,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

-    Free() ;
+    FreeData() ;

     if ( m_macList )
     {
 #if !TARGET_CARBON
     if ( m_macList )
     {
 #if !TARGET_CARBON


@@ -257,7 +257,7 @@ wxListBox::~wxListBox()
     }
 }
 
     }
 }
 

-void wxListBox::Free()
+void wxListBox::FreeData()

 {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
 {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )


@@ -468,7 +468,7 @@ int wxListBox::FindString(const wxString& st) const
 
 void wxListBox::Clear()
 {
 
 void wxListBox::Clear()
 {

-  Free();
+  FreeData();

   m_noItems = 0;
   m_stringArray.Empty() ;
   m_dataArray.Empty() ;
   m_noItems = 0;
   m_stringArray.Empty() ;
   m_dataArray.Empty() ;