In SampleWindow, pass ownership of menus to SkWindow, so it can safely
delete them in its destructor.
BUG=557
TEST=Run SampleApp on linux. Then press escape.
Review URL: https://codereview.appspot.com/6050047
git-svn-id: http://skia.googlecode.com/svn/trunk@3719 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 0a7b3cf..eb49236 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -179,12 +179,13 @@
SkScalar fZoomCenterX, fZoomCenterY;
//Stores global settings
- SkOSMenu fAppMenu;
+ SkOSMenu* fAppMenu; // We pass ownership to SkWindow, when we call addMenu
//Stores slide specific settings
- SkOSMenu fSlideMenu;
+ SkOSMenu* fSlideMenu; // We pass ownership to SkWindow, when we call addMenu
+
int fTransitionNext;
int fTransitionPrev;
-
+
void loadView(SkView*);
void updateTitle();