added correct pen styles for wxDOT etc as well as wxSTIPPLE implementation for 8x8...

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 25a90e1ec5d7beb975cca976ec11a5122100d15d..f76e81511428597c83918b020a73c7e74300a29f 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -15,8 +15,10 @@
 
 #define wxUSE_MLTE 0
 
 
 #define wxUSE_MLTE 0
 

+

 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;

+static bool sUMAHasAquaLayout = false ;

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


@@ -26,6 +28,8 @@ static long sUMAWindowManagerAttr = 0 ;
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }

+bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
+

 
 void UMACleanupToolbox()
 {
 
 void UMACleanupToolbox()
 {


@@ -104,6 +108,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   defaults.encoding = kTXNSystemDefaultEncoding;
        TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
 #endif
   defaults.encoding = kTXNSystemDefaultEncoding;
        TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
 #endif

+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
+

 }
 
 // process manager
 }
 
 // process manager


@@ -497,7 +506,6 @@ OSErr UMASetKeyboardFocus                           (WindowPtr                              inWindow,
 
        SetPortWindowPort( inWindow ) ;
 
 
        SetPortWindowPort( inWindow ) ;
 

-       SetOrigin( 0 , 0 ) ;

   err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
        SetPort( port ) ;
        return err ;
   err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
        SetPort( port ) ;
        return err ;


@@ -549,7 +557,6 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
                GrafPtr port ;
                GetPort( &port ) ;
                SetPortWindowPort( inWindowRef ) ;
                GrafPtr port ;
                GetPort( &port ) ;
                SetPortWindowPort( inWindowRef ) ;

-               SetOrigin( 0 , 0 ) ;

                HiliteWindow( inWindowRef , inActivate ) ;
                ControlHandle control = NULL ;
                ::GetRootControl( inWindowRef , & control ) ;
                HiliteWindow( inWindowRef , inActivate ) ;
                ControlHandle control = NULL ;
                ::GetRootControl( inWindowRef , & control ) ;