diff -r 275af46392bd -r b6dcae4b6d2c cocoaTouch/OverlayViewController.h
--- a/cocoaTouch/OverlayViewController.h	Mon Apr 05 17:22:54 2010 +0000
+++ b/cocoaTouch/OverlayViewController.h	Tue Apr 06 02:39:06 2010 +0000
@@ -8,18 +8,25 @@
 
 #import <UIKit/UIKit.h>
 
+@class PopoverMenuViewController;
 
 @interface OverlayViewController : UIViewController {
     NSTimer *dimTimer;
-    id menuPopover;     //UIPopoverController
-    
+#ifdef __IPHONE_3_2
+    UIPopoverController *popoverController;
+#else
+    id popoverController;
+#endif
+    PopoverMenuViewController *popupMenu;
+
+    BOOL isPopoverVisible;
     CGFloat initialDistanceForPinching;
     CGPoint gestureStartPoint;
-    BOOL popoverVisible;
 }
 
 @property (nonatomic,retain) NSTimer *dimTimer;
-@property (nonatomic,retain) id menuPopover;
+@property (nonatomic,retain) id popoverController;
+@property (nonatomic,retain) PopoverMenuViewController *popupMenu;
 
 -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
 -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
@@ -27,8 +34,9 @@
 
 -(IBAction) buttonReleased:(id) sender;
 -(IBAction) buttonPressed:(id) sender;
--(IBAction) showPopover;
 
+-(void) showPopover;
+-(void) dismissPopover;
 -(void) dimOverlay;
 -(void) showMenuAfterwards;