X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4952771da3299869bfdb805edb2906ca6551637e..617bfeecfeeaecec2443d10545879d114c4dff0d:/src/mac/carbon/uma.cpp diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index a80cfb22be..d5f59cef31 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: uma.cpp +// Name: src/mac/carbon/uma.cpp // Purpose: UMA support // Author: Stefan Csomor // Modified by: @@ -358,12 +358,12 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn glyph = kMenuClearGlyph ; break ; - case WXK_PRIOR : // PAGE UP + case WXK_PAGEUP : macKey = kPageUpCharCode ; glyph = kMenuPageUpGlyph ; break ; - case WXK_NEXT : + case WXK_PAGEDOWN : macKey = kPageDownCharCode ; glyph = kMenuPageDownGlyph ; break ; @@ -424,7 +424,7 @@ void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc { MacAppendMenu(menu, "\pA"); - // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) + // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ; UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding ); UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ; @@ -434,7 +434,7 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc { MacInsertMenuItem( menu , "\pA" , item) ; - // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) + // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ; UMASetMenuItemText(menu, item+1 , title , encoding ); UMASetMenuItemShortcut( menu , item+1 , entry ) ; @@ -593,7 +593,7 @@ void UMAActivateControl( ControlRef inControl ) InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; } } -#endif +#endif } void UMAMoveControl( ControlRef inControl , short x , short y ) @@ -885,4 +885,3 @@ void UMASetSystemIsInitialized(bool val) } #endif // wxUSE_BASE -