Added project files for wxUniv under MSW

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

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 3e8da6784a4feb232d1d725f2a4c659d58aa171a..fb12365d8c4d10a29a3fd8403219ab7afca98406 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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


@@ -18,6 +18,7 @@
 
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"

+#include "wx/event.h"

 
 class WXDLLEXPORT wxAcceleratorTable;
 
 
 class WXDLLEXPORT wxAcceleratorTable;
 


@@ -31,26 +32,39 @@ class WXDLLEXPORT wxAcceleratorTable;
 #define wxACCEL_SHIFT   0x04
 
  // Hold no key down
 #define wxACCEL_SHIFT   0x04
 
  // Hold no key down

-#define wxACCEL_NONE    0x00
+#define wxACCEL_NORMAL  0x00

 
 class WXDLLEXPORT wxAcceleratorEntry
 {
 public:
 
 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;
     }
 
     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)
+    void Set(int flags, int keyCode, int cmd)

          { m_flags = flags; m_keyCode = keyCode; m_command = 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; }
+    int GetFlags() const { return m_flags; }
+    int GetKeyCode() const { return m_keyCode; }
+    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;

 
 

-    int             m_flags;
-    int                            m_keyCode; // ASCII or virtual keycode
-    int                            m_command; // Command id to generate
+public:
+    int          m_flags;
+    int          m_keyCode; // ASCII or virtual keycode
+    int          m_command; // Command id to generate

 };
 
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 };
 
 class WXDLLEXPORT wxAcceleratorTable: public wxObject


@@ -62,16 +76,20 @@ public:
     wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
 
     // Copy constructors
     wxAcceleratorTable(int n, 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();
 
 
     ~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;
 
     bool Ok() const;

+
+// Implementation only
+    int GetCount() const;
+    wxAcceleratorEntry* GetEntries() const;

 };
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 };
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;