X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2824cdb7f6ac2371fefd3d44eff62bb48ebc0a3..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/mdi.h

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index e11290ead9..19a8832fb6 100644
--- 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;
@@ -80,15 +81,18 @@ public:
 #if wxUSE_MENUS
     // return the pointer to the current window menu or NULL if we don't have
     // because of wxFRAME_NO_WINDOW_MENU style
-    wxMenu* GetWindowMenu() const { return m_windowMenu; };
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
 
     // use the given menu instead of the default window menu
     //
     // 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,16 @@ 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; }
+
+    // Raising any frame is supposed to show it but wxFrame Raise()
+    // implementation doesn't work for MDI child frames in most forms so
+    // forward this to Activate() which serves the same purpose by default.
+    virtual void Raise() { Activate(); }
+
 protected:
     wxMDIParentFrame *m_mdiParent;
 };