X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8aa04e8bf1638ed4d9355e560c8d718c8be4667a..73bab6b44da953b35b902c9f3199582e4e76d89b:/include/wx/motif/accel.h

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index cd08c75f1d..8bb9608a63 100644
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -6,13 +6,13 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "accel.h"
 #endif
 
@@ -20,74 +20,27 @@
 #include "wx/string.h"
 #include "wx/event.h"
 
-class WXDLLEXPORT wxAcceleratorTable;
-
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no key down
-#define wxACCEL_NORMAL  0x00
-
-class WXDLLEXPORT wxAcceleratorEntry
-{
-public:
-    wxAcceleratorEntry(const wxAcceleratorEntry& entry)
-    {
-        m_flags = entry.m_flags; m_keyCode = entry.m_keyCode; m_command = entry.m_command;
-    }
-    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
-    {
-        m_flags = flags; m_keyCode = keyCode; m_command = cmd;
-    }
-
-    inline void Set(int flags, int keyCode, int cmd)
-         { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    inline int GetFlags() const { return m_flags; }
-    inline int GetKeyCode() const { return m_keyCode; }
-    inline int GetCommand() const { return m_command; }
-
-    void operator = (const wxAcceleratorEntry& entry)
-    {
-        m_flags = entry.m_flags; m_keyCode = entry.m_keyCode; m_command = entry.m_command;
-    }
-
-    // Implementation use only
-    bool MatchesEvent(const wxKeyEvent& event) const;
-
-public:
-    int             m_flags;
-    int			    m_keyCode; // ASCII or virtual keycode
-    int			    m_command; // Command id to generate
-};
-
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    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) { 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;
-
-// Implementation only
+    
+    // Implementation only
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
 };
@@ -95,4 +48,4 @@ public:
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
-    // _WX_ACCEL_H_
+// _WX_ACCEL_H_