fix typo in drawing slider ticks; added assert to check for it (slightly modified...

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

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index d55e1ea8f1e68388a4a7bfb4e597238bac4df769..da205da2c887a87cbeb4fa5cb469f1a27a794d45 100644 (file)
--- a/include/wx/mac/accel.h
+++ b/include/wx/mac/accel.h
@@ -12,34 +12,42 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "accel.h"
 #endif
 
 #include "wx/string.h"
+#include "wx/event.h"
 
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 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
-    inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
+    wxAcceleratorTable(const wxAcceleratorTable& accel)
+        : wxObject()
+    { Ref(accel); }
+    wxAcceleratorTable(const wxAcceleratorTable* accel)
+    { if (accel) Ref(*accel); }
 
     ~wxAcceleratorTable();
 
-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; }
-    inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; }
-    inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; }
+    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 Ok() const;
+
+    int GetCommand( wxKeyEvent &event );
 };
 
-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
     // _WX_ACCEL_H_