Skip to content
This repository has been archived by the owner on Jan 14, 2021. It is now read-only.

NSNib updates for Mountain Lion #111

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

NSNib updates for Mountain Lion #111

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
638eec5
Update NSNib for Mountain Lion
aarononeal May 6, 2013
cbc74b7
Allow null bundle in NSNib constructors
aarononeal May 7, 2013
f88a27a
Allow null window in NSWindowController constructor
aarononeal May 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/appkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5807,18 +5807,26 @@ public interface NSMenuView {

[BaseType (typeof (NSObject))]
public partial interface NSNib {
[Obsolete ("Deprecated in OSX 10.8")]
[Export ("initWithContentsOfURL:")]
IntPtr Constructor (NSUrl nibFileUrl);

[Export ("initWithNibNamed:bundle:")]
IntPtr Constructor (string nibName, NSBundle bundle);
IntPtr Constructor (string nibName, [NullAllowed] NSBundle bundle);

[Export ("initWithNibData:bundle:"), MountainLion]
IntPtr Constructor (NSData data, [NullAllowed] NSBundle bundle);

[Export ("instantiateWithOwner:topLevelObjects:"), MountainLion]
bool Instantiate (NSObject owner, out NSArray topLevelObjects);

[Obsolete ("Deprecated in OSX 10.8")]
[Export ("instantiateNibWithExternalNameTable:")]
bool InstantiateNib (NSDictionary externalNameTable);

// This requires an "out NSArray"
//[Export ("instantiateNibWithOwner:topLevelObjects:")]
//bool InstantiateNib (NSObject owner, NSArray topLevelObjects);
[Obsolete ("Deprecated in OSX 10.8")]
[Export ("instantiateNibWithOwner:topLevelObjects:")]
bool InstantiateNib (NSObject owner, out NSArray topLevelObjects);
}

[BaseType (typeof (NSController))]
Expand Down Expand Up @@ -14394,7 +14402,7 @@ public partial interface NSWindowRestoration {
[BaseType (typeof (NSResponder))]
public interface NSWindowController {
[Export ("initWithWindow:")]
IntPtr Constructor (NSWindow window);
IntPtr Constructor ([NullAllowed] NSWindow window);

[Export ("initWithWindowNibName:")]
IntPtr Constructor (string windowNibName);
Expand Down