overwrote with src\wxBase.dsp

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 3be88ef8ec9c288a3a44f0d037d83e1f1bdb668a..2c70ef47b762087471d27444223f1671164acb1b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -3,9 +3,7 @@
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 

-#ifdef __UNIX__
-  #include <Carbon/Carbon.h>
-#else
+#ifndef __DARWIN__

   #include <Navigation.h>
 #endif
 
   #include <Navigation.h>
 #endif
 


@@ -13,6 +11,8 @@
 
 #if !TARGET_CARBON
 #define        GetControlOwner( control ) (**control).contrlOwner
 
 #if !TARGET_CARBON
 #define        GetControlOwner( control ) (**control).contrlOwner

+// since we always call this in the right context we don't have to set and reset the port
+#define InvalWindowRgn( window , rgn ) InvalRgn( rgn )

 #endif
 
 static bool    sUMAHasAppearance = false ;
 #endif
 
 static bool    sUMAHasAppearance = false ;


@@ -84,7 +84,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 #endif // UMA_USE_WINDOWMGR
 #endif
                
 #endif // UMA_USE_WINDOWMGR
 #endif
                

-#ifndef __UNIX__
+#ifndef __DARWIN__

 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else


@@ -289,7 +289,11 @@ void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId )
 
 int gPrOpenCounter = 0 ;
 
 
 int gPrOpenCounter = 0 ;
 

-OSStatus UMAPrOpen() 
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
+#else
+OSStatus UMAPrOpen()
+#endif

 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;


@@ -306,14 +310,22 @@ OSStatus UMAPrOpen()
        ++gPrOpenCounter ;
        if ( gPrOpenCounter == 1 )
        {
        ++gPrOpenCounter ;
        if ( gPrOpenCounter == 1 )
        {

-               err = PMBegin() ;
+  #if PM_USE_SESSION_APIS
+           err = PMCreateSession(macPrintSession) ;
+  #else
+           err = PMBegin() ;
+  #endif

                wxASSERT( err == noErr ) ;
        }
        return err ;
 #endif
 }
 
                wxASSERT( err == noErr ) ;
        }
        return err ;
 #endif
 }
 

-OSStatus UMAPrClose() 
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus UMAPrClose(PMPrintSession *macPrintSession)
+#else
+OSStatus UMAPrClose()
+#endif

 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;


@@ -331,7 +343,12 @@ OSStatus UMAPrClose()
        wxASSERT( gPrOpenCounter >= 1 ) ;
        if ( gPrOpenCounter == 1 )
        {
        wxASSERT( gPrOpenCounter >= 1 ) ;
        if ( gPrOpenCounter == 1 )
        {

-               err = PMEnd() ;
+  #if PM_USE_SESSION_APIS
+           err = PMRelease(*macPrintSession) ;
+           *macPrintSession = kPMNoReference;
+  #else
+           err = PMEnd() ;
+  #endif

        }
        --gPrOpenCounter ;
        return err ;
        }
        --gPrOpenCounter ;
        return err ;


@@ -423,6 +440,7 @@ void                        UMAGetWTitleC( WindowRef inWindowRef , char *title )
 void                   UMAShowWindow( WindowRef inWindowRef ) 
 {
        ShowWindow( inWindowRef ) ;
 void                   UMAShowWindow( WindowRef inWindowRef ) 
 {
        ShowWindow( inWindowRef ) ;

+

 }
 
 void                   UMAHideWindow( WindowRef inWindowRef ) 
 }
 
 void                   UMAHideWindow( WindowRef inWindowRef ) 


@@ -457,132 +475,145 @@ void                    UMACloseWindow(WindowRef inWindowRef)
 
 void UMAActivateControl( ControlHandle inControl ) 
 {
 
 void UMAActivateControl( ControlHandle inControl ) 
 {

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;

 #if UMA_USE_APPEARANCE
 #if UMA_USE_APPEARANCE

-       if ( UMAHasAppearance() )
-       {
-       ::ActivateControl( inControl ) ;
-   }
-   else
+    if ( UMAHasAppearance() )
+    { 
+      if ( !UMAIsControlActive( 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) ) ;
+        }
+       }
+    }
+    else

 #endif
 #if !TARGET_CARBON
 #endif
 #if !TARGET_CARBON

-   {
-       AGAActivateControl( inControl ) ;
-   }
+    {
+        AGAActivateControl( inControl ) ;
+    }

 #else
 #else

-       {
-       }
+    {
+    }

 #endif
 #endif

-                       InvalRgn( updateRgn ) ;

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

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
+    WindowRef theWindow = GetControlOwner(inControl) ;
+    RgnHandle updateRgn = NewRgn() ;
+#if TARGET_CARBON
+    GetWindowRegion( theWindow , kWindowUpdateRgn, updateRgn ) ;
+#else
+    GetWindowUpdateRgn( theWindow , updateRgn ) ;
+#endif
+       Point zero = { 0 , 0 } ;
+       LocalToGlobal( &zero ) ;
+       OffsetRgn( updateRgn , -zero.h , -zero.v ) ;

 #if UMA_USE_APPEARANCE
 #if UMA_USE_APPEARANCE

-       if ( UMAHasAppearance() )
-       {
-       ::DrawControlInCurrentPort( inControl ) ;
-   }
-   else
+    if ( UMAHasAppearance() )
+    {
+        ::DrawControlInCurrentPort( inControl ) ;
+    }
+    else

 #endif
 #if !TARGET_CARBON
 #endif
 #if !TARGET_CARBON

-   {
-       AGADrawControl( inControl ) ;
-   }
+    {
+        AGADrawControl( inControl ) ;
+    }

 #else
 #else

-       {
-       }
+    {
+    }
+#endif
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0332)
+    InvalWindowRgn( theWindow, updateRgn) ;
+#else
+    InvalRgn( updateRgn ) ;

 #endif
 #endif

-                       InvalRgn( updateRgn ) ;
+       DisposeRgn( updateRgn ) ;
+

 }
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) 
 {
 }
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) 
 {

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               ::MoveControl( inControl , x , y ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-       AGAMoveControl( inControl , x ,y  ) ;
-   }
-#else
-       {
-       }
-#endif
-                       InvalRgn( updateRgn ) ;
+    if ( UMAHasAppearance() )
+    {
+        bool visible = UMAIsControlVisible( 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 ) 
 {

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               ::SizeControl( inControl , x , y ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-       AGASizeControl( inControl , x ,y  ) ;
-   }
-#else
-       {
-       }
-#endif
-                       InvalRgn( updateRgn ) ;
+    if ( UMAHasAppearance() )
+    {
+        bool visible = UMAIsControlVisible( 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 ) 
 {

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       ::DeactivateControl( inControl ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-        AGADeactivateControl( inControl ) ;
-   }
-#else
-       {
-       }
-#endif
-                       InvalRgn( updateRgn ) ;
-}
-
-void                   UMASetThemeWindowBackground             (WindowRef                              inWindow,
-                                                                ThemeBrush                     inBrush,
-                                                                Boolean                                inUpdate)
+    if ( UMAHasAppearance() )
+    {
+      if ( UMAIsControlActive( inControl ) )
+      {
+        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 UMASetThemeWindowBackground              (WindowRef                               inWindow,
+                                               ThemeBrush                      inBrush,
+                                               Boolean                                 inUpdate)

 {
 #if UMA_USE_APPEARANCE
 {
 #if UMA_USE_APPEARANCE

-       if ( UMAHasAppearance() )
-       {
-       ::SetThemeWindowBackground( inWindow ,inBrush , inUpdate ) ;
-   }
-   else
+    if ( UMAHasAppearance() )
+    {
+        ::SetThemeWindowBackground( inWindow ,inBrush , inUpdate ) ;
+    }
+    else

 #endif
 #if !TARGET_CARBON
 #endif
 #if !TARGET_CARBON

-   {
-       AGASetThemeWindowBackground( inWindow , inBrush , inUpdate ) ;
-   }
+    {
+        AGASetThemeWindowBackground( inWindow , inBrush , inUpdate ) ;
+    }

 #else
 #else

-       {
-       }
+    {
+    }

 #endif
 }
 
 #endif
 }
 


@@ -612,15 +643,15 @@ void                      UMAApplyThemeBackground                 (ThemeBackgroundKind    inKind,
 #endif
 }
 
 #endif
 }
 

-ControlHandle UMANewControl(WindowPtr                          owningWindow,
-                                                                const Rect *                   boundsRect,
-                                                                ConstStr255Param               controlTitle,
-                                                                Boolean                                initiallyVisible,
-                                                                SInt16                                 initialValue,
-                                                                SInt16                                 minimumValue,
-                                                                SInt16                                 maximumValue,
-                                                                SInt16                                 procID,
-                                                                SInt32                                 controlReference)
+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
 {
        ControlHandle theControl = NULL ;
 #if UMA_USE_APPEARANCE


@@ -645,73 +676,64 @@ ControlHandle UMANewControl(WindowPtr                             owningWindow,
 
 void UMADisposeControl (ControlHandle                  theControl)
 {
 
 void UMADisposeControl (ControlHandle                  theControl)
 {

-       if ( UMAHasAppearance() )
-       {
-       ::DisposeControl( theControl ) ;
-   }
-   else
-   {
-       ::DisposeControl( theControl ) ;
-   }
+    if ( UMAHasAppearance() )
+    {
+        ::DisposeControl( theControl ) ;
+    }
+    else
+    {
+        ::DisposeControl( theControl ) ;
+    }

 }
 
 }
 

-
-void UMAHiliteControl  (ControlHandle                  theControl,
-                                                                ControlPartCode                hiliteState)
-                                                                {
-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(theControl) , updateRgn ) ;
-       if ( UMAHasAppearance() )
-       {
-       ::HiliteControl( theControl , hiliteState ) ;
-   }
-   else
-   {
-       ::HiliteControl( theControl , hiliteState ) ;
-       }
-                       InvalRgn( updateRgn ) ;
+void UMAHiliteControl  (ControlHandle                  inControl,
+                        ControlPartCode                hiliteState)
+{
+    if ( UMAHasAppearance() )
+    {
+        ::HiliteControl( inControl , hiliteState ) ;
+    }
+    else
+    {
+        ::HiliteControl( inControl , hiliteState ) ;
+    }

 }
 
 }
 

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

 {
 {

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( GetControlOwner(theControl) , updateRgn ) ;
-       if ( UMAHasAppearance() )
-       {
-       ::ShowControl( theControl ) ;
-   }
-   else
-   {
-       ::ShowControl( theControl ) ;
-   }
-                       InvalRgn( updateRgn ) ;
+    if ( UMAHasAppearance() )
+    {
+        SetControlVisibility( inControl , true , false ) ;
+        Rect ctrlBounds ;
+        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+    }

 }
 
 }
 

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

 {
 {

-       if ( UMAHasAppearance() )
-       {
-               ::HideControl( theControl ) ;
-   }
-   else
-   {
-               ::HideControl( theControl ) ;
-   }
+    if ( UMAHasAppearance() )
+    {
+        ::HideControl( inControl ) ;
+    }
+    else
+    {
+        ::HideControl( inControl ) ;
+    }

 }
 
 
 void UMASetControlVisibility                   (ControlHandle                  inControl,
                                                                 Boolean                                inIsVisible,
                                                                 Boolean                                inDoDraw)
 }
 
 
 void UMASetControlVisibility                   (ControlHandle                  inControl,
                                                                 Boolean                                inIsVisible,
                                                                 Boolean                                inDoDraw)

-                                                                {
-       if ( UMAHasAppearance() )
-       {
+{
+    if ( UMAHasAppearance() )
+    {

 #if UMA_USE_APPEARANCE
 #if UMA_USE_APPEARANCE

-       ::SetControlVisibility( inControl , inIsVisible, inDoDraw ) ;
+        ::SetControlVisibility( inControl , inIsVisible, inDoDraw ) ;

 #endif
 #endif

-   }
+    }

 }
 
 
 }
 
 


@@ -740,7 +762,13 @@ bool UMAIsControlVisible                           (ControlHandle                  inControl)
        {
        return IsControlVisible( inControl ) ;
    }
        {
        return IsControlVisible( inControl ) ;
    }

+   else
+#endif
+  {
+#if !TARGET_CARBON
+    return (**inControl).contrlVis == 255 ;

 #endif
 #endif

+  }

        return true ;
 }
 
        return true ;
 }
 


@@ -938,24 +966,37 @@ void UMAIdleControls                                      (WindowPtr                              inWindow)
 
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
 {
 
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
 {

-                       RgnHandle updateRgn = NewRgn() ;
-                       GetWindowUpdateRgn( inWindow , updateRgn ) ;
+    RgnHandle updateRgn = NewRgn() ;
+#if TARGET_CARBON
+    GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) ;
+#else
+    GetWindowUpdateRgn( inWindow , updateRgn ) ;
+#endif
+       Point zero = { 0 , 0 } ;
+       LocalToGlobal( &zero ) ;
+       OffsetRgn( updateRgn , -zero.h , -zero.v ) ;

 #if UMA_USE_APPEARANCE
 #if UMA_USE_APPEARANCE

-       if ( UMAHasAppearance() )
-       {
-               UpdateControls( inWindow , inRgn ) ;
-       }
-       else
+    if ( UMAHasAppearance() )
+    {
+        UpdateControls( inWindow , inRgn ) ;
+    }
+    else

 #endif
 #if !TARGET_CARBON
 #endif
 #if !TARGET_CARBON

-       {
-               AGAUpdateControls( inWindow , inRgn ) ;
-       }
+    {
+        AGAUpdateControls( inWindow , inRgn ) ;
+    }

 #else
 #else

-       {
-       }
+    {
+    }
+#endif
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0332)
+    InvalWindowRgn( inWindow, updateRgn) ;
+#else
+    InvalRgn( updateRgn ) ;

 #endif
 #endif

-                       InvalRgn( updateRgn ) ;
+       DisposeRgn( updateRgn ) ;
+

 }
 
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) 
 }
 
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) 


@@ -1424,5 +1465,6 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   {
   }
 #endif
   {
   }
 #endif

+  return noErr ;

 }
 
 }