X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78c0e83b30a4fc4063f57835d38b20776fad5eb2..7b108a5e8cae8552840b532e364536e2dbe47dc7:/include/wx/mac/uma.h diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h index 11e9cb7c5d..c9172b6c8a 100644 --- a/include/wx/mac/uma.h +++ b/include/wx/mac/uma.h @@ -12,16 +12,7 @@ #ifndef H_UMA #define H_UMA -#if defined(__POWERPC__) - #if defined(__DARWIN__) - #include - #endif -#endif - -#if !TARGET_CARBON -// this is now defined in the latest headers -// typedef short MenuItemIndex ; -#endif +#include "wx/mac/private.h" void UMAInitToolbox( UInt16 inMoreMastersCalls) ; void UMACleanupToolbox() ; @@ -30,6 +21,7 @@ long UMAGetAppearanceVersion() ; bool UMAHasWindowManager() ; long UMAGetWindowManagerAttr() ; bool UMAHasAquaLayout() ; +bool UMASystemIsInitialized() ; // process manager @@ -62,13 +54,8 @@ void UMAInsertMenuItem( MenuRef menu , StringPtr label , MenuItemIndex item , void UMAShowWatchCursor() ; void UMAShowArrowCursor() ; -#if TARGET_CARBON && PM_USE_SESSION_APIS -OSStatus UMAPrOpen(PMPrintSession *macPrintSession) ; -OSStatus UMAPrClose(PMPrintSession *macPrintSession) ; -#else -OSStatus UMAPrOpen() ; -OSStatus UMAPrClose() ; -#endif +OSStatus UMAPrOpen(void *macPrintSession) ; +OSStatus UMAPrClose(void *macPrintSession) ; // window manager @@ -222,7 +209,15 @@ OSStatus UMAGetHelpMenu( MenuRef * outHelpMenu, MenuItemIndex * outFirstCustomItemIndex); /* can be NULL */ +// Appearance Drawing + +OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ; + +// accessor helpers + #if !TARGET_CARBON +#define ClearCurrentScrap() ZeroScrap() ; +/* #define GetPortTextFont( p) ((p)->txFont ) #define GetPortTextSize( p) ((p)->txSize ) #define GetPortTextFace( p) ((p)->txFace ) @@ -238,10 +233,9 @@ OSStatus UMAGetHelpMenu( #define GetControlBounds( c , b ) &((*b) = (**c).contrlRect ) #define GetPortBitMapForCopyBits( p ) ((BitMap*) &(((CGrafPtr)p)->portPixMap )) #define GetControlOwner( control ) ((**control).contrlOwner) -#define InvalWindowRgn( window , rgn ) InvalRgn( rgn ) + #define GetPortPenMode( p ) (p->pnMode) #define SetPortPenMode( p , mode ) (p->pnMode = mode ) -#define ClearCurrentScrap() ZeroScrap() ; // control manager #define GetControlReference( control ) ((**control).contrlRfCon) @@ -250,13 +244,14 @@ OSStatus UMAGetHelpMenu( #define SetListSelectionFlags( list , options ) (**list).selFlags = options #define GetListRefCon( list ) (**list).refCon +*/ +#define GetApplicationScript() smSystemScript +#else + +// calls not in carbon + #endif -#if TARGET_CARBON #define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) -#endif -// Appearance Drawing - -OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ; #endif