Some (incomplete) fixes for wxUSE_STL == 1.

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

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 14aa88e53a85fa2c05d76354fb15f32f314257d1..16d871aeb0a4a8c0515578f8d8d757a428999f63 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -52,7 +52,7 @@ wxAcceleratorRefData::wxAcceleratorRefData()
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
-    m_accels.DeleteContents( TRUE );
+    WX_CLEAR_LIST( wxAccelList, m_accels );
 }
 
 wxAcceleratorTable::wxAcceleratorTable()
@@ -88,10 +88,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
     if (!Ok()) return -1;
 
-    wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
+    wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
     while (node)
     {
-        wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();
+        wxAcceleratorEntry *entry = node->GetData();
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 6cc3aa1a791aed31425708df2f036b244f611a1b..f3c4f869eeed010e5f9a57d4b2c0bbad1a8aadb6 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -208,7 +208,7 @@ void wxMenuItem::Check(bool bDoCheck)
                 }
 
                 // also uncheck all the other items in this radio group
-                wxMenuItemList::Node *node = items.Item(start);
+                wxMenuItemList::compatibility_iterator node = items.Item(start);
                 for ( int n = start; n <= end && node; n++ )
                 {
                     if ( n != pos )

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index eb8423fa8e7eb16744abec65707562cf5c26e7ed..52cc12108a2a603c6017a756241257c65f28ccca 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -56,7 +56,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
   {
     /* search backward for last group start */
     wxRadioButton *chief = (wxRadioButton*) NULL;
-    wxWindowList::Node *node = parent->GetChildren().GetLast();
+    wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
     while (node)
     {
       wxWindow *child = node->GetData();

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 4869227f6c0d9a6e9062ccef6b7de840d7931ee8..8014c6311953fe36c535fe5895851161f6fe32cc 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -313,7 +313,7 @@ bool wxToolBar::Realize()
     int maxToolHeight = 0;
 
     // Find the maximum tool width and height
-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while ( node )
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
@@ -411,7 +411,7 @@ void wxToolBar::MacSuperChangedPosition()
 
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ;
@@ -484,7 +484,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
 {
-    wxToolBarToolsList::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool2 = node->GetData();