Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index e11290ead98b540577d5b0bd3dd01b2628d397b1..6425de22536aeafd4bc9026714346494e38858cf 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -17,6 +17,7 @@
 #if wxUSE_MDI
 
 #include "wx/frame.h"
+#include "wx/menu.h"
 
 // forward declarations
 class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
@@ -87,8 +88,11 @@ public:
     // menu can be NULL to disable the window menu completely
     virtual void SetWindowMenu(wxMenu *menu)
     {
-        delete m_windowMenu;
-        m_windowMenu = menu;
+        if ( menu != m_windowMenu )
+        {
+            delete m_windowMenu;
+            m_windowMenu = menu;
+        }
     }
 #endif // wxUSE_MENUS
 
@@ -172,6 +176,11 @@ public:
     // level windows too
     virtual bool IsTopLevel() const { return false; }
 
+    // In all ports keyboard navigation must stop at MDI child frame level and
+    // can't cross its boundary. Indicate this by overriding this function to
+    // return true.
+    virtual bool IsTopNavigationDomain() const { return true; }
+
 protected:
     wxMDIParentFrame *m_mdiParent;
 };