When popover closes implicitly, popoverShouldClose delegate method should be called.

Added extra button popover to test -close method, which does not consult popoverShouldClose.

AppKit/CPPopover.j

@@ -296,7 +296,7 @@ Set the behavior of the CPPopover. It can be:
 /*! @ignore */
 - (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
 {
-    [self close];
+    [self performClose:self];
 
     // We return NO, because we want the CPPopover to determine
     // if the attached window can be closed and to give us a chance
@@ -375,4 +375,4 @@ var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
     [aCoder encodeInt:_behavior forKey:CPPopoverBehaviorKey];
 }
 
-@end
+@end

Tests/Manual/CPPopover/AppController.j

@@ -143,7 +143,7 @@
     }
 }
 
-- (IBAction)open:(id)sender
+- (@action)open:(id)sender
 {
     var edge = [self popoverEdge],
         appearance;
@@ -169,12 +169,12 @@
     [popoverWindow orderFront:nil];
 }
 
-- (IBAction)openWindowPopover:(id)sender
+- (@action)openWindowPopover:(id)sender
 {
     [windowPopover showRelativeToRect:nil ofView:sender preferredEdge:[self popoverEdge]];
 }
 
-- (IBAction)movePopover:(id)sender
+- (@action)movePopover:(id)sender
 {
     if (++lastPreferredEdge > CPMaxYEdge)
         lastPreferredEdge = CPMinXEdge;
@@ -182,6 +182,11 @@
     [popover showRelativeToRect:CGRectMakeZero() ofView:lastButton preferredEdge:lastPreferredEdge];
 }
 
+- (@action)closePopover:(id)sender
+{
+    [popover close];
+}
+
 - (void)initPopover:(CPPopover)aPopover withAppearance:(int)appearance
 {
     [aPopover setDelegate:self];

Tests/Manual/CPPopover/Resources/MainMenu.xib

@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">11D50</string>
+		<string key="IBDocument.SystemVersion">11E53</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">2182</string>
@@ -62,7 +62,7 @@
 					<object class="NSTextField" id="545120110">
 						<reference key="NSNextResponder" ref="857722922"/>
 						<int key="NSvFlags">301</int>
-						<string key="NSFrame">{{31, 97}, {239, 22}}</string>
+						<string key="NSFrame">{{31, 137}, {239, 22}}</string>
 						<reference key="NSSuperview" ref="857722922"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="767709548"/>
@@ -101,10 +101,33 @@
 							</object>
 						</object>
 					</object>
+					<object class="NSButton" id="913980254">
+						<reference key="NSNextResponder" ref="857722922"/>
+						<int key="NSvFlags">293</int>
+						<string key="NSFrame">{{114, 50}, {73, 32}}</string>
+						<reference key="NSSuperview" ref="857722922"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="801370502">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">close</string>
+							<reference key="NSSupport" ref="500612644"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="913980254"/>
+							<int key="NSButtonFlags">-2038284033</int>
+							<int key="NSButtonFlags2">129</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
 					<object class="NSButton" id="13055898">
 						<reference key="NSNextResponder" ref="857722922"/>
 						<int key="NSvFlags">293</int>
-						<string key="NSFrame">{{193, 34}, {74, 32}}</string>
+						<string key="NSFrame">{{113, 18}, {74, 32}}</string>
 						<reference key="NSSuperview" ref="857722922"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>
@@ -128,7 +151,7 @@
 					<object class="NSButton" id="767709548">
 						<reference key="NSNextResponder" ref="857722922"/>
 						<int key="NSvFlags">293</int>
-						<string key="NSFrame">{{34, 34}, {126, 32}}</string>
+						<string key="NSFrame">{{87, 82}, {126, 32}}</string>
 						<reference key="NSSuperview" ref="857722922"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="13055898"/>
@@ -152,7 +175,7 @@
 					<object class="NSTextField" id="143820433">
 						<reference key="NSNextResponder" ref="857722922"/>
 						<int key="NSvFlags">269</int>
-						<string key="NSFrame">{{28, 141}, {245, 32}}</string>
+						<string key="NSFrame">{{28, 185}, {245, 32}}</string>
 						<reference key="NSSuperview" ref="857722922"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="545120110"/>
@@ -187,7 +210,7 @@
 						</object>
 					</object>
 				</object>
-				<string key="NSFrameSize">{301, 217}</string>
+				<string key="NSFrameSize">{301, 261}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="143820433"/>
@@ -239,7 +262,7 @@
 					<reference key="NSNextKeyView" ref="58551230"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -263,6 +286,7 @@
 						<string key="NSFrame">{{18, 12}, {126, 32}}</string>
 						<reference key="NSSuperview" ref="200356413"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1032520345">
@@ -286,7 +310,7 @@
 						<string key="NSFrame">{{37, 59}, {89, 17}}</string>
 						<reference key="NSSuperview" ref="200356413"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="400712972"/>
 						<string key="NSReuseIdentifierKey">_NS:1505</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="420985577">
@@ -309,11 +333,9 @@
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSTextField" id="260721902">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<string key="NSFrameSize">{38, 17}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:1505</string>
 				<bool key="NSEnabled">YES</bool>
 				<object class="NSTextFieldCell" key="NSCell" id="171236348">
@@ -379,6 +401,14 @@
 					</object>
 					<int key="connectionID">555</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closePopover:</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="913980254"/>
+					</object>
+					<int key="connectionID">559</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view</string>
@@ -478,10 +508,11 @@
 						<reference key="object" ref="857722922"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="545120110"/>
 							<reference ref="143820433"/>
-							<reference ref="767709548"/>
+							<reference ref="545120110"/>
+							<reference ref="913980254"/>
 							<reference ref="13055898"/>
+							<reference ref="767709548"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -638,6 +669,20 @@
 						<reference key="object" ref="1032520345"/>
 						<reference key="parent" ref="400712972"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">556</int>
+						<reference key="object" ref="913980254"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="801370502"/>
+						</object>
+						<reference key="parent" ref="857722922"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">557</int>
+						<reference key="object" ref="801370502"/>
+						<reference key="parent" ref="913980254"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -675,6 +720,8 @@
 					<string>536.IBPluginDependency</string>
 					<string>551.IBPluginDependency</string>
 					<string>552.IBPluginDependency</string>
+					<string>556.IBPluginDependency</string>
+					<string>557.IBPluginDependency</string>
 				</object>
 				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -709,6 +756,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -723,7 +772,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">555</int>
+			<int key="maxID">559</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -735,6 +784,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>closePopover:</string>
 							<string>movePopover:</string>
 							<string>open:</string>
 							<string>openWindowPopover:</string>
@@ -744,18 +794,24 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>closePopover:</string>
 							<string>movePopover:</string>
 							<string>open:</string>
 							<string>openWindowPopover:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">closePopover:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">movePopover:</string>
 								<string key="candidateClassName">id</string>