added test for m_macControlIsShown in MacRedrawControl apparently HideControl does...

[wxWidgets.git] / src / mac / uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index ba96908df9b93f0f8acd205fee847c816880646a..f6bd01f91f09360764787645054b9a3b3b78ec73 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -1,10 +1,31 @@
-#include <wx/mac/uma.h>
-#include <wx/mac/aga.h>
+#include "wx/defs.h"
+#include "wx/dc.h"
+#include "wx/mac/uma.h"
+#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

 
 

-// init
+// 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 bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;

+static bool sUMAHasAquaLayout = false ;
+static bool sUMASystemInitialized = false ;
+

 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }


@@ -14,7 +35,22 @@ static long sUMAWindowManagerAttr = 0 ;
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }

+bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
+bool UMASystemIsInitialized() { return sUMASystemInitialized ; }

 
 

+void UMACleanupToolbox()
+{
+       if ( sUMAHasAppearance )
+       {
+               UnregisterAppearanceClient() ;
+       }
+       if ( NavServicesAvailable() )
+       {
+               NavUnload() ;
+       }
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+         TXNTerminateTextension( ) ;
+}

 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
 #if !TARGET_CARBON
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
 #if !TARGET_CARBON


@@ -24,7 +60,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 
        ::InitGraf(&qd.thePort);
        ::InitFonts();
 
        ::InitGraf(&qd.thePort);
        ::InitFonts();

-       ::InitWindows();

        ::InitMenus();
        ::TEInit();
        ::InitDialogs(0L);
        ::InitMenus();
        ::TEInit();
        ::InitDialogs(0L);


@@ -33,10 +68,9 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
        long total,contig;
        PurgeSpace(&total, &contig);
 #else
        long total,contig;
        PurgeSpace(&total, &contig);
 #else

-       InitMenus() ;
+       InitCursor();

 #endif
 
 #endif
 

-#if UMA_USE_APPEARANCE

        long theAppearance ;
        if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
        {
        long theAppearance ;
        if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
        {


@@ -51,17 +85,71 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                        sUMAAppearanceVersion = 0x0100 ;
                }
        }
                        sUMAAppearanceVersion = 0x0100 ;
                }
        }

-#endif // UMA_USE_APPEARANCE
-#if UMA_USE_8_6
-#if UMA_USE_WINDOWMGR

        if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
        {
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
        if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
        {
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }

-#endif // UMA_USE_WINDOWMGR
+               
+#if TARGET_CARBON
+// Call currently implicitely done :           InitFloatingWindows() ;
+#else
+       if ( sUMAHasWindowManager )
+               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() 
 {
 // process manager
 long UMAGetProcessMode() 
 {


@@ -87,8 +175,9 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch()
 
 // menu manager
 
 
 // menu manager
 

-void UMASetMenuTitle( MenuRef menu , ConstStr255Param title )
+void UMASetMenuTitle( MenuRef menu , StringPtr title )

 {
 {

+/*

 #if !TARGET_CARBON
        long                    size = GetHandleSize( (Handle) menu ) ;
        const long              headersize = 14 ;
 #if !TARGET_CARBON
        long                    size = GetHandleSize( (Handle) menu ) ;
        const long              headersize = 14 ;


@@ -111,47 +200,155 @@ void UMASetMenuTitle( MenuRef menu , ConstStr255Param title )
                SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
        }
 #else
                SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
        }
 #else

+*/

        SetMenuTitle( menu , title ) ;
        SetMenuTitle( menu , title ) ;

-#endif
+//#endif

 }
 
 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {
 }
 
 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {

-       if ( UMAHasAppearance() )
-       {

                return MenuEvent( inEvent ) ;
                return MenuEvent( inEvent ) ;

+}
+
+void                   UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+{
+       EnableMenuItem( inMenu , inItem ) ;
+}
+
+void                   UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+{
+       DisableMenuItem( inMenu , inItem ) ;
+}
+
+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);
+}
+
+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);
+}
+
+void UMAAppendMenuItem( MenuRef menu , StringPtr l , 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 ;

        }
        }

-       else
+       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 )

        {
        {

-                       if ( inEvent->what == keyDown && inEvent->modifiers & cmdKey)
-                       {
-                               return MenuKey( inEvent->message & charCodeMask ) ;
-                       }
-               return NULL ;
+                       int pos = label[0] ;
+                       label[++pos] = '/';
+                       label[++pos] = toupper( key );
+                       label[0] = pos ;

        }
        }

+       MacInsertMenuItem( menu , label , item) ;

 }
 
 }
 

-void                   UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+// quickdraw
+
+int gPrOpenCounter = 0 ;
+
+OSStatus UMAPrOpen(void *macPrintSession)

 {
 {

-#if UMA_USE_8_6
-       EnableMenuItem( inMenu , inItem ) ;
+#if !TARGET_CARBON
+       OSErr err = noErr ;
+       ++gPrOpenCounter ;
+       if ( gPrOpenCounter == 1 )
+       {
+               PrOpen() ;
+               err = PrError() ;
+               wxASSERT( err == noErr ) ;
+       }
+       return err ;

 #else
 #else

-       EnableItem( inMenu , inItem ) ;
+       OSStatus err = noErr ;
+       ++gPrOpenCounter ;
+       if ( gPrOpenCounter == 1 )
+       {
+  #if PM_USE_SESSION_APIS
+           err = PMCreateSession((PMPrintSession *)macPrintSession) ;
+  #else
+           err = PMBegin() ;
+  #endif
+               wxASSERT( err == noErr ) ;
+       }
+       return err ;

 #endif
 }
 
 #endif
 }
 

-void                   UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+OSStatus UMAPrClose(void *macPrintSession)

 {
 {

-#if UMA_USE_8_6
-       DisableMenuItem( inMenu , inItem ) ;
+#if !TARGET_CARBON
+       OSErr err = noErr ;
+       wxASSERT( gPrOpenCounter >= 1 ) ;
+       if ( gPrOpenCounter == 1 )
+       {
+               PrClose() ;
+               err = PrError() ;
+               wxASSERT( err == noErr ) ;
+       }
+       --gPrOpenCounter ;
+       return err ;

 #else
 #else

-       DisableItem( inMenu , inItem ) ;
+       OSStatus err = noErr ;
+       wxASSERT( gPrOpenCounter >= 1 ) ;
+       if ( gPrOpenCounter == 1 )
+       {
+  #if PM_USE_SESSION_APIS
+           err = PMRelease(*(PMPrintSession *)macPrintSession) ;
+           *(PMPrintSession *)macPrintSession = kPMNoReference;
+  #else
+           err = PMEnd() ;
+  #endif
+       }
+       --gPrOpenCounter ;
+       return err ;

 #endif
 }
 #endif
 }

-// quickdraw

 
 #if !TARGET_CARBON
 
 
 #if !TARGET_CARBON
 

+pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;

 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
        return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
        return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);


@@ -170,11 +367,12 @@ void UMAShowWatchCursor()
        else
        {
        #if TARGET_CARBON
        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
        #else
                SetCursor (*watchFob);  
        #endif


@@ -197,7 +395,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 

-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 

 #else
        return (GrafPtr) inWindowRef ;
 #endif
 #else
        return (GrafPtr) inWindowRef ;
 #endif


@@ -214,45 +412,21 @@ void                      UMASetWTitleC( WindowRef inWindowRef , const char *title )
        Str255  ptitle ;
        strncpy( (char*)ptitle , title , 96 ) ;
        ptitle[96] = 0 ;
        Str255  ptitle ;
        strncpy( (char*)ptitle , title , 96 ) ;
        ptitle[96] = 0 ;

+#if TARGET_CARBON
+       c2pstrcpy( ptitle, (char *)ptitle ) ;
+#else

        c2pstr( (char*)ptitle ) ;
        c2pstr( (char*)ptitle ) ;

+#endif

        SetWTitle( inWindowRef , ptitle ) ;
 }
        SetWTitle( inWindowRef , ptitle ) ;
 }

+

 void                   UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
 {
        GetWTitle( inWindowRef , (unsigned char*)title ) ;
 void                   UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
 {
        GetWTitle( inWindowRef , (unsigned char*)title ) ;

-       p2cstr( (unsigned char*)title ) ;
-}
-
-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
 #if TARGET_CARBON

+       p2cstrcpy( title, (unsigned char *)title ) ;

 #else
 #else

-       CloseWindow( inWindowRef ) ;
+       p2cstr( (unsigned char*)title ) ;

 #endif
 }
 
 #endif
 }
 


@@ -260,599 +434,251 @@ void                    UMACloseWindow(WindowRef inWindowRef)
 
 void UMAActivateControl( ControlHandle inControl ) 
 {
 
 void UMAActivateControl( ControlHandle inControl ) 
 {

-       if ( UMAHasAppearance() )
-       {
-       ::ActivateControl( inControl ) ;
-   }
-   else
-   {
-       AGAActivateControl( 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 ) ;
+        ::ActivateControl( inControl ) ;
+        if ( visible ) {
+          SetControlVisibility( inControl , true , false ) ;
+          Rect ctrlBounds ;
+          InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        }
+  }

 }
 
 void UMADrawControl( ControlHandle inControl ) 
 {
 }
 
 void UMADrawControl( ControlHandle inControl ) 
 {

-       if ( UMAHasAppearance() )
-       {
-       ::DrawControlInCurrentPort( inControl ) ;
-   }
-   else
-   {
-       AGADrawControl( inControl ) ;
-   }
+    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 ) 
 {
 }
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) 
 {

-       if ( UMAHasAppearance() )
-       {
-               ::MoveControl( inControl , x , y ) ;
-   }
-   else
-   {
-       AGAMoveControl( inControl , x ,y  ) ;
-   }
+  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 ) 
 {
 }
 
 void UMASizeControl( ControlHandle inControl , short x , short y ) 
 {

-       if ( UMAHasAppearance() )
-       {
-               ::SizeControl( inControl , x , y ) ;
-   }
-   else
-   {
-       AGASizeControl( inControl , x ,y  ) ;
-   }
+  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) ) ;
+  }

 }
 
 void UMADeactivateControl( ControlHandle inControl ) 
 {
 }
 
 void UMADeactivateControl( ControlHandle inControl ) 
 {

-       if ( UMAHasAppearance() )
-       {
-       ::DeactivateControl( inControl ) ;
-   }
-   else
-   {
-        AGADeactivateControl( inControl ) ;
-   }
-}
-
-void                   UMASetThemeWindowBackground             (WindowRef                              inWindow,
-                                                                ThemeBrush                     inBrush,
-                                                                Boolean                                inUpdate){
-       if ( UMAHasAppearance() )
-       {
-       ::SetThemeWindowBackground( inWindow ,inBrush , inUpdate ) ;
-   }
-   else
-   {
-       AGASetThemeWindowBackground( inWindow , inBrush , inUpdate ) ;
-   }
-}
-
-
-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 ( UMAHasAppearance() )
-       {
-   theControl =  NewControl( owningWindow , boundsRect , controlTitle , initiallyVisible ,
-               initialValue , minimumValue , maximumValue , procID , controlReference ) ;
-       }
-       else
-       {
-               theControl = AGANewControl( owningWindow , boundsRect , controlTitle , initiallyVisible ,
-               initialValue , minimumValue , maximumValue , procID , controlReference ) ;
-       }
-       return theControl ;
+    // 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) ) ;
+     }

 }
 }

-
-void UMADisposeControl (ControlHandle                  theControl)
+// shows the control and adds the region to the update region
+void UMAShowControl                                            (ControlHandle                  inControl)

 {
 {

-       if ( UMAHasAppearance() )
-       {
-       ::DisposeControl( theControl ) ;
-   }
-   else
-   {
-       ::DisposeControl( theControl ) ;
-   }
-}
-
-
-void UMAHiliteControl  (ControlHandle                  theControl,
-                                                                ControlPartCode                hiliteState)
-                                                                {
-       if ( UMAHasAppearance() )
-       {
-       ::HiliteControl( theControl , hiliteState ) ;
-   }
-   else
-   {
-       ::HiliteControl( theControl , hiliteState ) ;
-       }
+        SetControlVisibility( inControl , true , false ) ;
+        Rect ctrlBounds ;
+        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;

 }
 
 }
 

-
-void UMAShowControl                                            (ControlHandle                  theControl)
+// shows the control and adds the region to the update region
+void UMAHideControl                                            (ControlHandle                  inControl)

 {
 {

-       if ( UMAHasAppearance() )
-       {
-       ::ShowControl( theControl ) ;
-   }
-   else
-   {
-       ::ShowControl( theControl ) ;
-   }
+        SetControlVisibility( inControl , false , false ) ;
+        Rect ctrlBounds ;
+        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;

 }
 }

-
-
-void UMAHideControl                                            (ControlHandle                  theControl)
-{
-       if ( UMAHasAppearance() )
-       {
-       ::HideControl( theControl ) ;
-   }
-   else
-   {
-       ::HideControl( theControl ) ;
-   }
-}
-
-
-void UMASetControlVisibility                   (ControlHandle                  inControl,
-                                                                Boolean                                inIsVisible,
-                                                                Boolean                                inDoDraw)
-                                                                {
-       if ( UMAHasAppearance() )
-       {
-       ::SetControlVisibility( inControl , inIsVisible, inDoDraw ) ;
-   }
-}
-
-
-
-bool UMAIsControlActive                                        (ControlHandle                  inControl)
-{
-       if ( UMAHasAppearance() )
-       {
-       return IsControlActive( inControl ) ;
-   }
-  else
-       return (**inControl).contrlHilite == 0 ;
-}
-
-
-bool UMAIsControlVisible                               (ControlHandle                  inControl)
-{
-       if ( UMAHasAppearance() )
-       {
-       return IsControlVisible( inControl ) ;
-   }
-       return true ;
-}
-
-OSErr UMAGetBestControlRect                            (ControlHandle                  inControl,
-                                                                Rect *                                 outRect,
-                                                                SInt16 *                               outBaseLineOffset)
-{
-       if ( UMAHasAppearance() )
-       {
-       return GetBestControlRect( inControl , outRect , outBaseLineOffset ) ;
-   }
-  else
-  {
-       return AGAGetBestControlRect( inControl , outRect , outBaseLineOffset ) ;
-  }
-}
-
-
-OSErr UMASetControlFontStyle                           (ControlHandle                  inControl,
-                                                                const ControlFontStyleRec * inStyle)   
-{
-       if ( UMAHasAppearance() )
-       {
-               return ::SetControlFontStyle( inControl , inStyle ) ;
-       }
-       else
-               return AGASetControlFontStyle( inControl , inStyle ) ;
-}
-
-
-
-// control hierarchy
-
-OSErr UMACreateRootControl                             (WindowPtr                              inWindow,
-                                                                ControlHandle *                outControl)
-{
-       if ( UMAHasAppearance() )
-       {
-       return CreateRootControl( inWindow , outControl  ) ;
-   }
-  else
-       return AGACreateRootControl( inWindow , outControl ) ;
-}
-
-
-
-OSErr UMAEmbedControl                                  (ControlHandle                  inControl,
-                                                                ControlHandle                  inContainer)
-{
-       if ( UMAHasAppearance() )
-       {
-       return EmbedControl( inControl , inContainer ) ;
-   }
-  else
-       return AGAEmbedControl( inControl , inContainer ) ; ;
-}
-
-
-

 // keyboard focus
 OSErr UMASetKeyboardFocus                              (WindowPtr                              inWindow,
                                                                 ControlHandle                  inControl,
                                                                 ControlFocusPart               inPart)
 {
 // keyboard focus
 OSErr UMASetKeyboardFocus                              (WindowPtr                              inWindow,
                                                                 ControlHandle                  inControl,
                                                                 ControlFocusPart               inPart)
 {

-       if ( UMAHasAppearance() )
-       {
-       return SetKeyboardFocus( inWindow , inControl , inPart ) ;
-   }
-  else
-       return AGASetKeyboardFocus( inWindow , inControl , inPart ) ;
-}
-
-
+       OSErr err = noErr;
+       GrafPtr port ;
+       GetPort( &port ) ;

 
 

+       SetPortWindowPort( inWindow ) ;

 
 

-// events
-
-ControlPartCode UMAHandleControlClick                          (ControlHandle                  inControl,
-                                                                Point                                  inWhere,
-                                                                SInt16                                 inModifiers,
-                                                                ControlActionUPP               inAction)                
-{
-       if ( UMAHasAppearance() )
-       {
-       return HandleControlClick( inControl , inWhere , inModifiers , inAction ) ;
-   }
-   else
-   {
-       return AGAHandleControlClick( inControl , inWhere , inModifiers , inAction ) ;
-   }
+  err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
+       SetPort( port ) ;
+       return err ;

 }
 
 
 }
 
 

-SInt16 UMAHandleControlKey                             (ControlHandle                  inControl,
-                                                                SInt16                                 inKeyCode,
-                                                                SInt16                                 inCharCode,
-                                                                SInt16                                 inModifiers)
-{
-       if ( UMAHasAppearance() )
-       {
-       return HandleControlKey( inControl , inKeyCode , inCharCode , inModifiers ) ;
-   }
-   else
-   {
-       return AGAHandleControlKey(inControl , inKeyCode , inCharCode , inModifiers ) ;
-   }
-}
-

 
 

-                                                                
-void UMAIdleControls                                   (WindowPtr                              inWindow)
-{
-       if ( UMAHasAppearance() )
-       {
-               IdleControls( inWindow ) ;
-   }
-   else
-   {
-               AGAIdleControls( inWindow ) ;
-   }
-}

 
 

+// events

 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
 {
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
 {

-       if ( UMAHasAppearance() )
-       {
-               UpdateControls( inWindow , inRgn ) ;
-       }
-       else
-       {
-               AGAUpdateControls( inWindow , inRgn ) ;
-       }
-}
-
-OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) 
-{
-       if ( UMAHasAppearance() )
-       {
-               return GetRootControl( inWindow , outControl ) ;
-       }
-       else
-       {
-               return AGAGetRootControl( inWindow , outControl ) ;
-       }
-}
+  RgnHandle updateRgn = NewRgn() ;
+  GetWindowUpdateRgn( inWindow , updateRgn ) ;

 
 

+       Point zero = { 0 , 0 } ;
+       LocalToGlobal( &zero ) ;
+       OffsetRgn( updateRgn , -zero.h , -zero.v ) ;

 
 

-// handling control data
+  UpdateControls( inWindow , inRgn ) ;
+  InvalWindowRgn( inWindow, updateRgn) ;
+       DisposeRgn( updateRgn ) ;

 
 

-OSErr UMASetControlData                                        (ControlHandle                  inControl,
-                                                                ControlPartCode                inPart,
-                                                                ResType                                inTagName,
-                                                                Size                                   inSize,
-                                                                Ptr                                    inData)
-{
-       if ( UMAHasAppearance() )
-       {
-        return SetControlData( inControl , inPart , inTagName , inSize , inData ) ;
-   }
-   else
-               return AGASetControlData( inControl , inPart , inTagName , inSize , inData ) ;

 }
 
 }
 

-
-
-OSErr UMAGetControlData                                        (ControlHandle                  inControl,
-                                                                ControlPartCode                inPart,
-                                                                ResType                                inTagName,
-                                                                Size                                   inBufferSize,
-                                                                Ptr                                    outBuffer,
-                                                                Size *                                 outActualSize)
+bool UMAIsWindowFloating( WindowRef inWindow ) 

 {
 {

-       if ( UMAHasAppearance() )
-       {
-               return ::GetControlData( inControl , inPart , inTagName , inBufferSize , outBuffer , outActualSize ) ;
-       }
-       else
-       {
-               return AGAGetControlData( inControl , inPart , inTagName , inBufferSize , outBuffer , outActualSize ) ;
-       }
+       WindowClass cl ;

        
        

+       GetWindowClass( inWindow , &cl ) ;
+       return cl == kFloatingWindowClass ;

 }
 
 }
 

-
-OSErr UMAGetControlDataSize                            (ControlHandle                  inControl,
-                                                                ControlPartCode                inPart,
-                                                                ResType                                inTagName,
-                                                                Size *                                 outMaxSize)
-{
-       if ( UMAHasAppearance() )
-       {
-               return GetControlDataSize( inControl , inPart , inTagName , outMaxSize ) ;
-       }
-       else
-       {
-               return AGAGetControlDataSize( inControl , inPart , inTagName , outMaxSize ) ;
-       }
-}
-
-
-
-
-
-// system 8.0 changes
-
-short UMAFindWindow( Point inPoint , WindowRef *outWindow )
-{
-       // todo add the additional area codes
-       return FindWindow( inPoint , outWindow ) ;
-}
-
-OSStatus UMAGetWindowFeatures( WindowRef inWindowRef , UInt32 *outFeatures )
-{
-#if UMA_USE_WINDOWMGR
-       return GetWindowFeatures( inWindowRef , outFeatures ) ;
-#else
-       return 0 ;
-#endif
-}
-
-OSStatus UMAGetWindowRegion( WindowRef inWindowRef , WindowRegionCode inRegionCode , RgnHandle ioWinRgn )
-{
-#if UMA_USE_WINDOWMGR
-       return GetWindowRegion( inWindowRef , inRegionCode , ioWinRgn ) ;
-#else
-       return 0 ;
-#endif
-}
-
-void UMADrawGrowIcon( WindowRef inWindowRef )
-{
-       DrawGrowIcon( inWindowRef ) ;
-}
-
-OSStatus UMACollapseWindow( WindowRef inWindowRef , Boolean inCollapseIt )
-{
-       return CollapseWindow( inWindowRef , inCollapseIt ) ;
-}
-
-OSStatus UMACollapseAllWindows( Boolean inCollapseEm )
-{
-       return CollapseAllWindows( inCollapseEm ) ;
-}
-
-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 kDocumentWindowClass :
-                                       procID = kWindowFullZoomGrowDocumentProc;
-                                       break ;
-                               default :
-                                       procID = kWindowMovableModalDialogProc;
-                                       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;
-//                                     procID += kMovableModalDialogVariantCode;
-                                       break ;
-                               case kDocumentWindowClass :
-                                       procID = zoomDocProc;
-                                       break ;
-                               default :
-                                       procID = documentProc;
-                                       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
 #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
 }
 
 #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 ) 
-{
-       WindowClass cl ;
-       
-       UMAGetWindowClass( inWindow , &cl ) ;
-       return cl < kFloatingWindowClass ;
-}
-
-// others
-
-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
+wxMacPortStateHelper::~wxMacPortStateHelper()

 {
 {

-       if ( inWindowRef )
+       if ( m_clip )

        {
        {

-//             bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-//             if ( inActivate != isHightlited )
-                               HiliteWindow( inWindowRef , inActivate ) ;
+               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 ) ;

        }
 }
 
        }
 }