// Licence: The wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
+#include "wx/wxprec.h"
#if wxUSE_GUI
// since we have decided that we only support 8.6 upwards we are
// checking for these minimum requirements in the startup code of
-// the application so all wxWindows code can safely assume that appearance 1.1
+// the application so all wxWidgets code can safely assume that appearance 1.1
// windows manager, control manager, navigation services etc. are
// present
ProcessInfoRec processinfo;
ProcessSerialNumber procno ;
- procno.highLongOfPSN = NULL ;
+ procno.highLongOfPSN = 0 ;
procno.lowLongOfPSN = kCurrentProcess ;
processinfo.processInfoLength = sizeof(ProcessInfoRec);
processinfo.processName = NULL;
glyph += 13 ;
if ( !explicitCommandKey )
modifiers |= kMenuNoCommandModifier ;
- }
+ }
else
{
switch( key )
macKey = kDownArrowCharCode ;
glyph = kMenuDownArrowGlyph ;
break ;
+ default :
+ macKey = toupper( key ) ;
+ break ;
}
+ // we now allow non command key shortcuts
+ // remove in case this gives problems
+ if ( !explicitCommandKey )
+ modifiers |= kMenuNoCommandModifier ;
}
// 1d and 1e have special meaning to SetItemCmd, so
void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
{
MacAppendMenu(menu, "\pA");
+ // 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 ) ;
}
void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
{
MacInsertMenuItem( menu , "\pA" , item) ;
+ // 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 ) ;
}
return err ;
}
-// events
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
-{
- wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ;
- RgnHandle updateRgn = NewRgn() ;
- GetWindowUpdateRgn( inWindow , updateRgn ) ;
-
- Point zero = { 0 , 0 } ;
- LocalToGlobal( &zero ) ;
- OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-
- UpdateControls( inWindow , inRgn ) ;
- InvalWindowRgn( inWindow, updateRgn) ;
- DisposeRgn( updateRgn ) ;
-}
-
bool UMAIsWindowFloating( WindowRef inWindow )
{
WindowClass cl ;
#if TARGET_API_MAC_OSX
if ( win != NULL && win->MacGetTopLevelWindow() != NULL )
{
- int x , y ;
- x = 0 ;
- y = 0 ;
-
- win->GetParent()->MacWindowToRootWindow( &x , & y ) ;
- bounds->left += x ;
- bounds->right += x ;
- bounds->top += y ;
- bounds->bottom += y ;
+ wxWindow* parent = win->GetParent() ;
+ if ( parent )
+ {
+ // the parent controls 'origin' expressed in its own
+ // window coordinates (explanation in window.cpp)
+ int x , y ;
+ x = 0 ;
+ y = 0 ;
+
+ if ( !parent->IsTopLevel() )
+ {
+ x += parent->MacGetLeftBorderSize() ;
+ y += parent->MacGetTopBorderSize() ;
+ }
+
+ parent->MacWindowToRootWindow( &x , & y ) ;
+ bounds->left += x ;
+ bounds->right += x ;
+ bounds->top += y ;
+ bounds->bottom += y ;
+ }
}
#endif
return bounds ;