summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2015-02-14 01:22:19 (GMT)
committerKevin Walzer <kw@codebykevin.com>2015-02-14 01:22:19 (GMT)
commit237afd75300fd2b491666698252f655fd1ececdb (patch)
treed3311c01fa72f5d3b16a8a72d834761100baf94e /macosx
parentfce4e2afdd1b452d67d62e8bff171a23b5c386d7 (diff)
downloadtk-237afd75300fd2b491666698252f655fd1ececdb.zip
tk-237afd75300fd2b491666698252f655fd1ececdb.tar.gz
tk-237afd75300fd2b491666698252f655fd1ececdb.tar.bz2
Remove calls during window resize notification that cause crash on Cocoa
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXWindowEvent.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index e1a0f6f..cf8d9a6 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -80,10 +80,6 @@ extern NSString *opaqueTag;
NSWindow *w = [notification object];
TkWindow *winPtr = TkMacOSXGetTkWindow(w);
- /*Disable drawing until window is resized removes flicker and drawing artifacts;necessary after removal of private API.*/
- NSDisableScreenUpdates();
- [ [w contentView] setHidden:YES];
-
if (winPtr) {
WmInfo *wmPtr = winPtr->wmInfoPtr;
NSRect bounds = [w frame];
@@ -111,8 +107,6 @@ extern NSString *opaqueTag;
}
TkGenWMConfigureEvent((Tk_Window) winPtr, x, y, width, height, flags);
}
- [[w contentView] setHidden:NO];
- NSEnableScreenUpdates();
}
- (void) windowExpanded: (NSNotification *) notification
@@ -845,8 +839,7 @@ ExposeRestrictProc(
-(void) viewWillDraw
{
-
- [super viewWillDraw];
+ [super viewWillDraw];
}
- (BOOL) preservesContentDuringLiveResize
@@ -856,10 +849,10 @@ ExposeRestrictProc(
- (void)viewWillStartLiveResize
{
- NSDisableScreenUpdates();
- [super viewWillStartLiveResize];
- [self setNeedsDisplay:NO];
- [self setHidden:YES];
+ NSDisableScreenUpdates();
+ [super viewWillStartLiveResize];
+ [self setNeedsDisplay:NO];
+ [self setHidden:YES];
}