Must have valid colours for X11 popup window implementation

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index f51578538cf5b047ba72fe905ba607ee36cc3647..1c85b4447b0a190087fe5b9c796206d158253d75 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_BASE_
@@ -44,10 +44,25 @@ class WXDLLEXPORT wxAcceleratorEntry
 public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0,
                        wxMenuItem *item = NULL)
+        : m_flags(flags)
+        , m_keyCode(keyCode)
+        , m_command(cmd)
+        , m_item(item)
+        { }
+
+    wxAcceleratorEntry(const wxAcceleratorEntry& entry)
+        : m_flags(entry.m_flags)
+        , m_keyCode(entry.m_keyCode)
+        , m_command(entry.m_command)
+        , m_item(entry.m_item)
+        { }
+
+    wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)
     {
-        Set(flags, keyCode, cmd, item);
+        Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
+        return *this;
     }
-
+    
     void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL)
     {
         m_flags = flags;
@@ -75,9 +90,9 @@ public:
     bool operator!=(const wxAcceleratorEntry& entry) const
         { return !(*this == entry); }
 
-#ifdef __WXMOTIF__
+#if defined(__WXMOTIF__)
     // Implementation use only
-    bool MatchesEvent(const wxKeyEvent& event) const ;
+    bool MatchesEvent(const wxKeyEvent& event) const;
 #endif
     
 private:
@@ -105,14 +120,12 @@ private:
     #include "wx/motif/accel.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/accel.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/generic/accel.h"
 #elif defined(__WXPM__)
     #include "wx/os2/accel.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/accel.h"
 #endif
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;