diff options
Diffstat (limited to 'vcl/source/control/menubtn.cxx')
| -rw-r--r-- | vcl/source/control/menubtn.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index c264d01916fc..5996a5b2d1b1 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -78,10 +78,10 @@ void MenuButton::ImplExecuteMenu() Point aPos( 0, 1 ); Size aSize = GetSizePixel(); Rectangle aRect( aPos, aSize ); - SetPressed( TRUE ); + SetPressed( sal_True ); EndSelection(); mnCurItemId = mpMenu->Execute( this, aRect, POPUPMENU_EXECUTE_DOWN ); - SetPressed( FALSE ); + SetPressed( sal_False ); if ( mnCurItemId ) { Select(); @@ -120,7 +120,7 @@ void MenuButton::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); - ULONG nObjMask = ReadLongRes(); + sal_uLong nObjMask = ReadLongRes(); if ( RSCMENUBUTTON_MENU & nObjMask ) { @@ -196,7 +196,7 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) void MenuButton::KeyInput( const KeyEvent& rKEvt ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); - USHORT nCode = aKeyCode.GetCode(); + sal_uInt16 nCode = aKeyCode.GetCode(); if ( (nCode == KEY_DOWN) && aKeyCode.IsMod2() ) ImplExecuteMenu(); else if ( !(mnMenuMode & MENUBUTTON_MENUMODE_TIMED) && @@ -223,7 +223,7 @@ void MenuButton::Select() // ----------------------------------------------------------------------- -void MenuButton::SetMenuMode( USHORT nMode ) +void MenuButton::SetMenuMode( sal_uInt16 nMode ) { // Fuer die 5.1-Auslieferung besser noch nicht inline, ansonsten kann // diese Funktion zur 6.0 inline werden |