5ec8606 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

Use older names of WindowStyle constants for now

5ec8606Hamish Mackenzie10 years ago

jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+2−1

compare with master

unifiedsplit

@@ -22,7 +22,8 @@ extern void withWebView(WKWebView *, HsStablePtr);

22 if (self) {

23 _handler = handler;

24 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;

26 _window = [[NSWindow alloc] initWithContentRect:contentSize styleMask:windowStyleMask backing:NSBackingStoreBuffered defer:YES];

27 _window = [[NSWindow alloc] initWithContentRect:contentSize styleMask:windowStyleMask backing:NSBackingStoreBuffered defer:YES];

27 _window.backgroundColor = [NSColor whiteColor];

28 _window.backgroundColor = [NSColor whiteColor];

28 _window.title = progName;

29 _window.title = progName;

jsaddle-wkwebview/default.nix−3

@@ -8,7 +8,4 @@ mkDerivation {

8 osx_sdk darwin.libobjc darwin.apple_sdk.libs.xpc ];

9 description = "Interface for JavaScript that works with GHCJS and GHC";

10 license = stdenv.lib.licenses.mit;

11− preBuild = ''

12− sed -i 's/\(windowStyleMask =\).*;/\1 0xf;/g' cbits-cocoa/AppDelegate.m

13− '';

14}

11}