diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 10:52:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 11:35:14 +0200 |
| commit | 385ce0323fd6b5c13ab26414d68c6ca2afcfc97d (patch) | |
| tree | c169da9a80c16e85146c97abbe726aa3e96d0b74 /vcl/osx/salnsmenu.mm | |
| parent | 4cd0f67562770eb3e88efa9072add80ac2f80c06 (diff) | |
Convert SAL_EVENT to scoped enum
Change-Id: I4e605e7acfe9d4fe409d32f20880b4c0e85a0ea7
Diffstat (limited to 'vcl/osx/salnsmenu.mm')
| -rw-r--r-- | vcl/osx/salnsmenu.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm index 76aee7a6c032..b30792d698b0 100644 --- a/vcl/osx/salnsmenu.mm +++ b/vcl/osx/salnsmenu.mm @@ -49,8 +49,8 @@ aMenuEvt.mpMenu = mpMenu->mpVCLMenu; if( aMenuEvt.mpMenu ) { - pFrame->CallCallback(SALEVENT_MENUACTIVATE, &aMenuEvt); - pFrame->CallCallback(SALEVENT_MENUDEACTIVATE, &aMenuEvt); + pFrame->CallCallback(SalEvent::MenuActivate, &aMenuEvt); + pFrame->CallCallback(SalEvent::MenuDeactivate, &aMenuEvt); } else OSL_FAIL( "unconnected menu" ); @@ -118,7 +118,7 @@ if( pFrame && AquaSalFrame::isAlive( pFrame ) && ! pFrame->GetWindow()->IsInModalMode() ) { SalMenuEvent aMenuEvt( mpMenuItem->mnId, mpMenuItem->mpVCLMenu ); - pFrame->CallCallback(SALEVENT_MENUCOMMAND, &aMenuEvt); + pFrame->CallCallback(SalEvent::MenuCommand, &aMenuEvt); } else if( mpMenuItem->mpVCLMenu ) { @@ -200,7 +200,7 @@ if( AquaSalMenu::pCurrentMenuBar->mpFrame && AquaSalFrame::isAlive( AquaSalMenu::pCurrentMenuBar->mpFrame ) ) { SalMenuEvent aMenuEvt( rButtons[i].maButton.mnId, AquaSalMenu::pCurrentMenuBar->mpVCLMenu ); - AquaSalMenu::pCurrentMenuBar->mpFrame->CallCallback(SALEVENT_MENUBUTTONCOMMAND, &aMenuEvt); + AquaSalMenu::pCurrentMenuBar->mpFrame->CallCallback(SalEvent::MenuButtonCommand, &aMenuEvt); } return; } |