/////////////////////////////////////////////////////////////////////////////
-// Name: uma.cpp
+// Name: src/mac/carbon/uma.cpp
// Purpose: UMA support
// Author: Stefan Csomor
// Modified by:
// Licence: The wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
+#include "wx/wxprec.h"
#if wxUSE_GUI
+#include "wx/toplevel.h"
#include "wx/dc.h"
-#include <MacTextEditor.h>
#ifndef __DARWIN__
+# include <MacTextEditor.h>
# include <Navigation.h>
# if defined(TARGET_CARBON)
# if PM_USE_SESSION_APIS
#endif
#ifndef __DARWIN__
-#include <Scrap.h>
+# include <Scrap.h>
#endif
-#include "wx/mac/uma.h"
+#include "wx/mac/uma.h"
// since we have decided that we only support 8.6 upwards we are
// checking for these minimum requirements in the startup code of
// windows manager, control manager, navigation services etc. are
// present
-static bool sUMAHasAppearance = false ;
-static long sUMAAppearanceVersion = 0 ;
-static long sUMASystemVersion = 0 ;
-static bool sUMAHasAquaLayout = false ;
-
-static bool sUMAHasInittedAppearance = false;
+static SInt32 sUMASystemVersion = 0 ;
-extern int gAGABackgroundColor ;
-bool UMAHasAppearance() { return sUMAHasAppearance ; }
-long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
long UMAGetSystemVersion() { return sUMASystemVersion ; }
-static bool sUMAHasWindowManager = false ;
-static long sUMAWindowManagerAttr = 0 ;
-
-bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
-long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
-bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
-
-
void UMACleanupToolbox()
{
- if (sUMAHasInittedAppearance)
- {
- UnregisterAppearanceClient() ;
- }
- if ( NavServicesAvailable() )
- {
- NavUnload() ;
- }
- if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
- TXNTerminateTextension( ) ;
}
+
void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
{
-#if !TARGET_CARBON
- ::MaxApplZone();
- for (long i = 1; i <= inMoreMastersCalls; i++)
- ::MoreMasters();
-
- if (!isEmbedded)
- {
- ::InitGraf(&qd.thePort);
- ::InitFonts();
- ::InitMenus();
- ::TEInit();
- ::InitDialogs(0L);
- ::FlushEvents(everyEvent, 0);
- }
-
- long total,contig;
- PurgeSpace(&total, &contig);
-#endif
-
::InitCursor();
if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
sUMASystemVersion = 0x0000 ;
- long theAppearance ;
- if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
- {
- sUMAHasAppearance = true ;
- OSStatus status = RegisterAppearanceClient();
- // If status equals appearanceProcessRegisteredErr it means the
- // appearance client already was registered (For example if we run
- // embedded, the host might have registered it). In such a case
- // we don't unregister it later on.
- if (status != appearanceProcessRegisteredErr)
- {
- // Appearance client wasn't registered yet.
- sUMAHasInittedAppearance = true;
- }
-
- if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
- {
- sUMAAppearanceVersion = theAppearance ;
- }
- else
- {
- sUMAAppearanceVersion = 0x0100 ;
- }
- }
- if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
+#ifndef __LP64__
{
- sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
- }
+ FontFamilyID fontId ;
+ Str255 fontName ;
+ SInt16 fontSize ;
+ Style fontStyle ;
-#if TARGET_CARBON
-// Call currently implicitely done : InitFloatingWindows() ;
-#else
- if (!isEmbedded)
- {
- if ( sUMAHasWindowManager )
- InitFloatingWindows() ;
- else
- InitWindows();
- }
-#endif
+ GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ GetFNum( fontName, &fontId );
- if ( NavServicesAvailable() )
- {
- NavLoad() ;
- }
+ TXNMacOSPreferredFontDescription fontDescriptions[] =
+ {
+ { fontId , (fontSize << 16) , kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
+ } ;
+ int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
- long menuMgrAttr ;
- Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
- if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
- sUMAHasAquaLayout = true ;
-
- if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
- {
- FontFamilyID fontId ;
- Str255 fontName ;
- SInt16 fontSize ;
- Style fontStyle ;
- GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
- GetFNum( fontName, &fontId );
-
- TXNMacOSPreferredFontDescription fontDescriptions[] =
- {
- { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
- } ;
- int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
+ OptionBits options = 0 ;
- OptionBits options = 0 ;
+ if ( UMAGetSystemVersion() < 0x1000 )
+ options |= kTXNAlwaysUseQuickDrawTextMask ;
- if ( UMAGetSystemVersion() < 0x1000 )
- {
- options |= kTXNAlwaysUseQuickDrawTextMask ;
+ TXNInitTextension( fontDescriptions, noOfFontDescriptions, options );
}
- TXNInitTextension(fontDescriptions, noOfFontDescriptions, options );
- }
-
-
- UMASetSystemIsInitialized(true);
+#endif
+ UMASetSystemIsInitialized( true );
}
-/*
-Boolean CanUseATSUI()
- {
- long result;
- OSErr err = Gestalt(gestaltATSUVersion, &result);
- return (err == noErr);
- }
-*/
// process manager
long UMAGetProcessMode()
{
ProcessInfoRec processinfo;
ProcessSerialNumber procno ;
- procno.highLongOfPSN = NULL ;
+ procno.highLongOfPSN = 0 ;
procno.lowLongOfPSN = kCurrentProcess ;
processinfo.processInfoLength = sizeof(ProcessInfoRec);
processinfo.processName = NULL;
+#ifndef __LP64__
processinfo.processAppSpec = NULL;
+#endif
err = ::GetProcessInformation( &procno , &processinfo ) ;
wxASSERT( err == noErr ) ;
+
return processinfo.processMode ;
}
{
wxString str = wxStripMenuCodes( title ) ;
MenuRef menu ;
+
#if TARGET_CARBON
CreateNewMenu( id , 0 , &menu ) ;
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
wxMacStringToPascal( str , ptitle ) ;
menu = ::NewMenu( id , ptitle ) ;
#endif
+
return menu ;
}
-void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding)
+void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding )
{
wxString str = wxStripMenuCodes( title ) ;
+
#if TARGET_CARBON
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
+
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
#endif
}
-void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title , wxFontEncoding encoding)
+void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title, wxFontEncoding encoding )
{
- wxString str = wxStripMenuCodes( title ) ;
+ // we don't strip the accels here anymore, must be done before
+ wxString str = title ;
+
#if TARGET_CARBON
SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
+
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
#endif
}
-
UInt32 UMAMenuEvent( EventRecord *inEvent )
{
- return MenuEvent( inEvent ) ;
+ return MenuEvent( inEvent ) ;
}
void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
{
- MacAppendMenu(menu, "\pA");
- UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
+ AppendMenuItemTextWithCFString( menu,
+ CFSTR("A"), 0, 0,NULL);
+ UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );
SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
}
void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id )
{
- MacInsertMenuItem(menu, "\pA" , item);
- UMASetMenuItemText(menu, item+1, title , encoding);
+ InsertMenuItemTextWithCFString( menu,
+ CFSTR("A"), item, 0, 0);
+
+ UMASetMenuItemText( menu, item+1, title , encoding );
SetMenuItemHierarchicalID( menu , item+1 , id ) ;
}
SInt16 key = entry->GetKeyCode() ;
if ( key )
{
- bool explicitCommandKey = false ;
+ bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL);
- if ( entry->GetFlags() & wxACCEL_CTRL )
- {
- explicitCommandKey = true ;
- }
-
- if (entry->GetFlags() & wxACCEL_ALT )
- {
+ if (entry->GetFlags() & wxACCEL_ALT)
modifiers |= kMenuOptionModifier ;
- }
if (entry->GetFlags() & wxACCEL_SHIFT)
- {
modifiers |= kMenuShiftModifier ;
- }
SInt16 glyph = 0 ;
SInt16 macKey = key ;
if ( key >= WXK_F1 && key <= WXK_F15 )
{
+ if ( !explicitCommandKey )
+ modifiers |= kMenuNoCommandModifier ;
+
// for some reasons this must be 0 right now
// everything else leads to just the first function key item
// to be selected. Thanks to Ryan Wilcox for finding out.
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 )
glyph += 13 ;
- if ( !explicitCommandKey )
- modifiers |= kMenuNoCommandModifier ;
- }
+ }
else
{
- switch( key )
+ switch ( key )
{
case WXK_BACK :
macKey = kBackspaceCharCode ;
glyph = kMenuDeleteLeftGlyph ;
break ;
+
case WXK_TAB :
macKey = kTabCharCode ;
glyph = kMenuTabRightGlyph ;
break ;
+
case kEnterCharCode :
macKey = kEnterCharCode ;
glyph = kMenuEnterGlyph ;
break ;
+
case WXK_RETURN :
macKey = kReturnCharCode ;
glyph = kMenuReturnGlyph ;
break ;
+
case WXK_ESCAPE :
macKey = kEscapeCharCode ;
glyph = kMenuEscapeGlyph ;
break ;
+
case WXK_SPACE :
macKey = ' ' ;
glyph = kMenuSpaceGlyph ;
break ;
+
case WXK_DELETE :
macKey = kDeleteCharCode ;
glyph = kMenuDeleteRightGlyph ;
break ;
+
case WXK_CLEAR :
macKey = kClearCharCode ;
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 ;
+
case WXK_LEFT :
macKey = kLeftArrowCharCode ;
glyph = kMenuLeftArrowGlyph ;
break ;
+
case WXK_UP :
macKey = kUpArrowCharCode ;
glyph = kMenuUpArrowGlyph ;
break ;
+
case WXK_RIGHT :
macKey = kRightArrowCharCode ;
glyph = kMenuRightArrowGlyph ;
break ;
+
case WXK_DOWN :
macKey = kDownArrowCharCode ;
glyph = kMenuDownArrowGlyph ;
break ;
+
+ case WXK_HOME :
+ macKey = kHomeCharCode ;
+ glyph = kMenuNorthwestArrowGlyph ;
+ break ;
+
+ case WXK_END :
+ macKey = kEndCharCode ;
+ glyph = kMenuSoutheastArrowGlyph ;
+ 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
// do not use for these character codes.
- if (key != WXK_UP && key != WXK_RIGHT)
+ if (key != WXK_UP && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_LEFT)
SetItemCmd( menu, item , macKey );
- SetMenuItemModifiers(menu, item , modifiers ) ;
+ SetMenuItemModifiers( menu, item , modifiers ) ;
if ( glyph )
- SetMenuItemKeyGlyph(menu, item , glyph ) ;
+ SetMenuItemKeyGlyph( menu, item , glyph ) ;
}
}
void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
{
- MacAppendMenu(menu, "\pA");
+ AppendMenuItemTextWithCFString( menu,
+ CFSTR("A"), 0, 0,NULL);
+ // 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 ) ;
+ UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;
}
void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
{
- MacInsertMenuItem( menu , "\pA" , item) ;
+ InsertMenuItemTextWithCFString( menu,
+ CFSTR("A"), item, 0, 0);
+
+ // 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 ) ;
}
OSStatus UMAPrOpen()
{
OSErr err = noErr ;
+
++gPrOpenCounter ;
+
if ( gPrOpenCounter == 1 )
{
PrOpen() ;
err = PrError() ;
wxASSERT( err == noErr ) ;
}
+
return err ;
}
OSStatus UMAPrClose()
{
OSErr err = noErr ;
+
wxASSERT( gPrOpenCounter >= 1 ) ;
+
if ( gPrOpenCounter == 1 )
{
PrClose() ;
err = PrError() ;
wxASSERT( err == noErr ) ;
}
+
--gPrOpenCounter ;
+
return err ;
}
-pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
-pascal QDGlobalsPtr GetQDGlobalsPtr (void)
+pascal QDGlobalsPtr GetQDGlobalsPtr() ;
+pascal QDGlobalsPtr GetQDGlobalsPtr()
{
return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
}
void UMAShowWatchCursor()
{
- OSErr err = noErr;
-
- CursHandle watchFob = GetCursor (watchCursor);
-
- if (!watchFob)
- err = nilHandleErr;
- else
- {
- #if TARGET_CARBON
-// Cursor preservedArrow;
-// GetQDGlobalsArrow (&preservedArrow);
-// SetQDGlobalsArrow (*watchFob);
-// InitCursor ( );
-// SetQDGlobalsArrow (&preservedArrow);
- SetCursor (*watchFob);
- #else
- SetCursor (*watchFob);
- #endif
- }
+ SetThemeCursor(kThemeWatchCursor);
}
-void UMAShowArrowCursor()
+void UMAShowArrowCursor()
{
-#if TARGET_CARBON
- Cursor arrow;
- SetCursor (GetQDGlobalsArrow (&arrow));
-#else
- SetCursor (&(qd.arrow));
-#endif
+ SetThemeCursor(kThemeArrowCursor);
}
// window manager
-GrafPtr UMAGetWindowPort( WindowRef inWindowRef )
+GrafPtr UMAGetWindowPort( WindowRef inWindowRef )
{
wxASSERT( inWindowRef != NULL ) ;
+
#if TARGET_CARBON
return (GrafPtr) GetWindowPort( inWindowRef ) ;
#else
#endif
}
-void UMADisposeWindow( WindowRef inWindowRef )
+void UMADisposeWindow( WindowRef inWindowRef )
{
wxASSERT( inWindowRef != NULL ) ;
+
DisposeWindow( inWindowRef ) ;
}
-void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding)
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding )
{
#if TARGET_CARBON
SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
+
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
// appearance additions
-void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding)
+void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding )
{
#if TARGET_CARBON
SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
+
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
void UMAActivateControl( ControlRef inControl )
{
-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+ ::ActivateControl( inControl ) ;
+
+#else
// 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 ) {
+
+ if ( visible )
+ {
SetControlVisibility( inControl , true , false ) ;
-
+
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
}
}
-#endif
+#endif
}
void UMAMoveControl( ControlRef inControl , short x , short y )
{
-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+ ::MoveControl( inControl , x , y ) ;
+
+#else
bool visible = IsControlVisible( inControl ) ;
- if ( visible ) {
+ if ( visible )
+ {
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
}
-#endif
+
::MoveControl( inControl , x , y ) ;
-#if !TARGET_API_MAC_OSX
- if ( visible ) {
+
+ if ( visible )
+ {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
}
#endif
}
void UMASizeControl( ControlRef inControl , short x , short y )
{
-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+ ::SizeControl( inControl , x , y ) ;
+
+#else
bool visible = IsControlVisible( inControl ) ;
- if ( visible ) {
+ if ( visible )
+ {
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
}
-#endif
+
::SizeControl( inControl , x , y ) ;
-#if !TARGET_API_MAC_OSX
- if ( visible ) {
+
+ if ( visible )
+ {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
}
#endif
}
void UMADeactivateControl( ControlRef inControl )
{
-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+ ::DeactivateControl( inControl ) ;
+
+#else
// 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 ) {
+
+ if ( visible )
+ {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
}
#endif
}
+
// shows the control and adds the region to the update region
-void UMAShowControl (ControlRef inControl)
+void UMAShowControl( ControlRef inControl )
{
SetControlVisibility( inControl , true , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ HIViewSetNeedsDisplay( inControl, true );
}
// hides the control and adds the region to the update region
-void UMAHideControl (ControlRef inControl)
+void UMAHideControl( ControlRef inControl )
{
SetControlVisibility( inControl , false , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ HIViewSetNeedsDisplay( inControl, true );
}
+
// keyboard focus
-OSErr UMASetKeyboardFocus (WindowPtr inWindow,
- ControlRef inControl,
- ControlFocusPart inPart)
+OSErr UMASetKeyboardFocus( WindowPtr inWindow,
+ ControlRef inControl,
+ ControlFocusPart inPart )
{
OSErr err = noErr;
+#ifndef __LP64__
GrafPtr port ;
- GetPort( &port ) ;
+ GetPort( &port ) ;
SetPortWindowPort( inWindow ) ;
+#endif
err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
+#ifndef __LP64__
SetPort( port ) ;
+#endif
+
return err ;
}
if ( inWindowRef )
{
// bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-// if ( inActivate != isHightlited )
+// if ( inActivate != isHighlighted )
+#ifndef __LP64__
GrafPtr port ;
GetPort( &port ) ;
SetPortWindowPort( inWindowRef ) ;
+#endif
HiliteWindow( inWindowRef , inActivate ) ;
ControlRef control = NULL ;
- ::GetRootControl( inWindowRef , & control ) ;
+ ::GetRootControl( inWindowRef , &control ) ;
if ( control )
{
if ( inActivate )
else
UMADeactivateControl( control ) ;
}
+#ifndef __LP64__
SetPort( port ) ;
+#endif
}
}
OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
{
+#ifndef __LP64__
return ::DrawThemePlacard( inRect , inState ) ;
+#else
+ return noErr;
+#endif
}
#if !TARGET_CARBON
#endif
OSStatus UMAGetHelpMenu(
- MenuRef * outHelpMenu,
- MenuItemIndex * outFirstCustomItemIndex)
+ MenuRef * outHelpMenu,
+ MenuItemIndex * outFirstCustomItemIndex)
{
#if TARGET_CARBON
return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+
#else
MenuRef helpMenuHandle ;
+
helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
- {
firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
- }
+
if ( outFirstCustomItemIndex )
- {
*outFirstCustomItemIndex = firstCustomItemIndex ;
- }
+
*outHelpMenu = helpMenuHandle ;
+
return helpMenuStatus ;
#endif
}
-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)
+#ifndef __LP64__
+
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport )
{
m_clip = NULL ;
Setup( newport ) ;
{
GetPort( &m_oldPort ) ;
SetPort( newport ) ;
- SetOrigin(0,0);
+ SetOrigin(0, 0);
+
wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
m_clip = NewRgn() ;
GetClip( m_clip );
- m_textFont = GetPortTextFont( (CGrafPtr) newport);
- m_textSize = GetPortTextSize( (CGrafPtr) newport);
- m_textStyle = GetPortTextFace( (CGrafPtr) newport);
- m_textMode = GetPortTextMode( (CGrafPtr) newport);
+ m_textFont = GetPortTextFont( (CGrafPtr) newport );
+ m_textSize = GetPortTextSize( (CGrafPtr) newport );
+ m_textStyle = GetPortTextFace( (CGrafPtr) newport );
+ m_textMode = GetPortTextMode( (CGrafPtr) newport );
GetThemeDrawingState( &m_drawingState ) ;
m_currentPort = newport ;
}
+
void wxMacPortStateHelper::Clear()
{
if ( m_clip )
}
}
+#endif
+
OSStatus UMAPutScrap( Size size , OSType type , void *data )
{
OSStatus err = noErr ;
+
#if !TARGET_CARBON
err = PutScrap( size , type , data ) ;
#else
ScrapRef scrap;
- err = GetCurrentScrap (&scrap);
- if ( !err )
- {
- err = PutScrapFlavor (scrap, type , 0, size, data);
- }
+ err = GetCurrentScrap( &scrap );
+ if ( err == noErr )
+ err = PutScrapFlavor( scrap, type , 0, size, data );
#endif
+
return err ;
}
-Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
+Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
{
- wxWindow* win = wxFindControlFromMacControl( theControl ) ;
-
GetControlBounds( theControl , bounds ) ;
+
#if TARGET_API_MAC_OSX
- if ( win != NULL && win->MacGetTopLevelWindow() != NULL )
+ WindowRef tlwref = GetControlOwner( theControl ) ;
+
+ wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+ if ( tlwwx != 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 ;
+ 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
sUMASystemInitialized = val;
}
-
#endif // wxUSE_BASE
projects / wxWidgets.git / blobdiff