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

[Tor Lillqvist]

 vcl/win/source/window/salmenu.cxx |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 09aa0d142e9573fac898ea270d659e3ed7ef019c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jul 29 15:16:55 2015 +0300

    This OWNERDRAW thing has been commented-out since 2003
    
    Change-Id: I3170dec0578e0e54a2edb85e0a3a8fcd796b94ae

diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index 422701a..0b623e2 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() )