git.iko.soy/jsaddle
on master help sign in
Use older names of WindowStyle constants for now
commit5ec8606da53174fd804ed8c2826946ffb2d8f2c0 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateTue 21 Feb 2017, 15:22 (10 years ago) parent399054e
2 files changed+2−4
compare with master
unifiedsplit
jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+2−1 jsaddle-wkwebview/default.nix−3
jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+2−1
@@ -22,7 +22,8 @@ extern void withWebView(WKWebView *, HsStablePtr);
2222 if (self) {
2323 _handler = handler;
2424 NSRect contentSize = NSMakeRect(0.0, 500.0, 1000.0, 700.0);
25− NSUInteger windowStyleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskResizable | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable;
25+ // TODO replace with once nix has newer Cocoa NSUInteger windowStyleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskResizable | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable;
26+ NSUInteger windowStyleMask = NSTitledWindowMask | NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
2627 _window = [[NSWindow alloc] initWithContentRect:contentSize styleMask:windowStyleMask backing:NSBackingStoreBuffered defer:YES];
2728 _window.backgroundColor = [NSColor whiteColor];
2829 _window.title = progName;
jsaddle-wkwebview/default.nix−3
@@ -8,7 +8,4 @@ mkDerivation {
88 osx_sdk darwin.libobjc darwin.apple_sdk.libs.xpc ];
99 description = "Interface for JavaScript that works with GHCJS and GHC";
1010 license = stdenv.lib.licenses.mit;
11− preBuild = ''
12− sed -i 's/\(windowStyleMask =\).*;/\1 0xf;/g' cbits-cocoa/AppDelegate.m
13− '';
1411}