X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b89dac7816168bc86d4862edb394e681c161a3e3..8baeca5b24bf0efbb81f8366c966cdbc3fc4f7f5:/src/mac/carbon/uma.cpp?ds=sidebyside

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 78f6706ac3..1c6afd4eb6 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,38 +1,57 @@
 #include "wx/defs.h"
+#include "wx/dc.h"
 #include "wx/mac/uma.h"
-#include "wx/mac/aga.h"
-
-#ifdef __UNIX__
-  #include <NavigationServices/Navigation.h>
-#else
-  #include <Navigation.h>
-#endif
-
-// init
+#include <MacTextEditor.h>
+
+#ifndef __DARWIN__
+#  include <Navigation.h>
+#  if defined(TARGET_CARBON)
+#    if PM_USE_SESSION_APIS
+#      include <PMCore.h>
+#    endif
+#    include <PMApplication.h>
+#  else
+#    include <Printing.h>
+#  endif
+#endif
+
+// since we have decided that we only support 8.6 upwards we are
+// checking for these minimum requirements in the startup code of
+// the application so all wxWindows code can safely assume that appearance 1.1
+// 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 sUMASystemInitialized = false ;
+
 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 ; }
+bool UMASystemIsInitialized() { return sUMASystemInitialized ; }
+
 void UMACleanupToolbox()
 {
-#if UMA_USE_APPEARANCE
 	if ( sUMAHasAppearance )
 	{
 		UnregisterAppearanceClient() ;
 	}
-#endif
 	if ( NavServicesAvailable() )
 	{
 		NavUnload() ;
 	}
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+	  TXNTerminateTextension( ) ;
 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
@@ -54,7 +73,9 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 	InitCursor();
 #endif
 
-#if UMA_USE_APPEARANCE
+    if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
+    	sUMASystemVersion = 0x0000 ;
+    	
 	long theAppearance ;
 	if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
 	{
@@ -69,17 +90,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 			sUMAAppearanceVersion = 0x0100 ;
 		}
 	}
-#endif // UMA_USE_APPEARANCE
-#if UMA_USE_8_6
-#if UMA_USE_WINDOWMGR
 	if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
 	{
 		sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
 	}
-#endif // UMA_USE_WINDOWMGR
-#endif
 		
-#ifndef __UNIX__
 #if TARGET_CARBON
 // Call currently implicitely done :		InitFloatingWindows() ;
 #else
@@ -87,15 +102,59 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		InitFloatingWindows() ;
 	else
 		InitWindows();
-#endif
 #endif
 
 	if ( NavServicesAvailable() )
 	{
 		NavLoad() ;
 	}
+
+  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) ;
+#if 0 // TARGET_CARBON  
+    --noOfFontDescriptions ;
+#endif
+  	// kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
+  	OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if TARGET_CARBON
+    if ( !UMAHasAquaLayout() )
+#endif
+    {
+        options |= kTXNAlwaysUseQuickDrawTextMask ;
+    }
+  	TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+  }
+
+
+  sUMASystemInitialized = true ;
+
 }
 
+/*
+Boolean CanUseATSUI()
+	{
+	long result;
+	OSErr err = Gestalt(gestaltATSUVersion, &result);
+	return (err == noErr);
+	}
+*/
 // process manager
 long UMAGetProcessMode() 
 {
@@ -123,6 +182,7 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch()
 
 void UMASetMenuTitle( MenuRef menu , StringPtr title )
 {
+/*
 #if !TARGET_CARBON
 	long 			size = GetHandleSize( (Handle) menu ) ;
 	const long 		headersize = 14 ;
@@ -145,146 +205,196 @@ void UMASetMenuTitle( MenuRef menu , StringPtr title )
 		SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
 	}
 #else
+*/
 	SetMenuTitle( menu , title ) ;
-#endif
+//#endif
 }
 
 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
 		return MenuEvent( inEvent ) ;
-	}
-	else
-#endif
-	{
-			if ( inEvent->what == keyDown && inEvent->modifiers & cmdKey)
-			{
-				return MenuKey( inEvent->message & charCodeMask ) ;
-			}
-		return NULL ;
-	}
 }
 
 void 			UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
 {
-#if UMA_USE_8_6 || TARGET_CARBON
 	EnableMenuItem( inMenu , inItem ) ;
-#else
-	EnableItem( inMenu , inItem ) ;
-#endif
 }
 
 void 			UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
 {
-#if UMA_USE_8_6 || TARGET_CARBON
 	DisableMenuItem( inMenu , inItem ) ;
-#else
-	DisableItem( inMenu , inItem ) ;
-#endif
 }
 
 void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id ) 
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	// hardcoded adding of the submenu combination for mac
-
-	int theEnd = label[0] + 1; 
-	if (theEnd > 251) 
-		theEnd = 251; // mac allows only 255 characters
-	label[theEnd++] = '/';
-	label[theEnd++] = hMenuCmd; 
-	label[theEnd++] = '!';
-	label[theEnd++] = id ; 
-	label[theEnd] = 0x00;
-	label[0] = theEnd;
-	MacAppendMenu(menu, label);
+	MacAppendMenu(menu, l);
+	SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
 void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id  ) 
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	// hardcoded adding of the submenu combination for mac
-
-	int theEnd = label[0] + 1; 
-	if (theEnd > 251) 
-		theEnd = 251; // mac allows only 255 characters
-	label[theEnd++] = '/';
-	label[theEnd++] = hMenuCmd; 
-	label[theEnd++] = '!';
-	label[theEnd++] = id; 
-	label[theEnd] = 0x00;
-	label[0] = theEnd;
-	MacInsertMenuItem(menu, label , item);
+	MacInsertMenuItem(menu, l , item);
+	SetMenuItemHierarchicalID( menu , item , id ) ;
 }
 
-void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , SInt16 key , UInt8 modifiers )
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
 	if ( key )
 	{
-			int pos = label[0] ;
-			label[++pos] = '/';
-			label[++pos] = toupper( key );
-			label[0] = pos ;
+	    SInt16 glyph = 0 ;
+	    SInt16 macKey = key ;
+	    if ( key >= WXK_F1 && key <= WXK_F15 )
+	    {
+	        macKey = kFunctionKeyCharCode ;
+	        glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
+	        if ( key >= WXK_F13 )
+	            glyph += 13 ;
+	        switch( key )
+	        {
+	            case WXK_F1 :
+	                macKey += ( 0x7a << 8 ) ;
+	                break ;
+	            case WXK_F2 :
+	                macKey += ( 0x78 << 8 ) ;
+	                break ;
+	            case WXK_F3 :
+	                macKey += ( 0x63 << 8 ) ;
+	                break ;
+	            case WXK_F4 :
+	                macKey += ( 0x76 << 8 ) ;
+	                break ;
+	            case WXK_F5 :
+	                macKey += ( 0x60 << 8 ) ;
+	                break ;
+	            case WXK_F6 :
+	                macKey += ( 0x61 << 8 ) ;
+	                break ;
+	            case WXK_F7 :
+	                macKey += ( 0x62 << 8 ) ;
+	                break ;
+	            case WXK_F8 :
+	                macKey += ( 0x64 << 8 ) ;
+	                break ;
+	            case WXK_F9 :
+	                macKey += ( 0x65 << 8 ) ;
+	                break ;
+	            case WXK_F10 :
+	                macKey += ( 0x6D << 8 ) ;
+	                break ;
+	            case WXK_F11 :
+	                macKey += ( 0x67 << 8 ) ;
+	                break ;
+	            case WXK_F12 :
+	                macKey += ( 0x6F << 8 ) ;
+	                break ;
+	            case WXK_F13 :
+	                macKey += ( 0x69 << 8 ) ;
+	                break ;
+	            case WXK_F14 :
+	                macKey += ( 0x6B << 8 ) ;
+	                break ;
+	            case WXK_F15 :
+	                macKey += ( 0x71 << 8 ) ;
+	                break ;
+	            default :
+	                break ;
+	        } ;
+	        // unfortunately this does not yet trigger the right key ,
+	        // for some reason mac justs picks the first function key menu
+	        // defined, so we turn this off
+	        macKey = 0 ;
+	        glyph = 0 ;
+  	    }
+	    else
+    	{
+    	    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
+    	            macKey = kPageUpCharCode ;
+    	            glyph = kMenuPageUpGlyph ;
+    	            break ;
+    	        case WXK_NEXT :
+    	            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 ;
+            }
+        }
+	    
+	    SetItemCmd( menu, item , macKey );
+	    SetMenuItemModifiers(menu, item , modifiers ) ;
+
+        if ( glyph )
+            SetMenuItemKeyGlyph(menu, item , glyph ) ;
 	}
-	MacAppendMenu( menu , label ) ;
 }
 
-void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) 
-{
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	if ( key )
-	{
-			int pos = label[0] ;
-			label[++pos] = '/';
-			label[++pos] = toupper( key );
-			label[0] = pos ;
-	}
-	MacInsertMenuItem( menu , label , item) ;
-}
-
-void UMADrawMenuBar() 
-{
-	DrawMenuBar() ;
-}
-
-
-void UMASetMenuItemText( MenuRef menu , MenuItemIndex item , StringPtr label ) 
-{
-	::SetMenuItemText( menu , item , label ) ;
-}
-
-MenuRef	UMANewMenu( SInt16 menuid , StringPtr label ) 
-{
-	return ::NewMenu(menuid, label);
-}
-
-void UMADisposeMenu( MenuRef menu )
-{
-	DisposeMenu( menu ) ;
-}
-void UMADeleteMenu( SInt16 menuId ) 
+void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
 {
-	::DeleteMenu( menuId ) ;
+	MacAppendMenu(menu, "\pA");
+	SetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), l);
+	UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), key , modifiers ) ;
 }
 
-void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId ) 
+void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) 
 {
-	::InsertMenu( insertMenu , afterId ) ;
+	MacInsertMenuItem( menu , "\p" , item) ;
+	SetMenuItemText(menu, item , l);
+	UMASetMenuItemShortcut( menu , item , key , modifiers ) ;
 }
 
-
 // quickdraw
 
 int gPrOpenCounter = 0 ;
 
-OSStatus UMAPrOpen() 
+OSStatus UMAPrOpen(void *macPrintSession)
 {
 #if !TARGET_CARBON
 	OSErr err = noErr ;
@@ -301,14 +411,18 @@ OSStatus UMAPrOpen()
 	++gPrOpenCounter ;
 	if ( gPrOpenCounter == 1 )
 	{
-		err = PMBegin() ;
+  #if PM_USE_SESSION_APIS
+	    err = PMCreateSession((PMPrintSession *)macPrintSession) ;
+  #else
+	    err = PMBegin() ;
+  #endif
 		wxASSERT( err == noErr ) ;
 	}
 	return err ;
 #endif
 }
 
-OSStatus UMAPrClose() 
+OSStatus UMAPrClose(void *macPrintSession)
 {
 #if !TARGET_CARBON
 	OSErr err = noErr ;
@@ -326,7 +440,12 @@ OSStatus UMAPrClose()
 	wxASSERT( gPrOpenCounter >= 1 ) ;
 	if ( gPrOpenCounter == 1 )
 	{
-		err = PMEnd() ;
+  #if PM_USE_SESSION_APIS
+	    err = PMRelease(*(PMPrintSession *)macPrintSession) ;
+	    *(PMPrintSession *)macPrintSession = kPMNoReference;
+  #else
+	    err = PMEnd() ;
+  #endif
 	}
 	--gPrOpenCounter ;
 	return err ;
@@ -335,6 +454,7 @@ OSStatus UMAPrClose()
 
 #if !TARGET_CARBON
 
+pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
 	return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
@@ -353,11 +473,12 @@ void UMAShowWatchCursor()
 	else
 	{
 	#if TARGET_CARBON
-		Cursor preservedArrow;
-		GetQDGlobalsArrow (&preservedArrow);
-		SetQDGlobalsArrow (*watchFob);
-		InitCursor ( );
-		SetQDGlobalsArrow (&preservedArrow);
+//		Cursor preservedArrow;
+//		GetQDGlobalsArrow (&preservedArrow);
+//		SetQDGlobalsArrow (*watchFob);
+//		InitCursor ( );
+//		SetQDGlobalsArrow (&preservedArrow);
+		SetCursor (*watchFob);	
 	#else
 		SetCursor (*watchFob);	
 	#endif
@@ -380,7 +501,7 @@ GrafPtr		UMAGetWindowPort( WindowRef inWindowRef )
 {
 	wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
-	return GetWindowPort( inWindowRef ) ; 
+	return (GrafPtr) GetWindowPort( inWindowRef ) ; 
 #else
 	return (GrafPtr) inWindowRef ;
 #endif
@@ -415,397 +536,100 @@ void 			UMAGetWTitleC( WindowRef inWindowRef , char *title )
 #endif
 }
 
-void			UMAShowWindow( WindowRef inWindowRef ) 
-{
-	ShowWindow( inWindowRef ) ;
-}
-
-void			UMAHideWindow( WindowRef inWindowRef ) 
-{
-	HideWindow( inWindowRef) ;
-}
-
-void 			UMASelectWindow( WindowRef inWindowRef ) 
-{
-	SelectWindow( inWindowRef ) ;
-}
-
-void			UMABringToFront( WindowRef inWindowRef ) 
-{
-	BringToFront( inWindowRef ) ;
-}
-
-void			UMASendBehind( WindowRef inWindowRef , WindowRef behindWindow ) 
-{
-	SendBehind( inWindowRef , behindWindow ) ;
-}
-
-void			UMACloseWindow(WindowRef inWindowRef) 
-{
-#if TARGET_CARBON
-#else
-	CloseWindow( inWindowRef ) ;
-#endif
-}
-
 // appearance additions
 
 void UMAActivateControl( ControlHandle inControl ) 
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	::ActivateControl( inControl ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	AGAActivateControl( inControl ) ;
-   }
-#else
-	{
-	}
-#endif
+    // 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 ) ;
+        ::ActivateControl( inControl ) ;
+        if ( visible ) {
+          SetControlVisibility( inControl , true , false ) ;
+          Rect ctrlBounds ;
+          InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        }
+  }
 }
 
 void UMADrawControl( ControlHandle inControl ) 
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	::DrawControlInCurrentPort( inControl ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	AGADrawControl( inControl ) ;
-   }
-#else
-	{
-	}
-#endif
+    WindowRef theWindow = GetControlOwner(inControl) ;
+    RgnHandle updateRgn = NewRgn() ;
+    GetWindowUpdateRgn( theWindow , updateRgn ) ;
+	  Point zero = { 0 , 0 } ;
+	  LocalToGlobal( &zero ) ;
+	  OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
+    ::DrawControlInCurrentPort( inControl ) ;
+    InvalWindowRgn( theWindow, updateRgn) ;
+	  DisposeRgn( updateRgn ) ;
 }
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) 
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-	  	::MoveControl( inControl , x , y ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	AGAMoveControl( inControl , x ,y  ) ;
-   }
-#else
-	{
-	}
-#endif
+  bool visible = IsControlVisible( inControl ) ;
+  if ( visible ) {
+    SetControlVisibility( inControl , false , false ) ;
+    Rect ctrlBounds ;
+    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+  }
+  ::MoveControl( inControl , x , y ) ;
+  if ( visible ) {
+    SetControlVisibility( inControl , true , false ) ;
+    Rect ctrlBounds ;
+    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+  }
 }
 
 void UMASizeControl( ControlHandle inControl , short x , short y ) 
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-	  	::SizeControl( inControl , x , y ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	AGASizeControl( inControl , x ,y  ) ;
-   }
-#else
-	{
-	}
-#endif
-}
-
-void UMADeactivateControl( ControlHandle inControl ) 
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	::DeactivateControl( inControl ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	 AGADeactivateControl( inControl ) ;
-   }
-#else
-	{
-	}
-#endif
-}
-
-void			UMASetThemeWindowBackground		(WindowRef 				inWindow,
-								 ThemeBrush 			inBrush,
-								 Boolean 				inUpdate)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	::SetThemeWindowBackground( inWindow ,inBrush , inUpdate ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	AGASetThemeWindowBackground( inWindow , inBrush , inUpdate ) ;
-   }
-#else
-	{
-	}
-#endif
-}
-
-void			UMAApplyThemeBackground			(ThemeBackgroundKind 	inKind,
-								 const Rect *			bounds,
-								 ThemeDrawState 		inState,
-								 SInt16 				inDepth,
-								 Boolean 				inColorDev)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-	/*
-		if ( sUMAAppearanceVersion >= 0x0110 )
-   			::ApplyThemeBackground( inKind ,bounds , inState , inDepth , inColorDev ) ;
-   */
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	AGAApplyThemeBackground( inKind ,bounds , inState , inDepth , inColorDev ) ;
-   }
-#else
-	{
-	}
-#endif
-}
-
-ControlHandle UMANewControl(WindowPtr 				owningWindow,
-								 const Rect *			boundsRect,
-								 ConstStr255Param 		controlTitle,
-								 Boolean 				initiallyVisible,
-								 SInt16 				initialValue,
-								 SInt16 				minimumValue,
-								 SInt16 				maximumValue,
-								 SInt16 				procID,
-								 SInt32 				controlReference)
-{
-	ControlHandle theControl = NULL ;
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   theControl =  NewControl( owningWindow , boundsRect , controlTitle , initiallyVisible ,
-   		initialValue , minimumValue , maximumValue , procID , controlReference ) ;
-	}
-	else
-#endif
-#if !TARGET_CARBON
-	{
-		theControl = AGANewControl( owningWindow , boundsRect , controlTitle , initiallyVisible ,
-   		initialValue , minimumValue , maximumValue , procID , controlReference ) ;
-	}
-#else
-	{
-	}
-#endif
-	return theControl ;
-}
-
-void UMADisposeControl (ControlHandle 			theControl)
-{
-	if ( UMAHasAppearance() )
-	{
-   	::DisposeControl( theControl ) ;
-   }
-   else
-   {
-   	::DisposeControl( theControl ) ;
-   }
-}
-
-
-void UMAHiliteControl	(ControlHandle 			theControl,
-								 ControlPartCode 		hiliteState)
-								 {
-	if ( UMAHasAppearance() )
-	{
-   	::HiliteControl( theControl , hiliteState ) ;
-   }
-   else
-   {
-   	::HiliteControl( theControl , hiliteState ) ;
-	}
-}
-
-
-void UMAShowControl						(ControlHandle 			theControl)
-{
-	if ( UMAHasAppearance() )
-	{
-   	::ShowControl( theControl ) ;
-   }
-   else
-   {
-   	::ShowControl( theControl ) ;
-   }
-}
-
-
-void UMAHideControl						(ControlHandle 			theControl)
-{
-	if ( UMAHasAppearance() )
-	{
-   	::HideControl( theControl ) ;
-   }
-   else
-   {
-   	::HideControl( theControl ) ;
-   }
-}
-
-
-void UMASetControlVisibility			(ControlHandle 			inControl,
-								 Boolean 				inIsVisible,
-								 Boolean 				inDoDraw)
-								 {
-	if ( UMAHasAppearance() )
-	{
-#if UMA_USE_APPEARANCE
-   	::SetControlVisibility( inControl , inIsVisible, inDoDraw ) ;
-#endif
-   }
-}
-
-
-
-bool UMAIsControlActive					(ControlHandle 			inControl)
-{
-#if TARGET_CARBON
-   	return IsControlActive( inControl ) ;
-#else
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return IsControlActive( inControl ) ;
-   }
-  else
-#endif
-  	return (**inControl).contrlHilite == 0 ;
-#endif
-}
-
-
-bool UMAIsControlVisible				(ControlHandle 			inControl)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return IsControlVisible( inControl ) ;
-   }
-#endif
-  	return true ;
-}
-
-OSErr UMAGetBestControlRect				(ControlHandle 			inControl,
-								 Rect *					outRect,
-								 SInt16 *				outBaseLineOffset)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return GetBestControlRect( inControl , outRect , outBaseLineOffset ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-  {
-  	return AGAGetBestControlRect( inControl , outRect , outBaseLineOffset ) ;
+  bool visible = IsControlVisible( inControl ) ;
+  if ( visible ) {
+    SetControlVisibility( inControl , false , false ) ;
+    Rect ctrlBounds ;
+    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+  } 
+  ::SizeControl( inControl , x , y ) ;
+  if ( visible ) {
+    SetControlVisibility( inControl , true , false ) ;
+    Rect ctrlBounds ;
+    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
   }
-#else
-	{
-		return noErr ;
-	}
-#endif
 }
 
-
-OSErr UMASetControlFontStyle				(ControlHandle 			inControl,
-								 const ControlFontStyleRec * inStyle)	
+void UMADeactivateControl( ControlHandle inControl ) 
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-		return ::SetControlFontStyle( inControl , inStyle ) ;
-	}
-	else
-#endif
-#if !TARGET_CARBON
-		return AGASetControlFontStyle( inControl , inStyle ) ;
-#else
-	{
-		return noErr ;
-	}
-#endif
+    // 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 ) ;
+     if ( visible ) {
+       SetControlVisibility( inControl , true , false ) ;
+       Rect ctrlBounds ;
+       InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+     }
 }
-
-
-
-// control hierarchy
-
-OSErr UMACreateRootControl				(WindowPtr 				inWindow,
-								 ControlHandle *		outControl)
+// shows the control and adds the region to the update region
+void UMAShowControl						(ControlHandle 			inControl)
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return CreateRootControl( inWindow , outControl  ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-  	return AGACreateRootControl( inWindow , outControl ) ;
-#else
-	{
-		return noErr ;
-	}
-#endif
+        SetControlVisibility( inControl , true , false ) ;
+        Rect ctrlBounds ;
+        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
 }
 
-
-
-OSErr UMAEmbedControl					(ControlHandle 			inControl,
-								 ControlHandle 			inContainer)
+// shows the control and adds the region to the update region
+void UMAHideControl						(ControlHandle 			inControl)
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return EmbedControl( inControl , inContainer ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-  	return AGAEmbedControl( inControl , inContainer ) ; ;
-#else
-	{
-		return noErr ;
-	}
-#endif
+        SetControlVisibility( inControl , false , false ) ;
+        Rect ctrlBounds ;
+        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
 }
-
-
-
 // keyboard focus
 OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
 								 ControlHandle 			inControl,
@@ -814,27 +638,11 @@ OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
 	OSErr err = noErr;
 	GrafPtr port ;
 	GetPort( &port ) ;
-#if TARGET_CARBON
-	SetPort( GetWindowPort( inWindow ) ) ;
-#else
-	SetPort( inWindow ) ;
-#endif
-	SetOrigin( 0 , 0 ) ;
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-  	err = AGASetKeyboardFocus( inWindow , inControl , inPart ) ;
-#else
-	{
-	}
-#endif
+
+	SetPortWindowPort( inWindow ) ;
+
+  err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
 	SetPort( port ) ;
-	wxDC::MacInvalidateSetup() ;
 	return err ;
 }
 
@@ -842,550 +650,141 @@ OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
 
 
 // events
-
-ControlPartCode UMAHandleControlClick				(ControlHandle 			inControl,
-								 Point 					inWhere,
-								 SInt16 				inModifiers,
-								 ControlActionUPP 		inAction)		 
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return HandleControlClick( inControl , inWhere , inModifiers , inAction ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	return AGAHandleControlClick( inControl , inWhere , inModifiers , inAction ) ;
-   }
-#else
-	{
-		return noErr ;
-	}
-#endif
-}
-
-
-SInt16 UMAHandleControlKey				(ControlHandle 			inControl,
-								 SInt16 				inKeyCode,
-								 SInt16 				inCharCode,
-								 SInt16 				inModifiers)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	return HandleControlKey( inControl , inKeyCode , inCharCode , inModifiers ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   	return AGAHandleControlKey(inControl , inKeyCode , inCharCode , inModifiers ) ;
-   }
-#else
-	{
-		return noErr ;
-	}
-#endif
-}
-
-
-								 
-void UMAIdleControls					(WindowPtr 				inWindow)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   		IdleControls( inWindow ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-   		AGAIdleControls( inWindow ) ;
-   }
-#else
-	{
-	}
-#endif
-}
-
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
 {
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-		UpdateControls( inWindow , inRgn ) ;
-	}
-	else
-#endif
-#if !TARGET_CARBON
-	{
-		AGAUpdateControls( inWindow , inRgn ) ;
-	}
-#else
-	{
-	}
-#endif
-}
-
-OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) 
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-		return GetRootControl( inWindow , outControl ) ;
-	}
-	else
-#endif
-#if !TARGET_CARBON
-	{
-		return AGAGetRootControl( inWindow , outControl ) ;
-	}
-#else
-	{
-		return noErr ;
-	}
-#endif
-}
-
-
-// handling control data
-
-OSErr UMASetControlData					(ControlHandle 			inControl,
-								 ControlPartCode 		inPart,
-								 ResType 				inTagName,
-								 Size 					inSize,
-								 Ptr 					inData)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-   	 return SetControlData( inControl , inPart , inTagName , inSize , inData ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-		return AGASetControlData( inControl , inPart , inTagName , inSize , inData ) ;
-#else
-	{
-		return noErr ;
-	}
-#endif
-}
-
-
-
-OSErr UMAGetControlData					(ControlHandle 			inControl,
-								 ControlPartCode 		inPart,
-								 ResType 				inTagName,
-								 Size 					inBufferSize,
-								 Ptr 					outBuffer,
-								 Size *					outActualSize)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-		return ::GetControlData( inControl , inPart , inTagName , inBufferSize , outBuffer , outActualSize ) ;
-	}
-	else
-#endif
-#if !TARGET_CARBON
-	{
-		return AGAGetControlData( inControl , inPart , inTagName , inBufferSize , outBuffer , outActualSize ) ;
-	}
-#else
-	{
-		return noErr ;
-	}
-#endif
-}
-
-
-OSErr UMAGetControlDataSize				(ControlHandle 			inControl,
-								 ControlPartCode 		inPart,
-								 ResType 				inTagName,
-								 Size *					outMaxSize)
-{
-#if UMA_USE_APPEARANCE
-	if ( UMAHasAppearance() )
-	{
-		return GetControlDataSize( inControl , inPart , inTagName , outMaxSize ) ;
-	}
-	else
-#endif
-#if !TARGET_CARBON
-	{
-		return AGAGetControlDataSize( inControl , inPart , inTagName , outMaxSize ) ;
-	}
-#else
-	{
-		return noErr ;
-	}
-#endif
-}
-
-
-
-
-
-// system 8.0 changes
-
-short UMAFindWindow( Point inPoint , WindowRef *outWindow )
-{
-	// todo add the additional area codes
-	return FindWindow( inPoint , outWindow ) ;
-}
+  RgnHandle updateRgn = NewRgn() ;
+  GetWindowUpdateRgn( inWindow , updateRgn ) ;
 
-OSStatus UMAGetWindowFeatures( WindowRef inWindowRef , UInt32 *outFeatures )
-{
-#if UMA_USE_WINDOWMGR
-	return GetWindowFeatures( inWindowRef , outFeatures ) ;
-#else
-	return 0 ;
-#endif
-}
+	Point zero = { 0 , 0 } ;
+	LocalToGlobal( &zero ) ;
+	OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
 
-OSStatus UMAGetWindowRegion( WindowRef inWindowRef , WindowRegionCode inRegionCode , RgnHandle ioWinRgn )
-{
-#if UMA_USE_WINDOWMGR
-	return GetWindowRegion( inWindowRef , inRegionCode , ioWinRgn ) ;
-#else
-	return 0 ;
-#endif
-}
+  UpdateControls( inWindow , inRgn ) ;
+  InvalWindowRgn( inWindow, updateRgn) ;
+	DisposeRgn( updateRgn ) ;
 
-void UMADrawGrowIcon( WindowRef inWindowRef )
-{
-	DrawGrowIcon( inWindowRef ) ;
 }
 
-OSStatus UMACollapseWindow( WindowRef inWindowRef , Boolean inCollapseIt )
-{
-	return CollapseWindow( inWindowRef , inCollapseIt ) ;
-}
-
-OSStatus UMACollapseAllWindows( Boolean inCollapseEm )
+bool UMAIsWindowFloating( WindowRef inWindow ) 
 {
-	return CollapseAllWindows( inCollapseEm ) ;
+	WindowClass cl ;
+	
+	GetWindowClass( inWindow , &cl ) ;
+	return cl == kFloatingWindowClass ;
 }
 
-Boolean UMAIsWindowCollapsed( WindowRef inWindowRef )
+bool UMAIsWindowModal( WindowRef inWindow ) 
 {
-	return IsWindowCollapsed( inWindowRef ) ;
+	WindowClass cl ;
+	
+	GetWindowClass( inWindow , &cl ) ;
+	return cl < kFloatingWindowClass ;
 }
 
-Boolean UMAIsWindowCollapsable( WindowRef inWindowRef )
-{
-	return IsWindowCollapsable( inWindowRef ) ;
-}
+// others
 
-// system 8.5 changes<MacWindows.h>
-OSStatus 	UMACreateNewWindow( WindowClass windowClass , WindowAttributes attributes , const Rect *bounds,  WindowRef *outWindow ) 
+void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		return CreateNewWindow( windowClass , attributes, bounds, outWindow ) ;
-	}
-	else
-#endif
+	if ( inWindowRef )
 	{
-		short procID ;
-		if ( UMAHasAppearance() )
-		{
-			switch( windowClass )
-			{
-				case kMovableModalWindowClass :
-					procID = kWindowMovableModalDialogProc;
-					break ;
-				case kModalWindowClass :
-					procID = kWindowShadowDialogProc;
-					break ;
-				case kFloatingWindowClass :
-					if ( attributes & kWindowSideTitlebarAttribute )
-					{
-						if( ( attributes & kWindowResizableAttribute ) &&  
-							( attributes & kWindowFullZoomAttribute ) )
-						{
-							procID = kWindowFloatSideFullZoomGrowProc ;
-						}
-						else if( attributes & kWindowFullZoomAttribute )
-						{
-							procID = kWindowFloatSideFullZoomProc;
-						}
-						else if ( attributes & kWindowResizableAttribute )
-						{
-							procID = kWindowFloatSideGrowProc;
-						}
-						else
-						{
-							procID = kWindowFloatSideProc;
-						}
-					}
-					else
-					{
-						if( ( attributes & kWindowResizableAttribute ) &&  
-							( attributes & kWindowFullZoomAttribute ) )
-						{
-							procID = kWindowFloatFullZoomGrowProc ;
-						}
-						else if( attributes & kWindowFullZoomAttribute )
-						{
-							procID = kWindowFloatFullZoomProc;
-						}
-						else if ( attributes & kWindowResizableAttribute )
-						{
-							procID = kWindowFloatGrowProc;
-						}
-						else
-						{
-							procID = kWindowFloatProc;
-						}
-					}
-					break ;
-				case kDocumentWindowClass :
-				default :
-					if( ( attributes & kWindowResizableAttribute ) &&  
-						( attributes & kWindowFullZoomAttribute ) )
-					{
-						procID = kWindowFullZoomGrowDocumentProc;
-					}
-					else if( attributes & kWindowFullZoomAttribute )
-					{
-						procID = kWindowFullZoomDocumentProc;
-					}
-					else if ( attributes & kWindowResizableAttribute )
-					{
-						procID = kWindowGrowDocumentProc;
-					}
-					else
-					{
-						procID = kWindowDocumentProc;
-					}
-					break ;
-			}
-		}
-		else
+//		bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
+//		if ( inActivate != isHightlited )
+		GrafPtr port ;
+		GetPort( &port ) ;
+		SetPortWindowPort( inWindowRef ) ;
+		HiliteWindow( inWindowRef , inActivate ) ;
+		ControlHandle control = NULL ;
+		::GetRootControl( inWindowRef , & control ) ;
+		if ( control )
 		{
-			switch( windowClass )
-			{
-				case kMovableModalWindowClass :
-					procID = movableDBoxProc;
-					break ;
-				case kModalWindowClass :
-					procID = altDBoxProc;
-					break ;
-				case kFloatingWindowClass :
-					if ( attributes & kWindowSideTitlebarAttribute )
-					{
-						if( ( attributes & kWindowResizableAttribute ) &&  
-							( attributes & kWindowFullZoomAttribute ) )
-						{
-							procID = floatSideZoomGrowProc ;
-						}
-						else if( attributes & kWindowFullZoomAttribute )
-						{
-							procID = floatSideZoomProc;
-						}
-						else if ( attributes & kWindowResizableAttribute )
-						{
-							procID = floatSideGrowProc;
-						}
-						else
-						{
-							procID = floatSideProc;
-						}
-					}
-					else
-					{
-						if( ( attributes & kWindowResizableAttribute ) &&  
-							( attributes & kWindowFullZoomAttribute ) )
-						{
-							procID = floatZoomGrowProc ;
-						}
-						else if( attributes & kWindowFullZoomAttribute )
-						{
-							procID = floatZoomProc;
-						}
-						else if ( attributes & kWindowResizableAttribute )
-						{
-							procID = floatGrowProc;
-						}
-						else
-						{
-							procID = floatProc;
-						}
-					}
-					break ;
-				case kDocumentWindowClass :
-				default :
-					if( ( attributes & kWindowResizableAttribute ) &&  
-						( attributes & kWindowFullZoomAttribute ) )
-					{
-						procID = zoomDocProc;
-					}
-					else if( attributes & kWindowFullZoomAttribute )
-					{
-						procID = zoomNoGrow;
-					}
-					else if ( attributes & kWindowResizableAttribute )
-					{
-						procID = documentProc;
-					}
-					else
-					{
-						procID = noGrowDocProc;
-					}
-					break ;
-					break ;
-			}
-		}
-		*outWindow = NewCWindow(nil, bounds, "\p", false, procID,  (WindowRef) -1 /*behind*/,
-				attributes & kWindowCloseBoxAttribute , (long)NULL);
-		return noErr ;		
+			if ( inActivate )
+				UMAActivateControl( control ) ;
+			else
+				UMADeactivateControl( control ) ;
+		}	
+		SetPort( port ) ;
 	}
 }
-
-OSStatus 	UMAGetWindowClass( WindowRef inWindowRef , WindowClass *outWindowClass ) 
+OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) 
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		return GetWindowClass( inWindowRef , outWindowClass ) ;
-	}
-	else
-#endif
-		return kDocumentWindowClass ;
+  return ::DrawThemePlacard( inRect , inState ) ;
 }
 
-OSStatus	UMAGetWindowAttributes( WindowRef inWindowRef , WindowAttributes *outAttributes ) 
-{
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		return GetWindowAttributes( inWindowRef , outAttributes ) ;
-	}
+#if !TARGET_CARBON
+static OSStatus helpMenuStatus = noErr ;
+static MenuItemIndex firstCustomItemIndex = 0 ;
 #endif
-	return kWindowNoAttributes ;
-}
 
-void UMAShowFloatingWindows() 
+OSStatus UMAGetHelpMenu(
+  MenuRef *        outHelpMenu,
+  MenuItemIndex *  outFirstCustomItemIndex)
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		ShowFloatingWindows() ;
-	}
+#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
 }
 
-void UMAHideFloatingWindows() 
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) 
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		HideFloatingWindows() ;
-	}
-#endif
+  m_clip = NULL ;
+  Setup( newport ) ;
 }
 
-Boolean 	UMAAreFloatingWindowsVisible() 
+wxMacPortStateHelper::wxMacPortStateHelper()
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		return AreFloatingWindowsVisible() ;
-	}
-#endif
-	return false ;
+	m_clip = NULL ;
 }
 
-WindowRef UMAFrontNonFloatingWindow()
+void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		return FrontNonFloatingWindow() ;
-	}
-	else
-#endif
-	{
-		return FrontWindow() ;
-	}
+	GetPort( &m_oldPort ) ;
+	SetPort( newport ) ;
+	wxASSERT_MSG( m_clip == NULL , "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);	
+	GetThemeDrawingState( &m_drawingState ) ;
+	m_currentPort = newport ;
 }
-
-WindowRef UMAFrontWindow()
+void wxMacPortStateHelper::Clear()
 {
-#if UMA_USE_WINDOWMGR
-	if ( UMAHasWindowManager() )
-	{
-		return FrontWindow() ;
-	}
-	else
-#endif
+	if ( m_clip )
 	{
-		return FrontWindow() ;
+		DisposeRgn( m_clip ) ;
+		DisposeThemeDrawingState( m_drawingState ) ;
+		m_clip = NULL ;
 	}
 }
 
-WindowRef UMAGetActiveNonFloatingWindow()
-{
-	return NULL ;
-}
-
-bool UMAIsWindowFloating( WindowRef inWindow ) 
-{
-	WindowClass cl ;
-	
-	UMAGetWindowClass( inWindow , &cl ) ;
-	return cl == kFloatingWindowClass ;
-}
-
-bool UMAIsWindowModal( WindowRef inWindow ) 
+wxMacPortStateHelper::~wxMacPortStateHelper()
 {
-	WindowClass cl ;
-	
-	UMAGetWindowClass( inWindow , &cl ) ;
-	return cl < kFloatingWindowClass ;
-}
-
-// others
-
-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
-{
-	if ( inWindowRef )
+	if ( m_clip )
 	{
-//		bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-//		if ( inActivate != isHightlited )
-				HiliteWindow( inWindowRef , inActivate ) ;
-				ControlHandle control = NULL ;
-				UMAGetRootControl( inWindowRef , & control ) ;
-				if ( control )
-				{
-					if ( inActivate )
-						UMAActivateControl( control ) ;
-					else
-						UMADeactivateControl( control ) ;
-				}	
+		SetPort( m_currentPort ) ;
+		SetClip( m_clip ) ;
+		DisposeRgn( m_clip ) ;
+		TextFont( m_textFont );
+		TextSize( m_textSize );
+		TextFace( m_textStyle );
+		TextMode( m_textMode );
+		SetThemeDrawingState( m_drawingState , true ) ;
+		SetPort( m_oldPort ) ;
 	}
 }
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) 
-{
-#if UMA_USE_APPEARANCE
-  if ( UMAHasAppearance() )
-  {
-    ::DrawThemePlacard( inRect , inState ) ;
-  }
-  else
-#endif
-#if !TARGET_CARBON
-  {
-  }
-#else
-  {
-  }
-#endif
-}