[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation'

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

diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h
index b576000a8f0eda46769c9b211c6bbfa8447541ff..9702282af96241fc38b0d32810e5b8732b29501c 100644 (file)
--- a/include/wx/mac/carbon/accel.h
+++ b/include/wx/mac/carbon/accel.h
@@ -6,16 +6,12 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "accel.h"
-#endif
-

 #include "wx/string.h"
 #include "wx/event.h"
 
 #include "wx/string.h"
 #include "wx/event.h"
 


@@ -26,20 +22,11 @@ public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 

-    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-        : wxObject()
-    { Ref(accel); }
-    wxAcceleratorTable(const wxAcceleratorTable* accel)
-    { if (accel) Ref(*accel); }
-

     ~wxAcceleratorTable();
 
     ~wxAcceleratorTable();
 

-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
-    { if (*this == accel) return (*this); Ref(accel); return *this; }
-    bool operator == (const wxAcceleratorTable& accel)
+    bool operator == (const wxAcceleratorTable& accel) const

     { return m_refData == accel.m_refData; }
     { return m_refData == accel.m_refData; }

-    bool operator != (const wxAcceleratorTable& accel)
+    bool operator != (const wxAcceleratorTable& accel) const

     { return m_refData != accel.m_refData; }
 
     bool Ok() const;
     { return m_refData != accel.m_refData; }
 
     bool Ok() const;