Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / include / wx / mac / uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 344c1552e5a4f98f64454c0d93bc5dcbb327333e..e688d09aff5ce14c1d29b46d54c6b12141d8924a 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -12,16 +12,7 @@
 #ifndef H_UMA
 #define H_UMA
 
 #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() ;
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
 void UMACleanupToolbox() ;


@@ -29,6 +20,8 @@ bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
 long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;

+bool UMAHasAquaLayout() ;
+bool UMASystemIsInitialized() ;

 
 // process manager
 
 
 // process manager
 


@@ -61,13 +54,8 @@ void                 UMAInsertMenuItem( MenuRef menu , StringPtr label , MenuItemIndex item ,
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 
 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
 
 
 // window manager
 


@@ -221,7 +209,15 @@ OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
   MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
 
   MenuRef *        outHelpMenu,
   MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
 

+// Appearance Drawing
+
+OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
+
+// accessor helpers
+

 #if !TARGET_CARBON
 #if !TARGET_CARBON

+#define ClearCurrentScrap() ZeroScrap() ;
+/*

 #define GetPortTextFont( p) ((p)->txFont )
 #define GetPortTextSize( p) ((p)->txSize )
 #define GetPortTextFace( p) ((p)->txFace )
 #define GetPortTextFont( p) ((p)->txFont )
 #define GetPortTextSize( p) ((p)->txSize )
 #define GetPortTextFace( p) ((p)->txFace )


@@ -237,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 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 GetPortPenMode( p ) (p->pnMode)
 #define SetPortPenMode( p , mode ) (p->pnMode = mode )

-#define ClearCurrentScrap() ZeroScrap() ;

 // control manager
 
 #define GetControlReference( control ) ((**control).contrlRfCon)
 // control manager
 
 #define GetControlReference( control ) ((**control).contrlRfCon)


@@ -249,13 +244,13 @@ OSStatus UMAGetHelpMenu(
 
 #define SetListSelectionFlags( list , options ) (**list).selFlags = options
 #define GetListRefCon( list ) (**list).refCon
 
 #define SetListSelectionFlags( list , options ) (**list).selFlags = options
 #define GetListRefCon( list ) (**list).refCon

+*/
+#else
+
+// calls not in carbon
+

 
 #endif
 
 #endif

-#if TARGET_CARBON

 #define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) 
 #define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) 

-#endif
-// Appearance Drawing
-
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;

 
 #endif
 
 #endif