| saldata.cxx (245318c3) | saldata.cxx (dbfe0a54) |
|---|---|
| 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 40 unchanged lines hidden (view full) --- 49 mpStatusItem( nil ), 50 mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ), 51 mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ), 52 mxP50Space( NULL ), 53 mxP50Pattern( NULL ), 54 maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), 55 mbIsScrollbarDoubleMax( false ), 56 mnSystemVersion( OSX_VER_LION ), | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 40 unchanged lines hidden (view full) --- 49 mpStatusItem( nil ), 50 mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ), 51 mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ), 52 mxP50Space( NULL ), 53 mxP50Pattern( NULL ), 54 maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), 55 mbIsScrollbarDoubleMax( false ), 56 mnSystemVersion( OSX_VER_LION ), |
| 57 mpMainController( NULL ), | 57 mpAppleRemoteMainController( NULL ), |
| 58 mpDockIconClickHandler( nil ), 59 mnDPIX( 0 ), 60 mnDPIY( 0 ) 61{ 62 if( s_aAutoReleaseKey == 0 ) 63 s_aAutoReleaseKey = osl_createThreadKey( releasePool ); 64} 65 --- 18 unchanged lines hidden (view full) --- 84 { 85 osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); 86 [pPool release]; 87 } 88 89 osl_destroyThreadKey( s_aAutoReleaseKey ); 90 s_aAutoReleaseKey = 0; 91 } | 58 mpDockIconClickHandler( nil ), 59 mnDPIX( 0 ), 60 mnDPIY( 0 ) 61{ 62 if( s_aAutoReleaseKey == 0 ) 63 s_aAutoReleaseKey = osl_createThreadKey( releasePool ); 64} 65 --- 18 unchanged lines hidden (view full) --- 84 { 85 osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); 86 [pPool release]; 87 } 88 89 osl_destroyThreadKey( s_aAutoReleaseKey ); 90 s_aAutoReleaseKey = 0; 91 } |
| 92 if ( mpMainController ) 93 [mpMainController release]; | 92 if ( mpAppleRemoteMainController ) 93 [mpAppleRemoteMainController release]; |
| 94} 95 96void SalData::ensureThreadAutoreleasePool() 97{ 98 NSAutoreleasePool* pPool = nil; 99 if( s_aAutoReleaseKey ) 100 { 101 pPool = reinterpret_cast<NSAutoreleasePool*>( osl_getThreadKeyData( s_aAutoReleaseKey ) ); --- 189 unchanged lines hidden --- | 94} 95 96void SalData::ensureThreadAutoreleasePool() 97{ 98 NSAutoreleasePool* pPool = nil; 99 if( s_aAutoReleaseKey ) 100 { 101 pPool = reinterpret_cast<NSAutoreleasePool*>( osl_getThreadKeyData( s_aAutoReleaseKey ) ); --- 189 unchanged lines hidden --- |