rename method to prevent collision with some BSD definitions of macro Free()

(detected compiling mahogany)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 82c7a52228711308647cc405e47fb46fb63eca89..f9d790df0641bd512c0ba0e855275ccb67e1c011 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -93,7 +93,8 @@ protected:
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // free all memory we have (used by Clear() and dtor)
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // free all memory we have (used by Clear() and dtor)

-    void Free();
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();

 
   wxArrayString m_strings;
   wxChoiceDataArray m_datas ;
 
   wxArrayString m_strings;
   wxChoiceDataArray m_datas ;

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index ff4be4552789f7ec0cdeba6fc390f4608bb1ea7c..e35fb87b2f6b204e5381f4e78ce1cea25eb8980f 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -138,7 +138,8 @@ protected:
     bool HasMultipleSelection() const;
 
     // free memory (common part of Clear() and dtor)
     bool HasMultipleSelection() const;
 
     // free memory (common part of Clear() and dtor)

-    void Free();
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();

 
     int m_noItems;
     int m_selected;
 
     int m_noItems;
     int m_selected;

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
index 0f30137a644d0068b2f1ca06bc68db790161d1fe..6f9f959b81542281100d8630a444daa11ab30591 100644 (file)
--- a/include/wx/mac/wave.h
+++ b/include/wx/mac/wave.h
@@ -33,7 +33,8 @@ public:
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
 protected:
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
 protected:

-  bool  Free();
+  // prevent collision with some BSD definitions of macro Free()
+  bool  FreeData();

 
 private:
   void* m_sndChan;
 
 private:
   void* m_sndChan;

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index f8068ff829710a48af157ee3e8446c1ecc5d32bf..072badfdd255fe298b6ea83da45536b4b8caeb36 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -98,18 +98,18 @@ void wxChoice::Delete(int n)
 
 void wxChoice::Clear()
 {
 
 void wxChoice::Clear()
 {

-    Free();
+    FreeData();

 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;

-         }
+    }

     m_strings.Empty() ;
     m_datas.Empty() ;
     m_strings.Empty() ;
     m_datas.Empty() ;

-       SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;
+    SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;

 }
 
 }
 

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

 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {


@@ -156,7 +156,7 @@ int wxChoice::FindString(const wxString& s) const
 
 void wxChoice::SetString(int n, const wxString& s)
 {
 
 void wxChoice::SetString(int n, const wxString& s)
 {

-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));

 
 #if 0 // should do this, but no Insert() so far
     Delete(n);
 
 #if 0 // should do this, but no Insert() so far
     Delete(n);

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() ;

diff --git a/src/mac/carbon/wave.cpp b/src/mac/carbon/wave.cpp
index 7cc1c23534e219a0ca126b1df8e889844296a8c9..01c7b9b035e4da0bd4c16a3738dc420816f41f11 100644 (file)
--- a/src/mac/carbon/wave.cpp
+++ b/src/mac/carbon/wave.cpp
@@ -38,7 +38,7 @@ wxWave::wxWave(const wxString& sFileName, bool isResource)
 
 wxWave::~wxWave()
 {
 
 wxWave::~wxWave()
 {

-    Free();
+    FreeData();

 }
 
 wxWave::wxWave(int size, const wxByte* data)
 }
 
 wxWave::wxWave(int size, const wxByte* data)


@@ -156,7 +156,7 @@ bool wxWave::Play(bool async, bool looped) const
 }
 
 
 }
 
 

-bool wxWave::Free()
+bool wxWave::FreeData()

 {
        bool ret = false;
        
 {
        bool ret = false;
        

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index f8068ff829710a48af157ee3e8446c1ecc5d32bf..072badfdd255fe298b6ea83da45536b4b8caeb36 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -98,18 +98,18 @@ void wxChoice::Delete(int n)
 
 void wxChoice::Clear()
 {
 
 void wxChoice::Clear()
 {

-    Free();
+    FreeData();

 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;

-         }
+    }

     m_strings.Empty() ;
     m_datas.Empty() ;
     m_strings.Empty() ;
     m_datas.Empty() ;

-       SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;
+    SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;

 }
 
 }
 

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

 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {


@@ -156,7 +156,7 @@ int wxChoice::FindString(const wxString& s) const
 
 void wxChoice::SetString(int n, const wxString& s)
 {
 
 void wxChoice::SetString(int n, const wxString& s)
 {

-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));

 
 #if 0 // should do this, but no Insert() so far
     Delete(n);
 
 #if 0 // should do this, but no Insert() so far
     Delete(n);

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 2d9a8708d13acb0de831308f2c5c8072c7da1d6a..f4ddc539b3942a36e993e29a73b5cf39c0c2972a 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/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() ;

diff --git a/src/mac/wave.cpp b/src/mac/wave.cpp
index 7cc1c23534e219a0ca126b1df8e889844296a8c9..01c7b9b035e4da0bd4c16a3738dc420816f41f11 100644 (file)
--- a/src/mac/wave.cpp
+++ b/src/mac/wave.cpp
@@ -38,7 +38,7 @@ wxWave::wxWave(const wxString& sFileName, bool isResource)
 
 wxWave::~wxWave()
 {
 
 wxWave::~wxWave()
 {

-    Free();
+    FreeData();

 }
 
 wxWave::wxWave(int size, const wxByte* data)
 }
 
 wxWave::wxWave(int size, const wxByte* data)


@@ -156,7 +156,7 @@ bool wxWave::Play(bool async, bool looped) const
 }
 
 
 }
 
 

-bool wxWave::Free()
+bool wxWave::FreeData()

 {
        bool ret = false;
        
 {
        bool ret = false;