gcc pragmas fixes

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index f76e81511428597c83918b020a73c7e74300a29f..c9342a3947819817e6d340e8800f32428478b0ee 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -4,7 +4,15 @@
 #include <MacTextEditor.h>
 
 #ifndef __DARWIN__
-  #include <Navigation.h>
+#  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
@@ -19,6 +27,8 @@
 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 ; }
@@ -29,7 +39,7 @@ static long sUMAWindowManagerAttr = 0 ;
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
-
+bool UMASystemIsInitialized() { return sUMASystemInitialized ; }
 
 void UMACleanupToolbox()
 {
@@ -84,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                
-#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
@@ -92,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                InitFloatingWindows() ;
        else
                InitWindows();
-#endif
 #endif
 
        if ( NavServicesAvailable() )
@@ -112,9 +120,18 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
+  sUMASystemInitialized = true ;
 
 }
 
+/*
+Boolean CanUseATSUI()
+       {
+       long result;
+       OSErr err = Gestalt(gestaltATSUVersion, &result);
+       return (err == noErr);
+       }
+*/
 // process manager
 long UMAGetProcessMode() 
 {
@@ -142,6 +159,7 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch()
 
 void UMASetMenuTitle( MenuRef menu , StringPtr title )
 {
+/*
 #if !TARGET_CARBON
        long                    size = GetHandleSize( (Handle) menu ) ;
        const long              headersize = 14 ;
@@ -164,8 +182,9 @@ void UMASetMenuTitle( MenuRef menu , StringPtr title )
                SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
        }
 #else
+*/
        SetMenuTitle( menu , title ) ;
-#endif
+//#endif
 }
 
 UInt32 UMAMenuEvent( EventRecord *inEvent )
@@ -251,11 +270,7 @@ void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16
 
 int gPrOpenCounter = 0 ;
 
-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrOpen()
-#endif
+OSStatus UMAPrOpen(void *macPrintSession)
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
@@ -273,7 +288,7 @@ OSStatus UMAPrOpen()
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
-           err = PMCreateSession(macPrintSession) ;
+           err = PMCreateSession((PMPrintSession *)macPrintSession) ;
   #else
            err = PMBegin() ;
   #endif
@@ -283,11 +298,7 @@ OSStatus UMAPrOpen()
 #endif
 }
 
-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrClose(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrClose()
-#endif
+OSStatus UMAPrClose(void *macPrintSession)
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
@@ -306,8 +317,8 @@ OSStatus UMAPrClose()
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
-           err = PMRelease(*macPrintSession) ;
-           *macPrintSession = kPMNoReference;
+           err = PMRelease(*(PMPrintSession *)macPrintSession) ;
+           *(PMPrintSession *)macPrintSession = kPMNoReference;
   #else
            err = PMEnd() ;
   #endif
@@ -366,7 +377,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 
 #else
        return (GrafPtr) inWindowRef ;
 #endif
@@ -575,9 +586,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
+#if !TARGET_CARBON
 static OSStatus helpMenuStatus = noErr ;
-static MenuRef helpMenuHandle = NULL ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
+#endif
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
@@ -586,13 +598,11 @@ OSStatus UMAGetHelpMenu(
 #if TARGET_CARBON
   return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
 #else
-  if ( helpMenuHandle == NULL )
+  MenuRef helpMenuHandle ;
+  helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
+  if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
   {
-    helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
-    if ( helpMenuStatus == noErr )
-    {
-      firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-    }
+    firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
   }
   if ( outFirstCustomItemIndex )
   {
@@ -602,3 +612,55 @@ OSStatus UMAGetHelpMenu(
   return helpMenuStatus ;
 #endif
 }
+
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) 
+{
+  m_clip = NULL ;
+  Setup( newport ) ;
+}
+
+wxMacPortStateHelper::wxMacPortStateHelper()
+{
+       m_clip = NULL ;
+}
+
+void wxMacPortStateHelper::Setup( GrafPtr newport )
+{
+       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 ;
+}
+void wxMacPortStateHelper::Clear()
+{
+       if ( m_clip )
+       {
+               DisposeRgn( m_clip ) ;
+               DisposeThemeDrawingState( m_drawingState ) ;
+               m_clip = NULL ;
+       }
+}
+
+wxMacPortStateHelper::~wxMacPortStateHelper()
+{
+       if ( m_clip )
+       {
+               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 ) ;
+       }
+}
+