add comparison operators for wxPen/BrushStyle and wxSOLID/... constants to avoid...

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index 025b51b375f5013a805be2def8b4da5dbad6cd8a..0cbf106f7a3c38214938e62e7e421d31bb6ae1b1 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 // ----------------------------------------------------------------------------
 
 // wxAcceleratorEntry flags
 // ----------------------------------------------------------------------------
 
 // wxAcceleratorEntry flags

-enum
+enum wxAcceleratorEntryFlags

 {
     wxACCEL_NORMAL  = 0x0000,   // no modifiers
     wxACCEL_ALT     = 0x0001,   // hold Alt key down
 {
     wxACCEL_NORMAL  = 0x0000,   // no modifiers
     wxACCEL_ALT     = 0x0001,   // hold Alt key down


@@ -68,7 +68,8 @@ public:
 
     wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)
     {
 
     wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)
     {

-        Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
+        if (&entry != this)
+            Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);

         return *this;
     }
 
         return *this;
     }