<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb4c952bc766662ea087fce8c0845571abf80d7b">https://github.com/macports/macports-ports/commit/bb4c952bc766662ea087fce8c0845571abf80d7b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bb4c952 ipe: update to 7.2.7
</span>bb4c952 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bb4c952bc766662ea087fce8c0845571abf80d7b
</span>Author: Eitan Adler <lists@eitanadler.com>
AuthorDate: Mon Dec 18 19:24:18 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> ipe: update to 7.2.7
</span>---
graphics/ipe/Portfile | 10 +-
graphics/ipe/files/patch-ipe-mainmenu.xib.diff | 176 ----------
.../ipe/files/patch-ipe-older-osx-versions.diff | 384 ---------------------
3 files changed, 4 insertions(+), 566 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/Portfile b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d04945..6082af8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup cxx11 1.0
name ipe
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.2.7
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
maintainers gmail.com:m7.thon openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,9 @@ master_sites https://dl.bintray.com/otfried/generic/ipe/${branch}
</span> distname ${name}-${version}-src
worksrcdir ${name}-${version}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 a0934e9c01487219ae4726ab1cac42cc6fd27e96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 12fdc48bf37a477b5f6dddd2f18cbdafa1dd8ca0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 58410e29c04e7a7c3978bd9afe6d25a7924bd30d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6d68ad7831923d04ba07086f3dde2be9830d756a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d66d3f2619e3e6ff617f42c2e3695c3db6e2a64adcc3d7613214e5fd14c49f22
</span>
depends_build-append path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +34,6 @@ depends_lib-append port:freetype \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ipe-mainmenu.xib.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ipe-older-osx-versions.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/files/patch-ipe-mainmenu.xib.diff b/graphics/ipe/files/patch-ipe-mainmenu.xib.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a34719f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/files/patch-ipe-mainmenu.xib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,176 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null 2016-02-18 23:10:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/mainmenu.xib 2016-02-18 23:07:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,173 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ toolsVersion="9060" systemVersion="15B42"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ useAutolayout="YES" customObjectInstantitationMethod="direct">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dependencies>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <deployment identifier="macosx"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ version="9060"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </dependencies>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <objects>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <customObject id="-2" userLabel="File's Owner"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ customClass="NSApplication">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <outlet property="delegate" destination="appdel" id="appdel-outlet"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </customObject>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <customObject id="-1" userLabel="First Responder"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ customClass="FirstResponder"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <customObject id="appdel" customClass="AppDelegate"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu title="Main Menu" systemMenu="main" id="main-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Ipe" id="apple-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Ipe" systemMenu="apple">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="About Ipe" id="about">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="aboutIpe:" target="-1" id="about-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem isSeparatorItem="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Preferences…" keyEquivalent=","
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id="preferences"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem isSeparatorItem="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Services" id="services">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Services"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ systemMenu="services" id="services-submenu"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem isSeparatorItem="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Hide Ipe" keyEquivalent="h" id="hide">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="hide:" target="-1" id="hide-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Hide Others" keyEquivalent="h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id="hide-others">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ option="YES" command="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="hideOtherApplications:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target="-1" id="hide-others-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Show All" id="show-all">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="unhideAllApplications:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target="-1" id="show-all-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="File" id="file-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="File">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Edit" id="edit-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Edit">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Properties" id="properties-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Properties">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Snap" id="snap-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Snap">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Mode" id="mode-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Mode">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Zoom" id="zoom-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Zoom">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Show Toolbar" keyEquivalent="t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id="show-toolbar">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ option="YES" command="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="toggleToolbarShown:" target="-1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id="show-toolbar-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Show Snap Toolbar" keyEquivalent="s"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id="show-snapbar">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ option="YES" command="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="toggleSnapbarShown:" target="-1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id="show-snapbar-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Customize Toolbar…" id="customize-toolbar">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <action selector="runToolbarCustomizationPalette:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target="-1" id="customize-toolbar-action"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Layers" id="layers-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Layers">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Views" id="views-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Views">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Pages" id="pages-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Pages">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Ipelets" id="ipelets-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Ipelets">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menuItem title="Help" id="help-menu">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <menu key="submenu" title="Help">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </objects>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </document>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/files/patch-ipe-older-osx-versions.diff b/graphics/ipe/files/patch-ipe-older-osx-versions.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ba62a84..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/files/patch-ipe-older-osx-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,384 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipe/Makefile ipe/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 06e07ed..6ab7658 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipe/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,7 @@ ifdef IPEUI_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nib = $(RESOURCEDIR)/mainmenu.nib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(nib): mainmenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DIR) $(RESOURCEDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ibtool --compile $(nib) mainmenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipe/appui_cocoa.cpp ipe/appui_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a26f7b8..6f7ecad 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipe/appui_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/appui_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,7 +339,7 @@ static NSImage *loadIcon(String action)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- (NSArray<NSString *> *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return @[ @"copy", @"cut", @"paste", @"delete", @"undo", @"redo",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @"zoom_in", @"zoom_out", @"fit_objects", @"fit_page",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,7 @@ static NSImage *loadIcon(String action)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- (NSArray<NSString *> *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return @[ @"mode_select", @"mode_translate", @"mode_rotate",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @"mode_stretch", @"mode_pan", @"mode_shredder",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -585,7 +585,7 @@ AppUi::AppUi(lua_State *L0, int model)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iLayerBox = [[NSBox alloc] initWithFrame:subRect];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iLayerBox.title = @"Layers";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSRect layerFrame = iLayerBox.contentView.frame;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRect layerFrame = [iLayerBox.contentView frame];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iLayerView = [[IpeLayerView alloc] initWithFrame:layerFrame];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iLayerView.delegate = iDelegate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iLayerView.toolTip = @"Layers of this page";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -921,9 +921,9 @@ void AppUi::setCheckMark(String name, String value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString *prefix = I2N(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (NSString *action in iActions) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([action hasPrefix:prefix])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- iActions[action].state = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((IpeAction *)iActions[action]).state = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- iActions[I2N(name + value)].state = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((IpeAction *)iActions[I2N(name + value)]).state = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void AppUi::setLayers(const Page *page, int view)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -955,16 +955,16 @@ void AppUi::setNumbers(String vno, bool vm, String pno, bool pm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOL AppUi::validateMenuItem(NSMenuItem *item, NSString *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([name isEqualToString:@"snapbar"]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- item.title = iSnapBar.hidden ? @"Show Snap Toolbar" :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ item.title = [iSnapBar isHidden] ? @"Show Snap Toolbar" :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @"Hide Snap Toolbar";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IpeAction *s = findAction(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([name isEqualToString:@"toggle_notes"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- s.state = (iNotesPanel && iNotesPanel.visible);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.state = (iNotesPanel && [iNotesPanel isVisible]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ([name isEqualToString:@"toggle_bookmarks"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- s.state = (iBookmarksPanel && iBookmarksPanel.visible);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.state = (iBookmarksPanel && [iBookmarksPanel isVisible]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [item setState:(s.state ? NSOnState : NSOffState)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return actionsEnabled() || s.alwaysOn;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1024,8 +1024,8 @@ void AppUi::fillDynamicSubmenu(NSMenuItem *item)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void AppUi::toggleSnapbarShown()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- iSnapBar.hidden = !iSnapBar.hidden;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (iSnapBar.hidden) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ iSnapBar.hidden = ![iSnapBar isHidden];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([iSnapBar isHidden]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- activateConstraint(iViewToSnapBar, NO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- activateConstraint(iViewToTop, YES);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipe/appui_cocoa.h ipe/appui_cocoa.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4305b86..fa25320 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipe/appui_cocoa.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/appui_cocoa.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,7 +112,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void setButtonColor(int sel, Color color) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableDictionary <NSString *, IpeAction *> *iActions;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableDictionary *iActions; // <NSString *, IpeAction *>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool iActionsEnabled;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool iInUiUpdate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindow *iWindow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipe/controls_cocoa.cpp ipe/controls_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6d079c..1d1c582 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipe/controls_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/controls_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,7 +229,7 @@ extern CGContextRef ipeGetCGContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @implementation IpeLayerView {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSTableView *iTV;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableArray <IpeLayerItem *> *iLayers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableArray *iLayers; // <IpeLayerItem *>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (instancetype) initWithFrame:(NSRect) rect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,20 +283,20 @@ extern CGContextRef ipeGetCGContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) ipeLayerToggled:(id) sender
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int row = [sender tag];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (iLayers[row].checked)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self.delegate layerAction:@"selectoff" forLayer:iLayers[row].name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (((IpeLayerItem *)iLayers[row]).checked)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self.delegate layerAction:@"selectoff" forLayer:((IpeLayerItem *)iLayers[row]).name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self.delegate layerAction:@"selecton" forLayer:iLayers[row].name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self.delegate layerAction:@"selecton" forLayer:((IpeLayerItem *)iLayers[row]).name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) ipeLayerClicked:(int) row
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self.delegate layerAction:@"active" forLayer:iLayers[row].name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self.delegate layerAction:@"active" forLayer:((IpeLayerItem *)iLayers[row]).name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) ipeLayerMenuAt:(NSPoint) p forRow:(int) row
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self.delegate layerMenuAt:p forLayer:iLayers[row].name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self.delegate layerMenuAt:p forLayer:((IpeLayerItem *)iLayers[row]).name];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (NSInteger) numberOfRowsInTableView:(NSTableView *) tv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -309,9 +309,9 @@ objectValueForTableColumn:(NSTableColumn *) col
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- row:(NSInteger)row
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([[col identifier] isEqualToString:@"checks"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return [NSNumber numberWithBool:iLayers[row].checked];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [NSNumber numberWithBool:((IpeLayerItem *)iLayers[row]).checked];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return iLayers[row].name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ((IpeLayerItem *)iLayers[row]).name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (NSView *) tableView:(NSTableView *) tv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,7 +328,7 @@ objectValueForTableColumn:(NSTableColumn *) col
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [result setAction:@selector(ipeLayerToggled:)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [result setTarget:self];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [result setTag:row];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [result setState:iLayers[row].checked];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [result setState:((IpeLayerItem *)iLayers[row]).checked];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IpeLayerField *result = [tv makeViewWithIdentifier:@"LayerName" owner:self];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,7 +349,7 @@ objectValueForTableColumn:(NSTableColumn *) col
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @implementation IpeBookmarksView {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSTableView *iTV;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableArray <NSString *> *iBookmarks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableArray *iBookmarks; // <NSString *>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (instancetype) initWithFrame:(NSRect) rect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipe/main_cocoa.cpp ipe/main_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 132eaaa..4e00495 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipe/main_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/main_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@ static void setup_globals(lua_State *L)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IPELIB_VERSION % 100);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_setfield(L, -2, "version");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSArray <NSString *> *args = [[NSProcessInfo processInfo] arguments];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSArray *args = [[NSProcessInfo processInfo] arguments];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int argc = [args count];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_createtable(L, 0, argc - 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 1; i < argc; ++i) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipe/pagesorter_cocoa.cpp ipe/pagesorter_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3cb7500..4cbe980 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipe/pagesorter_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipe/pagesorter_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,7 +131,7 @@ extern NSSize thumbnail_size; // in ipeselector_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface IpePageSorterDelegate : NSObject <NSWindowDelegate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSCollectionViewDelegate>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@property NSMutableArray <IpeSelectorItem *> *pages;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@property NSMutableArray *pages; // <IpeSelectorItem *>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (assign) NSCollectionView *cv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) ipeAccept;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,7 +249,7 @@ int AppUi::pageSorter(lua_State *L, Document *doc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSScrollView *scroll =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scroll.hasVerticalScroller = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,7 +326,7 @@ int AppUi::pageSorter(lua_State *L, Document *doc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int n = [delegate.pages count];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_createtable(L, n, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 1; i <= n; ++i) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lua_pushinteger(L, delegate.pages[i-1].index + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lua_pushinteger(L, ((IpeSelectorItem *)delegate.pages[i-1]).index + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_rawseti(L, -2, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipecanvas/ipecanvas_cocoa.cpp ipecanvas/ipecanvas_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2af4ca7..966a12b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipecanvas/ipecanvas_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipecanvas/ipecanvas_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,15 +45,20 @@ static CGContextRef gc_graphics_port()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static CGContextRef gc_cgcontext()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [[NSGraphicsContext currentContext] CGContext];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextRef ipeGetCGContext()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gc_cgcontext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gc_graphics_port();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [[NSGraphicsContext currentContext] CGContext];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // --------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,10 +68,11 @@ Canvas::Canvas(IpeCanvasView *view)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iView = view;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iLayer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ iGCGetter = gc_graphics_port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iGCGetter = gc_cgcontext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- iGCGetter = gc_graphics_port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Canvas::~Canvas()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipecanvas/ipeselector_cocoa.cpp ipecanvas/ipeselector_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9a5129b..7b2891d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipecanvas/ipeselector_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipecanvas/ipeselector_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,7 +241,7 @@ int CanvasBase::selectPageOrView(Document *doc, int page, int startIndex,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSScrollView *scroll =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [[NSScrollView alloc] initWithFrame:panel.contentView.frame];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [[NSScrollView alloc] initWithFrame:[panel.contentView frame]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scroll.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scroll.hasVerticalScroller = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- panel.contentView = scroll;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ipeui/ipeui_cocoa.cpp ipeui/ipeui_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ac1035..7918ca6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ipeui/ipeui_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ipeui/ipeui_cocoa.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,10 +52,11 @@ inline NSString *C2N(const char *s) {return [NSString stringWithUTF8String:s];}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextRef ipeGetCGContext()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([NSGraphicsContext instancesRespondToSelector:@selector(CGContext)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [[NSGraphicsContext currentContext] CGContext];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // --------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,6 +84,7 @@ void addToLayout(NSView *view, NSView *subview)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- id layoutGuide(NSView *owner)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([owner respondsToSelector:@selector(addLayoutGuide:)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,11 +92,11 @@ id layoutGuide(NSView *owner)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [owner addLayoutGuide:g];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return g;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSView *g = [[NSView alloc] initWithFrame:NSZeroRect];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- addToLayout(owner, g);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return g;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSView *g = [[NSView alloc] initWithFrame:NSZeroRect];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ addToLayout(owner, g);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static NSLayoutAttribute layoutAttribute(char ch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,40 +140,44 @@ static NSView *owner(id a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([a respondsToSelector:@selector(superview)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [a superview];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([a respondsToSelector:@selector(owningView)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [a owningView]; // is a layout guide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void activateConstraint(NSLayoutConstraint *c, BOOL active)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([c respondsToSelector:@selector(setActive:)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c.active = active;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // need to figure out lowest common ancestor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- id a = c.firstItem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- id b = c.secondItem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSView *lca = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSView *ao = owner(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSView *bo = owner(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (b == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lca = a;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (ao == b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lca = b;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (bo == a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lca = a;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert(ao == bo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lca = ao;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (active)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [lca addConstraint:c];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [lca removeConstraint:c];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // need to figure out lowest common ancestor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id a = c.firstItem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id b = c.secondItem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSView *lca = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSView *ao = owner(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSView *bo = owner(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (b == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lca = a;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (ao == b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lca = b;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (bo == a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lca = a;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(ao == bo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lca = ao;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (active)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [lca addConstraint:c];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [lca removeConstraint:c];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSLayoutConstraint *layout(id a, id b, const char *rel, double gap,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -253,7 +259,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSPanel *iPanel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IpeDialogDelegate *iDelegate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableArray <NSView *> *iViews;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableArray *iViews; // <NSView *>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // --------------------------------------------------------------------
</span></pre><pre style='margin:0'>
</pre>