changeset 2293:af6beae5228c

Mac: Fix building on Leopard 10.5.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 07 Feb 2021 10:07:02 +0000
parents fa19fce045aa
children 19242334712f
files mac/dw.m
diffstat 1 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Fri Feb 05 05:56:01 2021 +0000
+++ b/mac/dw.m	Sun Feb 07 10:07:02 2021 +0000
@@ -21,7 +21,10 @@
 
 /* Create a define to let us know to include Snow Leopard specific features */
 #if defined(MAC_OS_X_VERSION_10_6) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) || !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
+#define DWPasteboardTypeString NSPasteboardTypeString
 #define BUILDING_FOR_SNOW_LEOPARD
+#else
+#define DWPasteboardTypeString NSStringPboardType
 #endif
 
 /* Create a define to let us know to include Lion specific features */
@@ -4545,7 +4548,7 @@
 char *dw_clipboard_get_text()
 {
     NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-    NSString *str = [pasteboard stringForType:NSPasteboardTypeString];
+    NSString *str = [pasteboard stringForType:DWPasteboardTypeString];
     if(str != nil)
     {
         return strdup([ str UTF8String ]);
@@ -4569,7 +4572,7 @@
         icc(pasteboard, scc);
     }
 
-    [pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSPasteboardTypeString];
+    [pasteboard setString:[ NSString stringWithUTF8String:str ] forType:DWPasteboardTypeString];
 }
 
 
@@ -6318,9 +6321,11 @@
     [mle setVerticallyResizable:YES];
     [mle setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
     [mle setScrollview:scrollview];
+#ifdef BUILDING_FOR_SNOW_LEOPARD
     [mle setAutomaticQuoteSubstitutionEnabled:NO];
     [mle setAutomaticDashSubstitutionEnabled:NO];
     [mle setAutomaticTextReplacementEnabled:NO];
+#endif
     /* [mle setTag:cid]; Why doesn't this work? */
     [mle autorelease];
     return mle;
@@ -6346,7 +6351,7 @@
     NSColor *fgcolor = [ts foregroundColor];
     NSFont *font = [ts font];
     NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init];
-    [attributes setObject:(fgcolor ? fgcolor : NSColor.textColor) forKey:NSForegroundColorAttributeName];
+    [attributes setObject:(fgcolor ? fgcolor : [NSColor textColor]) forKey:NSForegroundColorAttributeName];
     if(font)
         [attributes setObject:font forKey:NSFontAttributeName];
     NSAttributedString *nastr = [[NSAttributedString alloc] initWithString:nstr attributes:attributes];
@@ -6544,10 +6549,12 @@
  */
 void API dw_mle_set_auto_complete(HWND handle, int state)
 {
+#ifdef BUILDING_FOR_SNOW_LEOPARD
     DWMLE *mle = handle;
     [mle setAutomaticQuoteSubstitutionEnabled:(state & DW_MLE_COMPLETE_QUOTE ? YES : NO)];
     [mle setAutomaticDashSubstitutionEnabled:(state & DW_MLE_COMPLETE_DASH ? YES : NO)];
     [mle setAutomaticTextReplacementEnabled:(state & DW_MLE_COMPLETE_TEXT ? YES : NO)];
+#endif
 }
 
 /*
@@ -7444,9 +7451,13 @@
     {
         [array replaceObjectAtIndex:0 withObject:icon];
     }
+#ifdef BUILDING_FOR_SNOW_LEOPARD
     NSInteger row = [tree rowForItem:item];
     [tree reloadDataForRowIndexes:[NSIndexSet indexSetWithIndex:row]
                     columnIndexes:[NSIndexSet indexSetWithIndex:0]];
+#else
+	[tree reloadData];
+#endif
     DW_LOCAL_POOL_OUT;
     DW_FUNCTION_RETURN_NOTHING;
 }