Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: src/views/mac/SampleAppDelegate.mm

Issue 633923002: explicitly delete our c++ window on quit (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/views/mac/SkNSView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #import "SampleAppDelegate.h" 1 #import "SampleAppDelegate.h"
2 2
3 #include "SkApplication.h" 3 #include "SkApplication.h"
4 4
5 @implementation SampleAppDelegate 5 @implementation SampleAppDelegate
6 @synthesize fWindow, fView, fOptions; 6 @synthesize fWindow, fView, fOptions;
7 7
8 -(void) applicationDidFinishLaunching:(NSNotification *)aNotification { 8 -(void) applicationDidFinishLaunching:(NSNotification *)aNotification {
9 //Load specified skia views after launching 9 //Load specified skia views after launching
10 fView.fOptionsDelegate = fOptions; 10 fView.fOptionsDelegate = fOptions;
11 [fWindow setAcceptsMouseMovedEvents:YES]; 11 [fWindow setAcceptsMouseMovedEvents:YES];
12 [fOptions registerMenus:fView.fWind->getMenus()]; 12 [fOptions registerMenus:fView.fWind->getMenus()];
13 } 13 }
14 14
15 - (IBAction)toiPadSize:(id)sender { 15 - (IBAction)toiPadSize:(id)sender {
16 NSRect frame = NSMakeRect(fWindow.frame.origin.x, fWindow.frame.origin.y, 76 8, 1024); 16 NSRect frame = NSMakeRect(fWindow.frame.origin.x, fWindow.frame.origin.y, 76 8, 1024);
17 [fWindow setFrame:frame display:YES animate:YES]; 17 [fWindow setFrame:frame display:YES animate:YES];
18 } 18 }
19 19
20 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende r { 20 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende r {
21 [fView freeNativeWind];
21 application_term(); 22 application_term();
22 return NSTerminateNow; 23 return NSTerminateNow;
23 } 24 }
24 25
25 @end 26 @end
OLDNEW
« no previous file with comments | « no previous file | src/views/mac/SkNSView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698