diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-07-29 15:16:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-07-29 15:18:36 +0300 |
| commit | 09aa0d142e9573fac898ea270d659e3ed7ef019c (patch) | |
| tree | 5cd8db4b6982939646ddc77ee46a07ba756ceeaf | |
| parent | a33e0379bbe2c7651315f5cdc5925adab33b573b (diff) | |
This OWNERDRAW thing has been commented-out since 2003
Change-Id: I3170dec0578e0e54a2edb85e0a3a8fcd796b94ae
| -rw-r--r-- | vcl/win/source/window/salmenu.cxx | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 422701a6865e..0b623e25b1b4 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -31,11 +31,6 @@ #include <impbmp.hxx> #include <salgdi.hxx> -// uncomment the following line to have ownerdrawn menus, ie, with bitmaps -// however, this is incompatible with OLE inplace editing -// so it is not activated by default -//#define OWNERDRAW - static DWORD myerr=0; bool SalData::IsKnownMenuHandle( HMENU hMenu ) @@ -98,11 +93,6 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData ) pSalMenuItem->mInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID | MIIM_DATA; pSalMenuItem->mInfo.fType = MFT_STRING; -#ifdef OWNERDRAW - if( pItemData->pMenu && !pItemData->pMenu->IsMenuBar() ) - pSalMenuItem->mInfo.fType |= MFT_OWNERDRAW; - pSalMenuItem->mInfo.fState = MFS_ENABLED; -#endif pSalMenuItem->mInfo.dwTypeData = (LPWSTR) pSalMenuItem->mText.getStr(); pSalMenuItem->mInfo.cch = pSalMenuItem->mText.getLength(); @@ -310,10 +300,6 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU pWItem->mText = pWItem->mText.replaceAll( "~", "&" ); pWItem->mInfo.fMask = MIIM_TYPE | MIIM_DATA; pWItem->mInfo.fType = MFT_STRING; -#ifdef OWNERDRAW - if( pWItem->mpMenu && !((Menu*) pWItem->mpMenu)->IsMenuBar() ) - pWItem->mInfo.fType |= MFT_OWNERDRAW; -#endif // combine text and accelerator text OUString aStr( pWItem->mText ); @@ -339,10 +325,7 @@ void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const pWItem->mAccelText = rKeyName; pWItem->mInfo.fMask = MIIM_TYPE | MIIM_DATA; pWItem->mInfo.fType = MFT_STRING; -#ifdef OWNERDRAW - if( pWItem->mpMenu && !((Menu*)pWItem->mpMenu)->IsMenuBar() ) - pWItem->mInfo.fType |= MFT_OWNERDRAW; -#endif + // combine text and accelerator text OUString aStr( pWItem->mText ); if( pWItem->mAccelText.getLength() ) |