Applied patch [ 1325207 ] Fixes unicode build using Solaris with Sun's SunPro compiler

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

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 6b61e38b121f6acd8d9aa1f9a07cc11b3954d0ee..78605a9c4c598e539d242d9f92602b1e1542bc7d 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/event.h"
@@ -26,7 +22,7 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
     
     // Copy constructors
     wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
@@ -35,8 +31,8 @@ public:
     ~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;