diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-06 08:21:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-06 08:21:16 +0000 |
| commit | be91f4f42ff976c56bba217d522480d9b65aa62d (patch) | |
| tree | f4d6a2c1079f333254d19ef0ee6e45c1dbcdcb13 /vcl | |
| parent | 0d24eeba451316ad1879a355b82a2c66db14eb1f (diff) | |
INTEGRATION: CWS vcl41 (1.124.48); FILE MERGED
2005/06/23 10:46:50 pl 1.124.48.2: RESYNC: (1.124-1.125); FILE MERGED
2005/06/20 15:25:41 pl 1.124.48.1: #i50745# draw highlighted disabled menu entries using generic method
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/menu.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e031f97a5714..1e75b795c46c 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menu.cxx,v $ * - * $Revision: 1.125 $ + * $Revision: 1.126 $ * - * last change: $Author: rt $ $Date: 2005-06-21 13:16:44 $ + * last change: $Author: obo $ $Date: 2005-07-06 09:21:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -4130,11 +4130,14 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight ) IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM ) ) { bDrawItemRect = false; - DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM, - Region( aItemRect ), - CTRL_STATE_SELECTED | ( pData->bEnabled? CTRL_STATE_ENABLED: 0 ), - ImplControlValue(), - OUString() ); + if( FALSE == DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM, + Region( aItemRect ), + CTRL_STATE_SELECTED | ( pData->bEnabled? CTRL_STATE_ENABLED: 0 ), + ImplControlValue(), + OUString() ) ) + { + bDrawItemRect = bHighlight; + } } else bDrawItemRect = bHighlight; |