aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChristian Schmitz <unknown>2022-01-13 11:55:37 +1100
committerChristian Schmitz <unknown>2022-01-13 11:55:37 +1100
commitea07cf27bb639d99e8e576c79c5a6733a0a7407c (patch)
tree4e52c26d5d5c9f0234619c0172caec64737c15b6
parentc1ebde5c28524747deef1ed2240641c1b2b8db38 (diff)
downloadscintilla-mirror-ea07cf27bb639d99e8e576c79c5a6733a0a7407c.tar.gz
Feature [feature-requests:#1425] Allow Scintilla to run if built without cursor images.
-rw-r--r--cocoa/ScintillaView.mm2
-rw-r--r--doc/ScintillaHistory.html5
2 files changed, 7 insertions, 0 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index db716c232..c75cdc1f8 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -1244,6 +1244,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
waitCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(2, 2)];
} else {
NSLog(@"Wait cursor is invalid.");
+ waitCursor = [NSCursor arrowCursor];
}
path = [bundle pathForResource: @"mac_cursor_flipped" ofType: @"tiff" inDirectory: nil];
@@ -1252,6 +1253,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(15, 2)];
} else {
NSLog(@"Reverse arrow cursor is invalid.");
+ reverseArrowCursor = [NSCursor arrowCursor];
}
}
}
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 68817c39b..9809d7b87 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -568,6 +568,7 @@
<td>Rowan Daniell</td>
</tr><tr>
<td>Arkadiusz Michalski</td>
+ <td>Christian Schmitz</td>
</tr>
</table>
<h2>Releases</h2>
@@ -593,6 +594,10 @@
Allow choice of object file directory with makefile by setting DIR_O.
<a href="https://sourceforge.net/p/scintilla/bugs/2306/">Bug #2306</a>.
</li>
+ <li>
+ On macOS allow Scintilla to run if built without cursor images.
+ <a href="https://sourceforge.net/p/scintilla/feature-requests/1425/">Feature #1425</a>.
+ </li>
</ul>
<h3>
<a href="https://www.scintilla.org/scintilla515.zip">Release 5.1.5</a>