interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up the uiWindow Darwin implementation. Let's try this again...

This commit is contained in:
Pietro Gagliardi 2015-04-08 04:38:34 -04:00
parent 941825e190
commit a850ea3ac5
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
new/window_darwin.m
View File

@ -4,19 +4,6 @@
// TODO // TODO
// - showing on size // - showing on size
#ifdef uiLogAllocations
@interface loggingNSWindow : NSWindow
@end
@implementation loggingNSWindow
uiLogObjCClassAllocations()
@end
#else
#define loggingNSWindow NSWindow
#endif
@interface uiWindowDelegate : NSObject <NSWindowDelegate> @interface uiWindowDelegate : NSObject <NSWindowDelegate>
@property uiWindow *w; @property uiWindow *w;
@property int (*onClosing)(uiWindow *, void *); @property int (*onClosing)(uiWindow *, void *);
@ -35,8 +22,10 @@ uiLogObjCClassAllocations()
return NO; return NO;
} }
// after this method returns we assume the window will be released (see below), so we can go too
- (void)windowWillClose:(NSNotification *)note - (void)windowWillClose:(NSNotification *)note
{ {
uiFree(self.w);
[self release]; [self release];
} }
@ -60,7 +49,7 @@ uiWindow *uiNewWindow(char *title, int width, int height)
w = uiNew(uiWindow); w = uiNew(uiWindow);
w->w = [[loggingNSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height) w->w = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height)
styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask) styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:YES]; defer:YES];