[Libreoffice-commits] core.git: include/vcl

[Stephan Bergmann]

 include/vcl/menu.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f52f2e6aaec8263922befe9203416b7a5c54753c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 19 23:25:54 2016 +0100

    DeactivateMenuBar can be non-virtual now
    
    ...after 9c09d4d0d36076d39926eeaf7774171df3b55e52 "tdf#96888 - Kill internal vcl
    dog-tags ..."
    
    Change-Id: I12c30f5ec3d498561b47ae61b34326d4a1f380d7

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 7e6b244..774fd40 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -448,7 +448,7 @@ public:
     virtual void ClosePopup(Menu* pMenu) override;
 
     /// Deactivate the MenuBarWindow.
-    virtual void DeactivateMenuBar(VclPtr<vcl::Window>& xFocusId);
+    void DeactivateMenuBar(VclPtr<vcl::Window>& xFocusId);
 
     /// Forward the KeyInput call to the MenuBar.
     virtual void MenuBarKeyInput(const KeyEvent& rEvent) override;