Fixed OpenWatcom (strange) scope related crash.

[wxWidgets.git] / src / mac / classic / accel.cpp

diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp
index af326fa2b897f60dcdf915077cff4c6fa5c52653..89ac19e52186e2a7e9e7f4ca9d2115141da75552 100644 (file)
--- a/src/mac/classic/accel.cpp
+++ b/src/mac/classic/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.cpp
+// Name:        src/mac/classic/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,9 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/setup.h"
+#include "wx/wxprec.h"
+

 #include "wx/accel.h"
 #include "wx/accel.h"

-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 


@@ -21,7 +25,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)

 
 // ----------------------------------------------------------------------------
 // wxAccelRefData: the data used by wxAcceleratorTable
 
 // ----------------------------------------------------------------------------
 // wxAccelRefData: the data used by wxAcceleratorTable


@@ -46,7 +50,7 @@ wxAcceleratorRefData::wxAcceleratorRefData()
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {

-    m_accels.DeleteContents( TRUE );
+    m_accels.DeleteContents( true );

 }
 
 wxAcceleratorTable::wxAcceleratorTable()
 }
 
 wxAcceleratorTable::wxAcceleratorTable()


@@ -98,5 +102,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 
     return -1;
 }
 
     return -1;
 }

-
-