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()
{
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()) &&