diff options
| author | Ras-al-Ghul <dipankar1995@gmail.com> | 2016-01-14 01:38:03 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-01-19 18:36:35 +0000 |
| commit | 9c09d4d0d36076d39926eeaf7774171df3b55e52 (patch) | |
| tree | a8cd978ada41ad32793a258e67566dc89859f439 /include | |
| parent | 85b46f51928dc17cda1bc974bca9159de9221b4d (diff) | |
tdf#96888 - Kill internal vcl dog-tags ...
Modifications done as per CR
Change-Id: I0b57f5c32fc217929d71411ca5176e3cab3f6e73
Reviewed-on: https://gerrit.libreoffice.org/21457
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/floatwin.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index d999e650a46f..61d724b1ed81 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -134,7 +134,7 @@ public: SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow, const Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex ); - SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags nFlags = FloatWinPopupEndFlags::NONE, sal_uLong nFocusId = 0 ); + SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags nFlags = FloatWinPopupEndFlags::NONE, VclPtr<vcl::Window> xFocusId = nullptr ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } virtual void doDeferredInit(WinBits nBits) override; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index d5eec407ba42..7e6b244f7e70 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -207,9 +207,6 @@ protected: /// Close the 'pStartedFrom' menu window. virtual void ClosePopup(Menu* pMenu) = 0; - /// Deactivate the MenuBarWindow. - virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId); - /// Forward the KeyInput call to the MenuBar. virtual void MenuBarKeyInput(const KeyEvent& rEvent); @@ -451,7 +448,7 @@ public: virtual void ClosePopup(Menu* pMenu) override; /// Deactivate the MenuBarWindow. - virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) override; + virtual void DeactivateMenuBar(VclPtr<vcl::Window>& xFocusId); /// Forward the KeyInput call to the MenuBar. virtual void MenuBarKeyInput(const KeyEvent& rEvent) override; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 6b383bd1bf3f..e757170efa6a 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1142,8 +1142,8 @@ public: bool IsCompoundControl() const; - static sal_uIntPtr SaveFocus(); - static bool EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore = true ); + static VclPtr<vcl::Window> SaveFocus(); + static bool EndSaveFocus( const VclPtr<vcl::Window>& xFocusWin, bool bRestore = true ); void CaptureMouse(); void ReleaseMouse(); |