Mercurial > dwindows

comparison mac/dw.m @ 1905:0d67f00866b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A few more warning fixes for OS X 10.10, and a bug fix for the new mac dw_messagebox() code.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 20 Mar 2015 13:48:42 +0000
parents 2e456850e027
children fac81560eb09
comparison
equal deleted inserted replaced
1904:2e456850e027 1905:0d67f00866b7
3140 NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease]; 3140 NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
3141 3141
3142 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""]; 3142 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
3143 NSMenu * menu = [[[NSMenu alloc] initWithTitle:@"Apple"] autorelease]; 3143 NSMenu * menu = [[[NSMenu alloc] initWithTitle:@"Apple"] autorelease];
3144 3144
3145 #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
3145 [DWApp performSelector:@selector(setAppleMenu:) withObject:menu]; 3146 [DWApp performSelector:@selector(setAppleMenu:) withObject:menu];
3147 #endif
3146 3148
3147 /* Setup the Application menu */ 3149 /* Setup the Application menu */
3148 NSMenuItem * item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"About", nil), applicationName] 3150 NSMenuItem * item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"About", nil), applicationName]
3149 action:@selector(orderFrontStandardAboutPanel:) 3151 action:@selector(orderFrontStandardAboutPanel:)
3150 keyEquivalent:@""]; 3152 keyEquivalent:@""];
3416 [alert setAlertStyle:NSInformationalAlertStyle]; 3418 [alert setAlertStyle:NSInformationalAlertStyle];
3417 else 3419 else
3418 [alert setAlertStyle:NSWarningAlertStyle]; 3420 [alert setAlertStyle:NSWarningAlertStyle];
3419 3421
3420 iResponse = [alert runModal]; 3422 iResponse = [alert runModal];
3423 [alert release];
3421 3424
3422 switch(iResponse) 3425 switch(iResponse)
3423 { 3426 {
3424 case NSAlertFirstButtonReturn: /* user pressed OK */ 3427 case NSAlertFirstButtonReturn: /* user pressed OK */
3425 if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL) 3428 if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL)
4714 else 4717 else
4715 { 4718 {
4716 scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)]; 4719 scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)];
4717 } 4720 }
4718 [scrollbar setArrowsPosition:NSScrollerArrowsDefaultSetting]; 4721 [scrollbar setArrowsPosition:NSScrollerArrowsDefaultSetting];
4719 [scrollbar setTarget:scrollbar];
4720 [scrollbar setAction:@selector(changed:)];
4721 [scrollbar setRange:0.0 andVisible:0.0]; 4722 [scrollbar setRange:0.0 andVisible:0.0];
4722 [scrollbar setKnobProportion:1.0]; 4723 [scrollbar setKnobProportion:1.0];
4723 [scrollbar setTarget:scrollbar]; 4724 [scrollbar setTarget:scrollbar];
4724 [scrollbar setAction:@selector(scrollerChanged:)]; 4725 [scrollbar setAction:@selector(scrollerChanged:)];
4725 [scrollbar setTag:cid]; 4726 [scrollbar setTag:cid];