X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7205570233ce8420b71fa5df368054c8953ff0e4..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/uma.h?ds=sidebyside

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index faf1206158..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 <Carbon/Carbon.h>
-    #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() ;
@@ -29,6 +20,8 @@ bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
+bool UMAHasAquaLayout() ;
+bool UMASystemIsInitialized() ;
 
 // process manager
 
@@ -61,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
 
@@ -116,7 +104,7 @@ ControlHandle ::NewControl(WindowPtr 				owningWindow,
 //void UMAHiliteControl	(ControlHandle 			theControl,
 //								 ControlPartCode 		hiliteState)	;
 void UMAShowControl						(ControlHandle 			theControl)	;
-//void UMAHideControl						(ControlHandle 			theControl);
+void UMAHideControl						(ControlHandle 			theControl);
 //void UMASetControlVisibility			(ControlHandle 			inControl,
 //								 Boolean 				inIsVisible,
 //								 Boolean 				inDoDraw);
@@ -217,7 +205,19 @@ WindowRef UMAGetActiveNonFloatingWindow() ;
 */
 void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 
+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 )
@@ -228,18 +228,30 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 #define	GetPortVisibleRegion( p, r ) CopyRgn( p->visRgn , r )
 #define GetQDGlobalsWhite( a ) (&((*a) = qd.white))
 #define GetQDGlobalsBlack( a ) (&((*a) = qd.black))
-#define GetQDGlobalsScreenBits( a ) (*a) = qd.screenBits
+#define GetQDGlobalsScreenBits( a ) ((*a) = qd.screenBits)
 #define GetQDGlobalsArrow( a ) (&((*a) = qd.arrow))
 #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	GetControlOwner( control ) ((**control).contrlOwner)
+
+#define GetPortPenMode( p ) (p->pnMode)
+#define SetPortPenMode( p , mode ) (p->pnMode = mode )
+// control manager
+
+#define GetControlReference( control ) ((**control).contrlRfCon)
+
+// list manager
+
+#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