// Licence: The wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
+#include "wx/wxprec.h"
#if wxUSE_GUI
#endif
#include "wx/mac/uma.h"
+#if TARGET_API_MAC_OSX
+#include "wx/toplevel.h"
+#endif
// 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
{ fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
} ;
int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
-#if 0 // TARGET_CARBON
- --noOfFontDescriptions ;
-#endif
- // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
- OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
-#if TARGET_CARBON
- if ( !UMAHasAquaLayout() )
-#endif
+
+ OptionBits options = 0 ;
+
+ if ( UMAGetSystemVersion() < 0x1000 )
{
options |= kTXNAlwaysUseQuickDrawTextMask ;
}
- TXNInitTextension(fontDescriptions, noOfFontDescriptions, options );
+ TXNInitTextension(fontDescriptions, noOfFontDescriptions, options );
}
ProcessInfoRec processinfo;
ProcessSerialNumber procno ;
- procno.highLongOfPSN = NULL ;
+ procno.highLongOfPSN = 0 ;
procno.lowLongOfPSN = kCurrentProcess ;
processinfo.processInfoLength = sizeof(ProcessInfoRec);
processinfo.processName = NULL;
// menu manager
-MenuRef UMANewMenu( SInt16 id , const wxString& title )
+MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )
{
wxString str = wxStripMenuCodes( title ) ;
MenuRef menu ;
#if TARGET_CARBON
CreateNewMenu( id , 0 , &menu ) ;
- SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
+ SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
return menu ;
}
-void UMASetMenuTitle( MenuRef menu , const wxString& title )
+void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding)
{
wxString str = wxStripMenuCodes( title ) ;
#if TARGET_CARBON
- SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
+ SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
#endif
}
-void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title )
+void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title , wxFontEncoding encoding)
{
wxString str = wxStripMenuCodes( title ) ;
#if TARGET_CARBON
- SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ;
+ SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
DisableMenuItem( inMenu , inItem ) ;
}
-void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id )
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
{
MacAppendMenu(menu, "\pA");
- UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+ UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
}
-void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id )
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id )
{
MacInsertMenuItem(menu, "\pA" , item);
- UMASetMenuItemText(menu, item , title );
- SetMenuItemHierarchicalID( menu , item , id ) ;
+ UMASetMenuItemText(menu, item+1, title , encoding);
+ SetMenuItemHierarchicalID( menu , item+1 , id ) ;
}
void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
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 ;
}
- SetItemCmd( menu, item , macKey );
+ // 1d and 1e have special meaning to SetItemCmd, so
+ // do not use for these character codes.
+ if (key != WXK_UP && key != WXK_RIGHT)
+ SetItemCmd( menu, item , macKey );
+
SetMenuItemModifiers(menu, item , modifiers ) ;
if ( glyph )
}
}
-void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry )
+void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
{
MacAppendMenu(menu, "\pA");
- UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+ // 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 , MenuItemIndex item , wxAcceleratorEntry *entry )
+void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
{
MacInsertMenuItem( menu , "\pA" , item) ;
- UMASetMenuItemText(menu, item+1 , title );
+ // 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 ) ;
}
DisposeWindow( inWindowRef ) ;
}
-void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding)
{
#if TARGET_CARBON
- SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;
+ SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
#endif
}
-void UMAGetWTitleC( WindowRef inWindowRef , char *title )
-{
- GetWTitle( inWindowRef , (unsigned char*)title ) ;
-#if TARGET_CARBON
- p2cstrcpy( title, (unsigned char *)title ) ;
-#else
- p2cstr( (unsigned char*)title ) ;
-#endif
-}
-
// appearance additions
-void UMASetControlTitle( ControlHandle inControl , const wxString& title )
+void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding)
{
#if TARGET_CARBON
- SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
+ SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
#endif
}
-void UMAActivateControl( ControlHandle inControl )
+void UMAActivateControl( ControlRef inControl )
{
+#if !TARGET_API_MAC_OSX
// we have to add the control after again to the update rgn
// otherwise updates get lost
if ( !IsControlActive( inControl ) )
bool visible = IsControlVisible( inControl ) ;
if ( visible )
SetControlVisibility( inControl , false , false ) ;
+#endif
::ActivateControl( inControl ) ;
+#if !TARGET_API_MAC_OSX
if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
+
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
}
}
+#endif
}
-void UMADrawControl( ControlHandle inControl )
-{
- WindowRef theWindow = GetControlOwner(inControl) ;
- wxMacPortStateHelper help( (GrafPtr) GetWindowPort(theWindow) ) ;
- RgnHandle updateRgn = NewRgn() ;
- GetWindowUpdateRgn( theWindow , updateRgn ) ;
- Point zero = { 0 , 0 } ;
- LocalToGlobal( &zero ) ;
- OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
- ::DrawControlInCurrentPort( inControl ) ;
- InvalWindowRgn( theWindow, updateRgn) ;
- DisposeRgn( updateRgn ) ;
-}
-
-void UMAMoveControl( ControlHandle inControl , short x , short y )
+void UMAMoveControl( ControlRef inControl , short x , short y )
{
+#if !TARGET_API_MAC_OSX
bool visible = IsControlVisible( inControl ) ;
if ( visible ) {
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
}
+#endif
::MoveControl( inControl , x , y ) ;
+#if !TARGET_API_MAC_OSX
if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
}
+#endif
}
-void UMASizeControl( ControlHandle inControl , short x , short y )
+void UMASizeControl( ControlRef inControl , short x , short y )
{
+#if !TARGET_API_MAC_OSX
bool visible = IsControlVisible( inControl ) ;
if ( visible ) {
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
}
+#endif
::SizeControl( inControl , x , y ) ;
+#if !TARGET_API_MAC_OSX
if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
}
+#endif
}
-void UMADeactivateControl( ControlHandle inControl )
+void UMADeactivateControl( ControlRef inControl )
{
+#if !TARGET_API_MAC_OSX
// we have to add the control after again to the update rgn
// otherwise updates get lost
bool visible = IsControlVisible( inControl ) ;
if ( visible )
SetControlVisibility( inControl , false , false ) ;
+#endif
::DeactivateControl( inControl ) ;
+#if !TARGET_API_MAC_OSX
if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
}
+#endif
}
// shows the control and adds the region to the update region
-void UMAShowControl (ControlHandle inControl)
+void UMAShowControl (ControlRef inControl)
{
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
}
-// shows the control and adds the region to the update region
-void UMAHideControl (ControlHandle inControl)
+// hides the control and adds the region to the update region
+void UMAHideControl (ControlRef inControl)
{
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
}
// keyboard focus
OSErr UMASetKeyboardFocus (WindowPtr inWindow,
- ControlHandle inControl,
+ ControlRef inControl,
ControlFocusPart inPart)
{
OSErr err = noErr;
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 ;
GetPort( &port ) ;
SetPortWindowPort( inWindowRef ) ;
HiliteWindow( inWindowRef , inActivate ) ;
- ControlHandle control = NULL ;
+ ControlRef control = NULL ;
::GetRootControl( inWindowRef , & control ) ;
if ( control )
{
return err ;
}
+Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
+{
+ GetControlBounds( theControl , bounds ) ;
+#if TARGET_API_MAC_OSX
+ WindowRef tlwref = GetControlOwner( theControl ) ;
+
+ wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+ if ( tlwwx->MacUsesCompositing() )
+ {
+ ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+ HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
+ HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;
+ OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
+ }
+#endif
+ return bounds ;
+}
+
+
#endif // wxUSE_GUI
#if wxUSE_BASE
projects / wxWidgets.git / blobdiff