Merge branch 'master' into NSStoryboard_branch2

Headers/AppKit/NSPDFInfo.h

@@ -55,7 +55,7 @@ extern "C" {
 - (NSArray *) tagNames;
 
 - (NSPaperOrientation) orientation;
-- (void) setOrientation: (NSPaperOrientation)or;
+- (void) setOrientation: (NSPaperOrientation)orientation;
 
 - (NSSize) paperSize;
 - (void) setPaperSize: (NSSize)size;

Headers/AppKit/NSPathControlItem.h

@@ -57,7 +57,7 @@ extern "C" {
 @end
 
 #if	defined(__cplusplus)
-
+}
 #endif
 
 #endif	/* GS_API_MACOSX */

Headers/AppKit/NSWindow.h

@@ -528,6 +528,7 @@ PACKAGE_SCOPE
 - (void) orderWindow: (NSWindowOrderingMode)place
 	  relativeTo: (NSInteger)otherWin;
 - (BOOL) isVisible;
+- (void) setIsVisible: (BOOL)flag;
 - (NSInteger) level;
 - (void) setLevel: (NSInteger)newLevel;
 

Source/NSPDFInfo.m

@@ -76,9 +76,9 @@
   return _orientation;
 }
 
-- (void) setOrientation: (NSPaperOrientation)or
+- (void) setOrientation: (NSPaperOrientation)orientation
 {
-  _orientation = or;
+  _orientation = orientation;
 }
 
 - (NSSize) paperSize;

Source/NSWindow.m

@@ -1720,6 +1720,19 @@ titleWithRepresentedFilename(NSString *representedFilename)
   return _windowLevel;
 }
 
+- (void) setIsVisible: (BOOL)flag
+{
+  _f.visible = flag;
+  if (flag)
+    {
+      [self orderFrontRegardless];
+    }
+  else
+    {
+      [self orderOut: nil];
+    }
+}
+
 - (void) makeKeyAndOrderFront: (id)sender
 {
   [self deminiaturize: self];