diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 16:12:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 16:12:22 +0200 |
| commit | 1779568f6610dd93a2eeb637dabaed3476dc04ca (patch) | |
| tree | 1f08005ecb1c907c4c62678ade7e3e1eff8f7937 /include/vcl | |
| parent | 7ad4e562b462af22a1c29c955293238cdb30267b (diff) | |
Revert "Tackle Menu with RenderContext refactoring, Invalidate"
This reverts 5485ef70cee1e3a743047f95ce94533024004b7c, which breaks
JunitTest_toolkit_unoapi (toolkit.AccessibleMenu)
Change-Id: Ic9021c23178f1598c08186e5cb24fde13a866579
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/menu.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 6c5316c385e9..2af6a530cb27 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -165,7 +165,7 @@ protected: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; + SAL_DLLPRIVATE void ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); @@ -178,11 +178,11 @@ protected: // returns native check and option menu symbol height in rCheckHeight and rRadioHeight // return value is maximum width and height of checkboxes and radiobuttons - SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, long& rCheckHeight, long& rRadioHeight) const; + SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const vcl::Window*, long& rCheckHeight, long& rRadioHeight ) const; // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Size& rArrowSize, long& rArrowSpacing ) const; + SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( vcl::Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); |