Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some (incomplete) fixes for wxUSE_STL == 1.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2004-06-20 09:02:29 +00:00
parent 1ca21594f7
commit affd2611c5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/accel.cpp
View File

@@ -52,7 +52,7 @@ wxAcceleratorRefData::wxAcceleratorRefData()
wxAcceleratorRefData::~wxAcceleratorRefData() wxAcceleratorRefData::~wxAcceleratorRefData()
{ {
m_accels.DeleteContents( TRUE ); WX_CLEAR_LIST( wxAccelList, m_accels );
} }
wxAcceleratorTable::wxAcceleratorTable() wxAcceleratorTable::wxAcceleratorTable()
@@ -88,10 +88,10 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
{ {
if (!Ok()) return -1; if (!Ok()) return -1;
wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst();
while (node) while (node)
{ {
wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData(); wxAcceleratorEntry *entry = node->GetData();
if ((event.m_keyCode == entry->GetKeyCode()) && if ((event.m_keyCode == entry->GetKeyCode()) &&
(((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) && (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
(((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) && (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&

2
src/mac/carbon/menuitem.cpp
View File

@@ -208,7 +208,7 @@ void wxMenuItem::Check(bool bDoCheck)
} }
// also uncheck all the other items in this radio group // 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++ ) for ( int n = start; n <= end && node; n++ )
{ {
if ( n != pos ) if ( n != pos )

2
src/mac/carbon/radiobut.cpp
View File

@@ -56,7 +56,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
{ {
/* search backward for last group start */ /* search backward for last group start */
wxRadioButton *chief = (wxRadioButton*) NULL; wxRadioButton *chief = (wxRadioButton*) NULL;
wxWindowList::Node *node = parent->GetChildren().GetLast(); wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
while (node) while (node)
{ {
wxWindow *child = node->GetData(); wxWindow *child = node->GetData();

6
src/mac/carbon/toolbar.cpp
View File

@@ -313,7 +313,7 @@ bool wxToolBar::Realize()
int maxToolHeight = 0; int maxToolHeight = 0;
// Find the maximum tool width and height // Find the maximum tool width and height
wxToolBarToolsList::Node *node = m_tools.GetFirst(); wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
while ( node ) while ( node )
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
@@ -411,7 +411,7 @@ void wxToolBar::MacSuperChangedPosition()
wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
{ {
wxToolBarToolsList::Node *node = m_tools.GetFirst(); wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ; 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) 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() ) for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{ {
wxToolBarToolBase *tool2 = node->GetData(); wxToolBarToolBase *tool2 = node->GetData();