From 8a8205b575e8fda5aa30fa2352a28fb57c1e0f47 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Wed, 19 Jan 2011 15:42:25 +0100 Subject: removetooltypes01: #i112600# Make changes for MacOSX to remove tools types inc VCL and other projects --- vcl/aqua/source/app/salinst.cxx | 36 ++++++++++++++++++------------------ vcl/aqua/source/app/saltimer.cxx | 6 +++--- vcl/aqua/source/app/vclnsapp.mm | 8 ++++---- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'vcl/aqua/source/app') diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 5d2fc3f00741..352396a7fb2b 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -71,9 +71,9 @@ using namespace std; using namespace ::com::sun::star; -extern BOOL ImplSVMain(); +extern sal_Bool ImplSVMain(); -static BOOL* gpbInit = 0; +static sal_Bool* gpbInit = 0; static NSMenu* pDockMenu = nil; static bool bNoSVMain = true; static bool bLeftMain = false; @@ -207,7 +207,7 @@ static void initNSApp() [NSApp activateIgnoringOtherApps: YES]; } -BOOL ImplSVMainHook( BOOL * pbInit ) +sal_Bool ImplSVMainHook( sal_Bool * pbInit ) { gpbInit = pbInit; @@ -402,7 +402,7 @@ sal_Bool SalYieldMutex::tryToAcquire() // some convenience functions regarding the yield mutex, aka solar mutex -BOOL ImplSalYieldMutexTryToAcquire() +sal_Bool ImplSalYieldMutexTryToAcquire() { AquaSalInstance* pInst = (AquaSalInstance*) GetSalData()->mpFirstInstance; if ( pInst ) @@ -513,7 +513,7 @@ void AquaSalInstance::wakeupYield() // ----------------------------------------------------------------------- -void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, USHORT nType, void* pData ) +void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ) { osl_acquireMutex( maUserEventListMutex ); maUserEvents.push_back( SalUserEvent( pFrame, pData, nType ) ); @@ -532,14 +532,14 @@ vos::IMutex* AquaSalInstance::GetYieldMutex() // ----------------------------------------------------------------------- -ULONG AquaSalInstance::ReleaseYieldMutex() +sal_uLong AquaSalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == vos::OThread::getCurrentIdentifier() ) { - ULONG nCount = pYieldMutex->GetAcquireCount(); - ULONG n = nCount; + sal_uLong nCount = pYieldMutex->GetAcquireCount(); + sal_uLong n = nCount; while ( n ) { pYieldMutex->release(); @@ -554,7 +554,7 @@ ULONG AquaSalInstance::ReleaseYieldMutex() // ----------------------------------------------------------------------- -void AquaSalInstance::AcquireYieldMutex( ULONG nCount ) +void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; while ( nCount ) @@ -601,7 +601,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; case AppExecuteSVMain: { - BOOL bResult = ImplSVMain(); + sal_Bool bResult = ImplSVMain(); if( gpbInit ) *gpbInit = bResult; [NSApp stop: NSApp]; @@ -711,7 +711,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) bool bDispatchUser = true; while( bDispatchUser ) { - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); // get one user event osl_acquireMutex( maUserEventListMutex ); @@ -752,7 +752,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) bool bHadEvent = false; do { - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: nil inMode: NSDefaultRunLoopMode dequeue: YES]; @@ -769,7 +769,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // if we had no event yet, wait for one if requested if( bWait && ! bHadEvent ) { - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); NSDate* pDt = AquaSalTimer::pRunningTimer ? [AquaSalTimer::pRunningTimer fireDate] : [NSDate distantFuture]; pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: pDt @@ -813,7 +813,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // has dispatched an event, cop out at 200 ms osl_resetCondition( maWaitingYieldCond ); TimeValue aVal = { 0, 200000000 }; - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); osl_waitCondition( maWaitingYieldCond, &aVal ); AcquireYieldMutex( nCount ); } @@ -844,7 +844,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // ----------------------------------------------------------------------- -bool AquaSalInstance::AnyInput( USHORT nType ) +bool AquaSalInstance::AnyInput( sal_uInt16 nType ) { if( nType & INPUT_APPEVENT ) { @@ -890,14 +890,14 @@ bool AquaSalInstance::AnyInput( USHORT nType ) // ----------------------------------------------------------------------- -SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, ULONG nSalFrameStyle ) +SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) { return NULL; } // ----------------------------------------------------------------------- -SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, ULONG nSalFrameStyle ) +SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { SalData::ensureThreadAutoreleasePool(); @@ -914,7 +914,7 @@ void AquaSalInstance::DestroyFrame( SalFrame* pFrame ) // ----------------------------------------------------------------------- -SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, BOOL /* bShow */ ) +SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, sal_Bool /* bShow */ ) { // SystemWindowData is meaningless on Mac OS X AquaSalObject *pObject = NULL; diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx index 724857e92a0c..9abcc18bf6af 100644 --- a/vcl/aqua/source/app/saltimer.cxx +++ b/vcl/aqua/source/app/saltimer.cxx @@ -40,7 +40,7 @@ NSTimer* AquaSalTimer::pRunningTimer = nil; bool AquaSalTimer::bDispatchTimer = false; -void ImplSalStartTimer( ULONG nMS ) +void ImplSalStartTimer( sal_uLong nMS ) { SalData* pSalData = GetSalData(); if( pSalData->mpFirstInstance->isNSAppThread() ) @@ -108,7 +108,7 @@ void AquaSalTimer::handleStartTimerEvent( NSEvent* pEvent ) // timer already elapsed since event posted pSVData->mpSalTimer->CallCallback(); } - ImplSalStartTimer( ULONG( [pEvent data1] ) ); + ImplSalStartTimer( sal_uLong( [pEvent data1] ) ); } } @@ -122,7 +122,7 @@ AquaSalTimer::~AquaSalTimer() ImplSalStopTimer(); } -void AquaSalTimer::Start( ULONG nMS ) +void AquaSalTimer::Start( sal_uLong nMS ) { ImplSalStartTimer( nMS ); } diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index 06af0358c52b..7d6e1839fc17 100755 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -287,7 +287,7 @@ return AquaSalInstance::GetDynamicDockMenu(); } --(MacOSBOOL)application: (NSApplication*)app openFile: (NSString*)pFile +-(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile { const rtl::OUString aFile( GetOUString( pFile ) ); if( ! AquaSalInstance::isOnCommandLine( aFile ) ) @@ -328,7 +328,7 @@ } } --(MacOSBOOL)application: (NSApplication*)app printFile: (NSString*)pFile +-(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile { const rtl::OUString aFile( GetOUString( pFile ) ); const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(), @@ -336,7 +336,7 @@ AquaSalInstance::aAppEventList.push_back( pAppEvent ); return YES; } --(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(MacOSBOOL)bShowPrintPanels +-(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels { // currently ignores print settings an bShowPrintPanels rtl::OUStringBuffer aFileList( 256 ); @@ -507,7 +507,7 @@ } } -- (MacOSBOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (MacOSBOOL) bWinVisible +- (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible { NSObject* pHdl = GetSalData()->mpDockIconClickHandler; if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] ) -- cgit