git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36379
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
// windows manager, control manager, navigation services etc. are
// present
// windows manager, control manager, navigation services etc. are
// present
-static bool sUMAHasAppearance = false ;
+static bool sUMAHasAppearance = false ;
static long sUMAAppearanceVersion = 0 ;
static long sUMASystemVersion = 0 ;
static bool sUMAHasAquaLayout = false ;
static long sUMAAppearanceVersion = 0 ;
static long sUMASystemVersion = 0 ;
static bool sUMAHasAquaLayout = false ;
static bool sUMAHasInittedAppearance = false;
extern int gAGABackgroundColor ;
static bool sUMAHasInittedAppearance = false;
extern int gAGABackgroundColor ;
bool UMAHasAppearance() { return sUMAHasAppearance ; }
long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
long UMAGetSystemVersion() { return sUMASystemVersion ; }
bool UMAHasAppearance() { return sUMAHasAppearance ; }
long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
long UMAGetSystemVersion() { return sUMASystemVersion ; }
-static bool sUMAHasWindowManager = false ;
+static bool sUMAHasWindowManager = false ;
static long sUMAWindowManagerAttr = 0 ;
bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
static long sUMAWindowManagerAttr = 0 ;
bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
void UMACleanupToolbox()
{
if (sUMAHasInittedAppearance)
void UMACleanupToolbox()
{
if (sUMAHasInittedAppearance)
UnregisterAppearanceClient() ;
UnregisterAppearanceClient() ;
if ( NavServicesAvailable() )
if ( NavServicesAvailable() )
if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
TXNTerminateTextension( ) ;
}
if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
TXNTerminateTextension( ) ;
}
void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
{
#if !TARGET_CARBON
void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
{
#if !TARGET_CARBON
long theAppearance ;
if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
{
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 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.
+
+ sUMAHasAppearance = true ;
+ OSStatus status = RegisterAppearanceClient();
if (status != appearanceProcessRegisteredErr)
{
// Appearance client wasn't registered yet.
if (status != appearanceProcessRegisteredErr)
{
// Appearance client wasn't registered yet.
}
if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
}
if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
sUMAAppearanceVersion = theAppearance ;
sUMAAppearanceVersion = theAppearance ;
sUMAAppearanceVersion = 0x0100 ;
sUMAAppearanceVersion = 0x0100 ;
if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
#if TARGET_CARBON
// Call currently implicitely done : InitFloatingWindows() ;
#if TARGET_CARBON
// Call currently implicitely done : InitFloatingWindows() ;
#endif
if ( NavServicesAvailable() )
#endif
if ( NavServicesAvailable() )
- 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[] =
+ long menuMgrAttr ;
+ Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+ if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+ sUMAHasAquaLayout = true ;
+
+ if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
- { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
- } ;
- int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
+ FontFamilyID fontId ;
+ Str255 fontName ;
+ SInt16 fontSize ;
+ Style fontStyle ;
- OptionBits options = 0 ;
+ GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ GetFNum( fontName, &fontId );
- if ( UMAGetSystemVersion() < 0x1000 )
- {
- options |= kTXNAlwaysUseQuickDrawTextMask ;
- }
- TXNInitTextension(fontDescriptions, noOfFontDescriptions, options );
- }
+ TXNMacOSPreferredFontDescription fontDescriptions[] =
+ {
+ { fontId , (fontSize << 16) , kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
+ } ;
+ int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
+
+ OptionBits options = 0 ;
+ if ( UMAGetSystemVersion() < 0x1000 )
+ options |= kTXNAlwaysUseQuickDrawTextMask ;
- UMASetSystemIsInitialized(true);
+ TXNInitTextension( fontDescriptions, noOfFontDescriptions, options );
+ }
+ UMASetSystemIsInitialized( true );
long result;
OSErr err = Gestalt(gestaltATSUVersion, &result);
return (err == noErr);
long result;
OSErr err = Gestalt(gestaltATSUVersion, &result);
return (err == noErr);
// process manager
long UMAGetProcessMode()
{
// process manager
long UMAGetProcessMode()
{
err = ::GetProcessInformation( &procno , &processinfo ) ;
wxASSERT( err == noErr ) ;
err = ::GetProcessInformation( &procno , &processinfo ) ;
wxASSERT( err == noErr ) ;
return processinfo.processMode ;
}
return processinfo.processMode ;
}
{
wxString str = wxStripMenuCodes( title ) ;
MenuRef menu ;
{
wxString str = wxStripMenuCodes( title ) ;
MenuRef menu ;
#if TARGET_CARBON
CreateNewMenu( id , 0 , &menu ) ;
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
#if TARGET_CARBON
CreateNewMenu( id , 0 , &menu ) ;
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
wxMacStringToPascal( str , ptitle ) ;
menu = ::NewMenu( id , ptitle ) ;
#endif
wxMacStringToPascal( str , ptitle ) ;
menu = ::NewMenu( id , ptitle ) ;
#endif
-void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding)
+void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding )
{
wxString str = wxStripMenuCodes( title ) ;
{
wxString str = wxStripMenuCodes( title ) ;
#if TARGET_CARBON
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
#if TARGET_CARBON
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
-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 ) ;
{
wxString str = wxStripMenuCodes( title ) ;
#if TARGET_CARBON
SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
#if TARGET_CARBON
SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
UInt32 UMAMenuEvent( EventRecord *inEvent )
{
UInt32 UMAMenuEvent( EventRecord *inEvent )
{
- return MenuEvent( inEvent ) ;
+ return MenuEvent( inEvent ) ;
}
void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
}
void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
{
void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
{
- MacAppendMenu(menu, "\pA");
- UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
+ MacAppendMenu( menu, "\pA" );
+ 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 )
{
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);
+ MacInsertMenuItem( menu, "\pA" , item );
+ UMASetMenuItemText( menu, item+1, title , encoding );
SetMenuItemHierarchicalID( menu , item+1 , id ) ;
}
SetMenuItemHierarchicalID( menu , item+1 , id ) ;
}
SInt16 key = entry->GetKeyCode() ;
if ( key )
{
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 ;
modifiers |= kMenuOptionModifier ;
if (entry->GetFlags() & wxACCEL_SHIFT)
if (entry->GetFlags() & wxACCEL_SHIFT)
modifiers |= kMenuShiftModifier ;
modifiers |= kMenuShiftModifier ;
SInt16 glyph = 0 ;
SInt16 macKey = key ;
if ( key >= WXK_F1 && key <= WXK_F15 )
{
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.
// 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 ;
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 )
glyph += 13 ;
- if ( !explicitCommandKey )
- modifiers |= kMenuNoCommandModifier ;
{
case WXK_BACK :
macKey = kBackspaceCharCode ;
glyph = kMenuDeleteLeftGlyph ;
break ;
{
case WXK_BACK :
macKey = kBackspaceCharCode ;
glyph = kMenuDeleteLeftGlyph ;
break ;
case WXK_TAB :
macKey = kTabCharCode ;
glyph = kMenuTabRightGlyph ;
break ;
case WXK_TAB :
macKey = kTabCharCode ;
glyph = kMenuTabRightGlyph ;
break ;
case kEnterCharCode :
macKey = kEnterCharCode ;
glyph = kMenuEnterGlyph ;
break ;
case kEnterCharCode :
macKey = kEnterCharCode ;
glyph = kMenuEnterGlyph ;
break ;
case WXK_RETURN :
macKey = kReturnCharCode ;
glyph = kMenuReturnGlyph ;
break ;
case WXK_RETURN :
macKey = kReturnCharCode ;
glyph = kMenuReturnGlyph ;
break ;
case WXK_ESCAPE :
macKey = kEscapeCharCode ;
glyph = kMenuEscapeGlyph ;
break ;
case WXK_ESCAPE :
macKey = kEscapeCharCode ;
glyph = kMenuEscapeGlyph ;
break ;
case WXK_SPACE :
macKey = ' ' ;
glyph = kMenuSpaceGlyph ;
break ;
case WXK_SPACE :
macKey = ' ' ;
glyph = kMenuSpaceGlyph ;
break ;
case WXK_DELETE :
macKey = kDeleteCharCode ;
glyph = kMenuDeleteRightGlyph ;
break ;
case WXK_DELETE :
macKey = kDeleteCharCode ;
glyph = kMenuDeleteRightGlyph ;
break ;
case WXK_CLEAR :
macKey = kClearCharCode ;
glyph = kMenuClearGlyph ;
break ;
case WXK_CLEAR :
macKey = kClearCharCode ;
glyph = kMenuClearGlyph ;
break ;
case WXK_PRIOR : // PAGE UP
macKey = kPageUpCharCode ;
glyph = kMenuPageUpGlyph ;
break ;
case WXK_PRIOR : // PAGE UP
macKey = kPageUpCharCode ;
glyph = kMenuPageUpGlyph ;
break ;
case WXK_NEXT :
macKey = kPageDownCharCode ;
glyph = kMenuPageDownGlyph ;
break ;
case WXK_NEXT :
macKey = kPageDownCharCode ;
glyph = kMenuPageDownGlyph ;
break ;
case WXK_LEFT :
macKey = kLeftArrowCharCode ;
glyph = kMenuLeftArrowGlyph ;
break ;
case WXK_LEFT :
macKey = kLeftArrowCharCode ;
glyph = kMenuLeftArrowGlyph ;
break ;
case WXK_UP :
macKey = kUpArrowCharCode ;
glyph = kMenuUpArrowGlyph ;
break ;
case WXK_UP :
macKey = kUpArrowCharCode ;
glyph = kMenuUpArrowGlyph ;
break ;
case WXK_RIGHT :
macKey = kRightArrowCharCode ;
glyph = kMenuRightArrowGlyph ;
break ;
case WXK_RIGHT :
macKey = kRightArrowCharCode ;
glyph = kMenuRightArrowGlyph ;
break ;
case WXK_DOWN :
macKey = kDownArrowCharCode ;
glyph = kMenuDownArrowGlyph ;
break ;
case WXK_DOWN :
macKey = kDownArrowCharCode ;
glyph = kMenuDownArrowGlyph ;
break ;
default :
macKey = toupper( key ) ;
break ;
}
default :
macKey = toupper( key ) ;
break ;
}
// we now allow non command key shortcuts
// remove in case this gives problems
if ( !explicitCommandKey )
// we now allow non command key shortcuts
// remove in case this gives problems
if ( !explicitCommandKey )
if (key != WXK_UP && key != WXK_RIGHT)
SetItemCmd( menu, item , macKey );
if (key != WXK_UP && key != WXK_RIGHT)
SetItemCmd( menu, item , macKey );
- SetMenuItemModifiers(menu, item , modifiers ) ;
+ SetMenuItemModifiers( menu, item , modifiers ) ;
- SetMenuItemKeyGlyph(menu, item , glyph ) ;
+ SetMenuItemKeyGlyph( menu, item , glyph ) ;
}
}
void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
{
MacAppendMenu(menu, "\pA");
}
}
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 );
// 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) ;
}
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 );
// 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 );
OSStatus UMAPrOpen()
{
OSErr err = noErr ;
OSStatus UMAPrOpen()
{
OSErr err = noErr ;
if ( gPrOpenCounter == 1 )
{
PrOpen() ;
err = PrError() ;
wxASSERT( err == noErr ) ;
}
if ( gPrOpenCounter == 1 )
{
PrOpen() ;
err = PrError() ;
wxASSERT( err == noErr ) ;
}
return err ;
}
OSStatus UMAPrClose()
{
OSErr err = noErr ;
return err ;
}
OSStatus UMAPrClose()
{
OSErr err = noErr ;
wxASSERT( gPrOpenCounter >= 1 ) ;
wxASSERT( gPrOpenCounter >= 1 ) ;
if ( gPrOpenCounter == 1 )
{
PrClose() ;
err = PrError() ;
wxASSERT( err == noErr ) ;
}
if ( gPrOpenCounter == 1 )
{
PrClose() ;
err = PrError() ;
wxASSERT( err == noErr ) ;
}
-pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
-pascal QDGlobalsPtr GetQDGlobalsPtr (void)
+pascal QDGlobalsPtr GetQDGlobalsPtr() ;
+pascal QDGlobalsPtr GetQDGlobalsPtr()
{
return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
}
{
return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
}
- CursHandle watchFob = GetCursor (watchCursor);
+ CursHandle watchFob = GetCursor(watchCursor);
+ if (watchFob == NULL)
+ {
// Cursor preservedArrow;
// Cursor preservedArrow;
-// GetQDGlobalsArrow (&preservedArrow);
-// SetQDGlobalsArrow (*watchFob);
-// InitCursor ( );
-// SetQDGlobalsArrow (&preservedArrow);
- SetCursor (*watchFob);
- #else
- SetCursor (*watchFob);
- #endif
+// GetQDGlobalsArrow(&preservedArrow);
+// SetQDGlobalsArrow(*watchFob);
+// InitCursor();
+// SetQDGlobalsArrow(&preservedArrow);
+ SetCursor(*watchFob);
+#else
+ SetCursor(*watchFob);
+#endif
-void UMAShowArrowCursor()
+void UMAShowArrowCursor()
{
#if TARGET_CARBON
Cursor arrow;
{
#if TARGET_CARBON
Cursor arrow;
- SetCursor (GetQDGlobalsArrow (&arrow));
+ SetCursor( GetQDGlobalsArrow(&arrow) );
#else
SetCursor (&(qd.arrow));
#endif
#else
SetCursor (&(qd.arrow));
#endif
-GrafPtr UMAGetWindowPort( WindowRef inWindowRef )
+GrafPtr UMAGetWindowPort( WindowRef inWindowRef )
{
wxASSERT( inWindowRef != NULL ) ;
{
wxASSERT( inWindowRef != NULL ) ;
#if TARGET_CARBON
return (GrafPtr) GetWindowPort( inWindowRef ) ;
#else
#if TARGET_CARBON
return (GrafPtr) GetWindowPort( inWindowRef ) ;
#else
-void UMADisposeWindow( WindowRef inWindowRef )
+void UMADisposeWindow( WindowRef inWindowRef )
{
wxASSERT( inWindowRef != NULL ) ;
{
wxASSERT( inWindowRef != NULL ) ;
DisposeWindow( inWindowRef ) ;
}
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) ) ;
{
#if TARGET_CARBON
SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
-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) ) ;
{
#if TARGET_CARBON
SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
void UMAActivateControl( ControlRef inControl )
{
void UMAActivateControl( ControlRef inControl )
{
+#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 ) )
// 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 ) ;
bool visible = IsControlVisible( inControl ) ;
if ( visible )
SetControlVisibility( inControl , false , false ) ;
::ActivateControl( inControl ) ;
::ActivateControl( inControl ) ;
-#if !TARGET_API_MAC_OSX
- if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
SetControlVisibility( inControl , true , false ) ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
void UMAMoveControl( ControlRef inControl , short x , short y )
{
void UMAMoveControl( ControlRef inControl , short x , short y )
{
+#if TARGET_API_MAC_OSX
+ ::MoveControl( inControl , x , y ) ;
+
+#else
bool visible = IsControlVisible( inControl ) ;
bool visible = IsControlVisible( inControl ) ;
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
::MoveControl( inControl , x , y ) ;
::MoveControl( inControl , x , y ) ;
-#if !TARGET_API_MAC_OSX
- if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
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 )
{
}
#endif
}
void UMASizeControl( ControlRef inControl , short x , short y )
{
+#if TARGET_API_MAC_OSX
+ ::SizeControl( inControl , x , y ) ;
+
+#else
bool visible = IsControlVisible( inControl ) ;
bool visible = IsControlVisible( inControl ) ;
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
::SizeControl( inControl , x , y ) ;
::SizeControl( inControl , x , y ) ;
-#if !TARGET_API_MAC_OSX
- if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
}
#endif
}
void UMADeactivateControl( ControlRef inControl )
{
}
#endif
}
void UMADeactivateControl( ControlRef inControl )
{
+#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 ) ;
// 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 ) ;
::DeactivateControl( inControl ) ;
::DeactivateControl( inControl ) ;
-#if !TARGET_API_MAC_OSX
- if ( visible ) {
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
// shows the control and adds the region to the update region
// 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 ;
{
SetControlVisibility( inControl , true , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
}
// hides the control and adds the region to the update region
}
// 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 ;
{
SetControlVisibility( inControl , false , false ) ;
Rect ctrlBounds ;
- InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+ InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
-OSErr UMASetKeyboardFocus (WindowPtr inWindow,
- ControlRef inControl,
- ControlFocusPart inPart)
+OSErr UMASetKeyboardFocus( WindowPtr inWindow,
+ ControlRef inControl,
+ ControlFocusPart inPart )
{
OSErr err = noErr;
GrafPtr port ;
{
OSErr err = noErr;
GrafPtr port ;
SetPortWindowPort( inWindow ) ;
err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
SetPort( port ) ;
SetPortWindowPort( inWindow ) ;
err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
SetPort( port ) ;
{
// bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
// if ( inActivate != isHighlighted )
{
// bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
// if ( inActivate != isHighlighted )
GrafPtr port ;
GetPort( &port ) ;
SetPortWindowPort( inWindowRef ) ;
HiliteWindow( inWindowRef , inActivate ) ;
ControlRef control = NULL ;
GrafPtr port ;
GetPort( &port ) ;
SetPortWindowPort( inWindowRef ) ;
HiliteWindow( inWindowRef , inActivate ) ;
ControlRef control = NULL ;
- ::GetRootControl( inWindowRef , & control ) ;
+ ::GetRootControl( inWindowRef , &control ) ;
if ( control )
{
if ( inActivate )
if ( control )
{
if ( inActivate )
else
UMADeactivateControl( control ) ;
}
else
UMADeactivateControl( control ) ;
}
#endif
OSStatus UMAGetHelpMenu(
#endif
OSStatus UMAGetHelpMenu(
- MenuRef * outHelpMenu,
- MenuItemIndex * outFirstCustomItemIndex)
+ MenuRef * outHelpMenu,
+ MenuItemIndex * outFirstCustomItemIndex)
{
#if TARGET_CARBON
return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
{
#if TARGET_CARBON
return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
#else
MenuRef helpMenuHandle ;
#else
MenuRef helpMenuHandle ;
helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
if ( outFirstCustomItemIndex )
if ( outFirstCustomItemIndex )
*outFirstCustomItemIndex = firstCustomItemIndex ;
*outFirstCustomItemIndex = firstCustomItemIndex ;
*outHelpMenu = helpMenuHandle ;
*outHelpMenu = helpMenuHandle ;
return helpMenuStatus ;
#endif
}
return helpMenuStatus ;
#endif
}
-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport )
{
m_clip = NULL ;
Setup( newport ) ;
{
m_clip = NULL ;
Setup( newport ) ;
{
GetPort( &m_oldPort ) ;
SetPort( newport ) ;
{
GetPort( &m_oldPort ) ;
SetPort( newport ) ;
wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
m_clip = NewRgn() ;
GetClip( m_clip );
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 ;
}
GetThemeDrawingState( &m_drawingState ) ;
m_currentPort = newport ;
}
void wxMacPortStateHelper::Clear()
{
if ( m_clip )
void wxMacPortStateHelper::Clear()
{
if ( m_clip )
OSStatus UMAPutScrap( Size size , OSType type , void *data )
{
OSStatus err = noErr ;
OSStatus UMAPutScrap( Size size , OSType type , void *data )
{
OSStatus err = noErr ;
#if !TARGET_CARBON
err = PutScrap( size , type , data ) ;
#else
ScrapRef scrap;
#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 );
-Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
+Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
{
GetControlBounds( theControl , bounds ) ;
{
GetControlBounds( theControl , bounds ) ;
#if TARGET_API_MAC_OSX
WindowRef tlwref = GetControlOwner( theControl ) ;
#if TARGET_API_MAC_OSX
WindowRef tlwref = GetControlOwner( theControl ) ;
if ( tlwwx != NULL && tlwwx->MacUsesCompositing() )
{
ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
if ( tlwwx != NULL && tlwwx->MacUsesCompositing() )
{
ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
- HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
- HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;
+ HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
+ HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;
OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
}
#endif
OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
}
#endif
#endif // wxUSE_GUI
#if wxUSE_BASE
#endif // wxUSE_GUI
#if wxUSE_BASE
sUMASystemInitialized = val;
}
sUMASystemInitialized = val;
}
projects / wxWidgets.git / commitdiff
