Patch #826420, and also adapted to new SWIG

[wxWidgets.git] / include / wx / mac / accel.h

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index 3586e6cefb5e8cfd0b8dd4c7c70a5f726cf2c0b4..25acc73bead86a3abd1c93f9f7a91e8c8e6bddd4 100644 (file)
--- a/include/wx/mac/accel.h
+++ b/include/wx/mac/accel.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accel.h
 // Purpose:     wxAcceleratorTable class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "accel.h"
 #endif
 
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
     wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
     // Copy constructors
     wxAcceleratorTable(const wxAcceleratorTable& accel)
@@ -47,7 +47,7 @@ public:
     int GetCommand( wxKeyEvent &event );
 };
 
-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
     // _WX_ACCEL_H_