don't disable hidden windows in wxWindowDisabler, it's at best useless

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index a5202e417366cc8327fb26ee65bcacae3988981d..faf7d50f88ef87982abefdb3af7a2b824e19fd2a 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -6,7 +6,7 @@
 // Created:     31.05.01 (extracted from other files)
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     31.05.01 (extracted from other files)
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #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)
 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;
     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); }
 
     bool operator!=(const wxAcceleratorEntry& entry) const
         { return !(*this == entry); }
 

-#if defined(__WXMOTIF__) || defined(__WXX11__)
+#if defined(__WXMOTIF__)

     // Implementation use only
     // Implementation use only

-    bool MatchesEvent(const wxKeyEvent& event) const ;
+    bool MatchesEvent(const wxKeyEvent& event) const;

 #endif
     
 private:
 #endif
     
 private:


@@ -107,10 +122,10 @@ private:
     #include "wx/gtk/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
     #include "wx/gtk/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(__WXPM__)
     #include "wx/os2/accel.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/accel.h"

 #endif
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 #endif
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;