Ticket #51116: patch-ipe-older-osx-versions.diff

ipe/Makefile

@@ -51 +51 @@
 nib = $(RESOURCEDIR)/mainmenu.nib
 
 $(nib): mainmenu.xib
+        $(INSTALL_DIR) $(RESOURCEDIR)
         ibtool --compile $(nib) mainmenu.xib
 
 else

ipe/appui_cocoa.cpp

@@ -339 +339 @@
   return t;
 }
 
-- (NSArray<NSString *> *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
+- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
 {
   return @[ @"copy", @"cut", @"paste", @"delete", @"undo", @"redo",
             @"zoom_in", @"zoom_out", @"fit_objects", @"fit_page",
@@ -357 +357 @@
            ];
 }
 
-- (NSArray<NSString *> *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
+- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
 {
   return @[ @"mode_select", @"mode_translate", @"mode_rotate",
             @"mode_stretch", @"mode_pan", @"mode_shredder",
@@ -585 +585 @@
   iLayerBox = [[NSBox alloc] initWithFrame:subRect];
   iLayerBox.title = @"Layers";
 
-  NSRect layerFrame = iLayerBox.contentView.frame;
+  NSRect layerFrame = [iLayerBox.contentView frame];
   iLayerView = [[IpeLayerView alloc] initWithFrame:layerFrame];
   iLayerView.delegate = iDelegate;
   iLayerView.toolTip = @"Layers of this page";
@@ -921 +921 @@
   NSString *prefix = I2N(name);
   for (NSString *action in iActions) {
     if ([action hasPrefix:prefix])
-      iActions[action].state = NO;
+      ((IpeAction *)iActions[action]).state = NO;
   }
-  iActions[I2N(name + value)].state = YES;
+  ((IpeAction *)iActions[I2N(name + value)]).state = YES;
 }
 
 void AppUi::setLayers(const Page *page, int view)
@@ -955 +955 @@
 BOOL AppUi::validateMenuItem(NSMenuItem *item, NSString *name)
 {
   if ([name isEqualToString:@"snapbar"]) {
-    item.title = iSnapBar.hidden ? @"Show Snap Toolbar" :
+    item.title = [iSnapBar isHidden] ? @"Show Snap Toolbar" :
       @"Hide Snap Toolbar";
     return YES;
   }
   IpeAction *s = findAction(name);
   if (s) {
     if ([name isEqualToString:@"toggle_notes"])
-      s.state = (iNotesPanel && iNotesPanel.visible);
+      s.state = (iNotesPanel && [iNotesPanel isVisible]);
     else if ([name isEqualToString:@"toggle_bookmarks"])
-      s.state = (iBookmarksPanel && iBookmarksPanel.visible);
+      s.state = (iBookmarksPanel && [iBookmarksPanel isVisible]);
     [item setState:(s.state ? NSOnState : NSOffState)];
     return actionsEnabled() || s.alwaysOn;
   }
@@ -1024 +1024 @@
 
 void AppUi::toggleSnapbarShown()
 {
-  iSnapBar.hidden = !iSnapBar.hidden;
-  if (iSnapBar.hidden) {
+  iSnapBar.hidden = ![iSnapBar isHidden];
+  if ([iSnapBar isHidden]) {
     activateConstraint(iViewToSnapBar, NO);
     activateConstraint(iViewToTop, YES);
   } else {

ipe/appui_cocoa.h

@@ -112 +112 @@
   virtual void setButtonColor(int sel, Color color) override;
 
 private:
-  NSMutableDictionary <NSString *, IpeAction *> *iActions;
+  NSMutableDictionary *iActions; // <NSString *, IpeAction *>
   bool iActionsEnabled;
   bool iInUiUpdate;
   NSWindow *iWindow;

ipe/controls_cocoa.cpp

@@ -229 +229 @@
 
 @implementation IpeLayerView {
   NSTableView *iTV;
-  NSMutableArray <IpeLayerItem *> *iLayers;
+  NSMutableArray *iLayers; // <IpeLayerItem *>
 }
 
 - (instancetype) initWithFrame:(NSRect) rect
@@ -283 +283 @@
 - (void) ipeLayerToggled:(id) sender
 {
   int row = [sender tag];
-  if (iLayers[row].checked)
-    [self.delegate layerAction:@"selectoff" forLayer:iLayers[row].name];
+  if (((IpeLayerItem *)iLayers[row]).checked)
+    [self.delegate layerAction:@"selectoff" forLayer:((IpeLayerItem *)iLayers[row]).name];
   else
-    [self.delegate layerAction:@"selecton" forLayer:iLayers[row].name];
+    [self.delegate layerAction:@"selecton" forLayer:((IpeLayerItem *)iLayers[row]).name];
 }
 
 - (void) ipeLayerClicked:(int) row
 {
-  [self.delegate layerAction:@"active" forLayer:iLayers[row].name];
+  [self.delegate layerAction:@"active" forLayer:((IpeLayerItem *)iLayers[row]).name];
 }
 
 - (void) ipeLayerMenuAt:(NSPoint) p forRow:(int) row
 {
-  [self.delegate layerMenuAt:p forLayer:iLayers[row].name];
+  [self.delegate layerMenuAt:p forLayer:((IpeLayerItem *)iLayers[row]).name];
 }
 
 - (NSInteger) numberOfRowsInTableView:(NSTableView *) tv
@@ -309 +309 @@
              row:(NSInteger)row
 {
   if ([[col identifier] isEqualToString:@"checks"])
-    return [NSNumber numberWithBool:iLayers[row].checked];
+    return [NSNumber numberWithBool:((IpeLayerItem *)iLayers[row]).checked];
   else
-    return iLayers[row].name;
+    return ((IpeLayerItem *)iLayers[row]).name;
 }
 
 - (NSView *) tableView:(NSTableView *) tv
@@ -328 +328 @@
     [result setAction:@selector(ipeLayerToggled:)];
     [result setTarget:self];
     [result setTag:row];
-    [result setState:iLayers[row].checked];
+    [result setState:((IpeLayerItem *)iLayers[row]).checked];
     return result;
   } else {
     IpeLayerField *result = [tv makeViewWithIdentifier:@"LayerName" owner:self];
@@ -349 +349 @@
 
 @implementation IpeBookmarksView {
   NSTableView *iTV;
-  NSMutableArray <NSString *> *iBookmarks;
+  NSMutableArray *iBookmarks; // <NSString *>
 }
 
 - (instancetype) initWithFrame:(NSRect) rect

ipe/main_cocoa.cpp

@@ -72 +72 @@
                   IPELIB_VERSION % 100);
   lua_setfield(L, -2, "version");
 
-  NSArray <NSString *> *args = [[NSProcessInfo processInfo] arguments];
+  NSArray *args = [[NSProcessInfo processInfo] arguments];
   int argc = [args count];
   lua_createtable(L, 0, argc - 1);
   for (int i = 1; i < argc; ++i) {

ipe/pagesorter_cocoa.cpp

@@ -131 +131 @@
 @interface IpePageSorterDelegate : NSObject <NSWindowDelegate,
                                                NSCollectionViewDelegate>
 
-@property NSMutableArray <IpeSelectorItem *> *pages;
+@property NSMutableArray *pages; // <IpeSelectorItem *>
 @property (assign) NSCollectionView *cv;
 
 - (void) ipeAccept;
@@ -249 +249 @@
   }
 
   NSScrollView *scroll =
-    [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
+    [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
   scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
   scroll.hasVerticalScroller = YES;
 
@@ -326 +326 @@
     int n = [delegate.pages count];
     lua_createtable(L, n, 0);
     for (int i = 1; i <= n; ++i) {
-      lua_pushinteger(L, delegate.pages[i-1].index + 1);
+      lua_pushinteger(L, ((IpeSelectorItem *)delegate.pages[i-1]).index + 1);
       lua_rawseti(L, -2, i);
     }
     return 1;

ipecanvas/ipecanvas_cocoa.cpp

@@ -45 +45 @@
 
 static CGContextRef gc_cgcontext()
 {
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
   return [[NSGraphicsContext currentContext] CGContext];
+  #else
+  return nil;
+  #endif
 }
 
 CGContextRef ipeGetCGContext()
 {
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
   if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
-    return gc_cgcontext();
-  else
-    return gc_graphics_port();
+    return [[NSGraphicsContext currentContext] CGContext];
+  #endif
+  return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
 }
 
 // --------------------------------------------------------------------
@@ -63 +68 @@
   iView = view;
   iLayer = NULL;
 
+  iGCGetter = gc_graphics_port;
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
   if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
     iGCGetter = gc_cgcontext;
-  else
-    iGCGetter = gc_graphics_port;
+  #endif
 }
 
 Canvas::~Canvas()

ipecanvas/ipeselector_cocoa.cpp

@@ -241 +241 @@
   }
 
   NSScrollView *scroll =
-    [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
+    [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
   scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
   scroll.hasVerticalScroller = YES;
   panel.contentView = scroll;

ipeui/ipeui_cocoa.cpp

@@ -52 +52 @@
 
 CGContextRef ipeGetCGContext()
 {
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
   if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
     return [[NSGraphicsContext currentContext] CGContext];
-  else
-    return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
+  #endif
+  return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
 }
 
 // --------------------------------------------------------------------
@@ -83 +84 @@
 
 id layoutGuide(NSView *owner)
 {
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
   if ([owner respondsToSelector:@selector(addLayoutGuide:)]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -90 +92 @@
     [owner addLayoutGuide:g];
 #pragma clang diagnostic pop
     return g;
-  } else {
-    NSView *g = [[NSView alloc] initWithFrame:NSZeroRect];
-    addToLayout(owner, g);
-    return g;
   }
+  #endif
+  NSView *g = [[NSView alloc] initWithFrame:NSZeroRect];
+  addToLayout(owner, g);
+  return g;
 }
 
 static NSLayoutAttribute layoutAttribute(char ch)
@@ -138 +140 @@
 {
   if ([a respondsToSelector:@selector(superview)])
     return [a superview];
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
   if ([a respondsToSelector:@selector(owningView)])
     return [a owningView];  // is a layout guide
+  #endif
   return nil;
 }
 
 void activateConstraint(NSLayoutConstraint *c, BOOL active)
 {
+  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
   if ([c respondsToSelector:@selector(setActive:)]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     c.active = active;
+    return;
 #pragma clang diagnostic pop
-  } else {
-    // need to figure out lowest common ancestor
-    id a = c.firstItem;
-    id b = c.secondItem;
-    NSView *lca = nil;
-    NSView *ao = owner(a);
-    NSView *bo = owner(b);
-    if (b == nil)
-      lca = a;
-    else if (ao == b)
-      lca = b;
-    else if (bo == a)
-      lca = a;
-    else {
-      assert(ao == bo);
-      lca = ao;
-    }
-    if (active)
-      [lca addConstraint:c];
-    else
-      [lca removeConstraint:c];
   }
+  #endif
+  // need to figure out lowest common ancestor
+  id a = c.firstItem;
+  id b = c.secondItem;
+  NSView *lca = nil;
+  NSView *ao = owner(a);
+  NSView *bo = owner(b);
+  if (b == nil)
+    lca = a;
+  else if (ao == b)
+    lca = b;
+  else if (bo == a)
+    lca = a;
+  else {
+    assert(ao == bo);
+    lca = ao;
+  }
+  if (active)
+    [lca addConstraint:c];
+  else
+    [lca removeConstraint:c];
 }
 
 NSLayoutConstraint *layout(id a, id b, const char *rel, double gap,
@@ -253 +259 @@
 private:
   NSPanel *iPanel;
   IpeDialogDelegate *iDelegate;
-  NSMutableArray <NSView *> *iViews;
+  NSMutableArray *iViews; // <NSView *>
 };
 
 // --------------------------------------------------------------------