added wxMAKE_UNIQUE_NAME to wx/defs.h, use it in wx/debug.h

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

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index bdd4ff8a85f29692f35d264cda5412e9a4750208..4ba1dc43003c2d9155ebe9ea632222884d3a0608 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "accel.h"
 #endif
 
 #pragma interface "accel.h"
 #endif
 


@@ -24,11 +24,12 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     wxAcceleratorTable();
 {
 public:
     wxAcceleratorTable();

-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);

     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(const wxAcceleratorTable& accel)
     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(const wxAcceleratorTable& accel)

-      { Ref(accel); }
+        : wxObject()
+        { Ref(accel); }

     wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
       { if ( m_refData != accel.m_refData ) Ref(accel); return *this; }
 
     wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
       { if ( m_refData != accel.m_refData ) Ref(accel); return *this; }