Implemented Mac-style button toggling within wxButtonToolBar, and line

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

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 11764faeb6140e2f9518fb12ede7fc272d3563fd..d67392b8eecc2306c631a7918ca8a0aeb091ef6c 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -6,16 +6,12 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "accel.h"
-#endif
-
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/event.h"
@@ -27,16 +23,11 @@ public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
-    
-    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-    wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
-    
+
     ~wxAcceleratorTable();
-    
-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; }
-    bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; }
-    bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; }
+
+    bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; }
+    bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; }
     
     bool Ok() const;