Adium

Changeset 15334

Show
Ignore:
Timestamp:
02/24/2006 04:18:18 PM (3 years ago)
Author:
catfish_man
Message:

Removing some 10.2 compatibility code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/AIUtilities Framework/Source/AIAutoScrollView.h

    r9732 r15334  
    1919 * 
    2020 * This <tt>NSScrollView</tt> subclass adds: 
    21  *       - Automatic scrolling as text is added and automatic hiding of the scroll bar, even on 10.2 (these features were added in 10.3) 
    2221 *       - Methods to scroll to the top and bottom of the view 
    2322 *       - Key press forwarding to the document view 
    …… 
    3029        BOOL                    inAutoScrollToBottom; 
    3130 
    32     BOOL                        autoHideScrollBar; 
    33  
    3431        BOOL                    passKeysToDocumentView; 
    3532 
    …… 
    3835        NSResponder             *lastResp; 
    3936} 
    40  
    41 /*! 
    42  * @brief Set if the scroll bar should be automatically hidden and shown as necessary 
    43  * 
    44  * If YES, the scroll bar will be hidden when it is not needed and automatically shown when the document view exceeds the frame available for its display. The default value is NO. 
    45  * @param inValue YES if the scroll bar should be automatically hidden; NO if not. 
    46  */ 
    47 - (void)setAutoHideScrollBar:(BOOL)inValue; 
    4837 
    4938/*! 

  • trunk/Frameworks/AIUtilities Framework/Source/AIAutoScrollView.m

    r12862 r15334  
    2020@interface AIAutoScrollView (PRIVATE) 
    2121- (void)_initAutoScrollView; 
    22 - (void)setCorrectScrollbarVisibility; 
    2322@end 
    2423 
    …… 
    2928 
    3029    - Automatically scrolls to bottom on new content 
    31     - Automatically hides & shows the vertical scroller depending on content height (including on 10.2) 
    3230        - Shows a focus ring even if the contained view would not normally show one (an NSTextView, for example) 
    3331 */ 
    …… 
    5452    autoScrollToBottom = NO; 
    5553        inAutoScrollToBottom = NO; 
    56     autoHideScrollBar = NO; 
    5754        passKeysToDocumentView = NO; 
    5855         
    …… 
    6259        shouldDrawFocusRing = NO; 
    6360         
    64     [self setAutoHideScrollBar:YES]; 
     61    [self setAutohidesScrollers:YES]; 
    6562} 
    6663 
    …… 
    146143} 
    147144 
    148 //Called as the view resizes or scrolls 
    149 - (void)reflectScrolledClipView:(NSClipView *)cView 
    150 { 
    151     [super reflectScrolledClipView:cView]; 
    152  
    153     //Set our correct scrollbar visibility 
    154     if (autoHideScrollBar) { 
    155         [self setCorrectScrollbarVisibility]; 
    156     } 
    157 } 
    158  
    159145//Scroll to the top of our view 
    160146- (void)scrollToTop 
    …… 
    167153{ 
    168154    [[self documentView] scrollPoint:NSMakePoint(0, 1000000)]; 
    169 } 
    170  
    171  
    172 //Automatic scrollbar hiding --------------------------------------------------------------- 
    173 #pragma mark Automatic scrollbar hiding 
    174 - (void)setAutoHideScrollBar:(BOOL)inValue 
    175 { 
    176     autoHideScrollBar = inValue; 
    177      
    178     if (autoHideScrollBar) [self setCorrectScrollbarVisibility]; 
    179 } 
    180  
    181 //Hides or shows the scrollbar as necessary 
    182 - (void)setCorrectScrollbarVisibility 
    183 { 
    184     float       visibleHeight =  [self documentVisibleRect].size.height; 
    185     float         totalHeight = [[self documentView] frame].size.height; 
    186  
    187     //Hide or show scrollbar 
    188     if (totalHeight > visibleHeight) { 
    189         if (![self hasVerticalScroller]) [self setHasVerticalScroller:YES]; 
    190     } else { 
    191         if ( [self hasVerticalScroller]) [self setHasVerticalScroller:NO]; 
    192     } 
    193155} 
    194156 

  • trunk/Plugins/Logger/AILogViewerWindowController.h

    r12010 r15334  
    3939    IBOutlet    NSTextView                  *textView_content; 
    4040    IBOutlet    id                          searchField_logs;       //May be an NSSearchField or an NSTextField 
    41     IBOutlet    NSPopUpButton               *popUp_jagSearchMode;   //Used in the jag log viewer to select search mode 
    4241    IBOutlet    NSProgressIndicator         *progressIndicator; 
    4342    IBOutlet    NSTextField                 *textField_progress; 

  • trunk/Plugins/Logger/AILogViewerWindowController.m

    r15227 r15334  
    11651165    [cellMenu addItem:[self _menuItemWithTitle:TO forSearchMode:LOG_SEARCH_TO]]; 
    11661166    [cellMenu addItem:[self _menuItemWithTitle:DATE forSearchMode:LOG_SEARCH_DATE]]; 
    1167     if (!popUp_jagSearchMode) [cellMenu addItem:[self _menuItemWithTitle:CONTENT forSearchMode:LOG_SEARCH_CONTENT]]; //Not in jag 
    1168      
    1169     //In 10.2 we use a popup button here, later we use the search field's embedded menu 
    1170     if (popUp_jagSearchMode) { 
    1171                 [popUp_jagSearchMode setMenu:cellMenu]; 
    1172                 [popUp_jagSearchMode selectItem:[cellMenu itemWithTag:searchMode]]; 
    1173     } else { 
    1174                 [[searchField_logs cell] setSearchMenuTemplate:cellMenu]; 
    1175     } 
     1167    [cellMenu addItem:[self _menuItemWithTitle:CONTENT forSearchMode:LOG_SEARCH_CONTENT]]; 
    11761168} 
    11771169 

  • trunk/Source/AIInterfaceController.h

    r14153 r15334  
    119119//Identifiers for the various message views 
    120120typedef enum { 
    121         DCStandardMessageView = 1,      //10.2 only, unless webkit is not available 
     121        DCStandardMessageView = 1,      //webkit is not available 
    122122        DCWebkitMessageView                     //Preferred message view 
    123123} DCMessageViewType; 

  • trunk/Source/ESFastUserSwitchingSupportPlugin.m

    r14882 r15334  
    106106 * 
    107107 * Calling this with (notification == nil) is the same as when the user switches back. 
    108  * Do not call this method in OS X 10.2.x. 
    109108 * 
    110109 * @param notification The notification has a name NSWorkspaceSessionDidResignActiveNotification when the user switches away and NSWorkspaceSessionDidBecomeActiveNotification when the user switches back.