Mercurial > dwindows

changeset 2184:8f9a44279ff0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: Add DW_USE_NSVIEW define for enabling NSView based controls. This makes it easier to change which OS versions are enabling it rather than using the YOSEMITE define.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 14 Oct 2020 03:27:02 +0000
parents c7713d96e5a9
children 2a52d9fc2de4
files mac/dw.m
diffstat 1 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Wed Oct 14 01:06:21 2020 +0000
+++ b/mac/dw.m	Wed Oct 14 03:27:02 2020 +0000
@@ -52,6 +52,7 @@
 #define DWCalendarUnitYear NSCalendarUnitYear
 #define DWCalendarIdentifierGregorian NSCalendarIdentifierGregorian
 #define BUILDING_FOR_YOSEMITE
+#define DW_USE_NSVIEW
 #else
 #define DWModalResponseOK NSOKButton
 #define DWModalResponseCancel NSCancelButton
@@ -2238,7 +2239,7 @@
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 
-#ifndef BUILDING_FOR_YOSEMITE
+#ifndef DW_USE_NSVIEW
 /* Subclass NSTextFieldCell for displaying image and text */
 @interface DWImageAndTextCell : NSTextFieldCell
 {
@@ -2359,7 +2360,7 @@
 @end
 #endif
 
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
 NSTableCellView *_dw_table_cell_view_new(NSImage *icon, NSString *text)
 {
     NSTableCellView *browsercell = [[[NSTableCellView alloc] init] autorelease];
@@ -2465,7 +2466,7 @@
 -(void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn;
 -(void)selectionChanged:(id)sender;
 -(NSMenu *)menuForEvent:(NSEvent *)event;
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
 -(void)tableView:(NSTableView *)tableView didAddRowView:(NSTableRowView *)rowView forRow:(NSInteger)row;
 -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
 #else
@@ -2616,7 +2617,7 @@
     }
     return 0;
 }
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
 -(void)tableView:(NSTableView *)tableView didAddRowView:(NSTableRowView *)rowView forRow:(NSInteger)row
 {
     /* Handle drawing alternating row colors if enabled */
@@ -2812,7 +2813,7 @@
 
                 for(x=0;x<rowcount;x++)
                 {
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
                     NSTableCellView *cell = [self viewAtColumn:z row:x makeIfNecessary:YES];
                     int thiswidth = 4, thisheight = 0;
                     
@@ -2892,7 +2893,7 @@
 
                     for(x=0;x<rowcount;x++)
                     {
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
                         NSTableCellView *cell = [self viewAtColumn:z row:x makeIfNecessary:YES];
                         int thiswidth = 4;
                         
@@ -3083,7 +3084,7 @@
 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
 -(NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item;
 #else
 -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
@@ -3110,7 +3111,7 @@
     if (self)
     {
         treecol = [[NSTableColumn alloc] initWithIdentifier:@"_DWTreeColumn"];
-#ifndef BUILDING_FOR_YOSEMITE
+#ifndef DW_USE_NSVIEW
         DWImageAndTextCell *browsercell = [[[DWImageAndTextCell alloc] init] autorelease];
         [treecol setDataCell:browsercell];
 #endif
@@ -3156,7 +3157,7 @@
         return data ? (int)[data count] : 0;
     }
 }
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
 -(NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {
     NSTableCellView *view = [outlineView makeViewWithIdentifier:[tableColumn identifier] owner:self];
@@ -7536,7 +7537,7 @@
     {
         NSString *title = [NSString stringWithUTF8String:titles[z]];
         NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:title];
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
         [column setTitle:title];
 #else
         [[column headerCell] setStringValue:title];
@@ -7556,14 +7557,14 @@
         /* Defaults to left justified so just handle right and center */
         if(flags[z] & DW_CFA_RIGHT)
         {
-#ifndef BUILDING_FOR_YOSEMITE
+#ifndef DW_USE_NSVIEW
             [(NSCell *)[column dataCell] setAlignment:DWTextAlignmentRight];
 #endif
             [(NSCell *)[column headerCell] setAlignment:DWTextAlignmentRight];
         }
         else if(flags[z] & DW_CFA_CENTER)
         {
-#ifndef BUILDING_FOR_YOSEMITE
+#ifndef DW_USE_NSVIEW
             [(NSCell *)[column dataCell] setAlignment:DWTextAlignmentCenter];
 #endif
             [(NSCell *)[column headerCell] setAlignment:DWTextAlignmentCenter];
@@ -7717,7 +7718,7 @@
         }
     }
 
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
     object = _dw_table_cell_view_new(icon, text);
 #else
     object = icon ? icon : text;
@@ -7784,7 +7785,7 @@
 {
     DW_FUNCTION_INIT;
     DWContainer *cont = handle;
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
     NSTableCellView *browsercell;
 #else
     DWImageAndTextCell *browsercell;
@@ -7797,7 +7798,7 @@
         lastadd = [cont lastAddPoint];
     }
 
-#ifdef BUILDING_FOR_YOSEMITE
+#ifdef DW_USE_NSVIEW
     browsercell = _dw_table_cell_view_new(icon, [NSString stringWithUTF8String:filename]);
 #else
     browsercell = [[[DWImageAndTextCell alloc] init] autorelease];