documentation cleanups

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24035 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,144 @@
+2006-11-06 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSDisplayServer.m: Improve documentation of window ordering
+	* Source/NSWindow.m: ditto
+	* Source/NSApplication.m: Fix minor bug with cleanup on termination
+	when the appicon was suppressed.
+	* Source/NSAttributedString.m:
+	* Source/NSClipView.m:
+	* Source/NSApplication.m:
+	* Source/NSImage.m:
+	* Headers/AppKit/NSSound.h:
+	* Headers/AppKit/NSTextAttachment.h:
+	* Headers/AppKit/NSPopUpButtonCell.h:
+	* Headers/AppKit/NSPanel.h:
+	* Headers/AppKit/NSTableHeaderCell.h:
+	* Headers/AppKit/NSSpellServer.h:
+	* Headers/AppKit/NSAlert.h:
+	* Headers/AppKit/NSColorList.h:
+	* Headers/AppKit/NSWindowController.h:
+	* Headers/AppKit/NSScreen.h:
+	* Headers/AppKit/NSOpenPanel.h:
+	* Headers/AppKit/NSSliderCell.h:
+	* Headers/AppKit/NSImageCell.h:
+	* Headers/AppKit/NSAffineTransform.h:
+	* Headers/AppKit/NSText.h:
+	* Headers/AppKit/AppKitDefines.h:
+	* Headers/AppKit/NSParagraphStyle.h:
+	* Headers/AppKit/NSBox.h:
+	* Headers/AppKit/AppKitExceptions.h:
+	* Headers/AppKit/NSTableHeaderView.h:
+	* Headers/AppKit/NSAttributedString.h:
+	* Headers/AppKit/NSWorkspace.h:
+	* Headers/AppKit/NSPopUpButton.h:
+	* Headers/AppKit/NSFontManager.h:
+	* Headers/AppKit/NSFormCell.h:
+	* Headers/AppKit/NSMenu.h:
+	* Headers/AppKit/NSMatrix.h:
+	* Headers/AppKit/NSWindow.h:
+	* Headers/AppKit/NSLayoutManager.h:
+	* Headers/AppKit/NSButtonCell.h:
+	* Headers/AppKit/NSColorPicker.h:
+	* Headers/AppKit/NSActionCell.h:
+	* Headers/AppKit/NSImageView.h:
+	* Headers/AppKit/NSOpenGLView.h:
+	* Headers/AppKit/NSDataLinkManager.h:
+	* Headers/AppKit/NSClipView.h:
+	* Headers/AppKit/NSSplitView.h:
+	* Headers/AppKit/NSBitmapImageRep.h:
+	* Headers/AppKit/NSInputServer.h:
+	* Headers/AppKit/NSTextFieldCell.h:
+	* Headers/AppKit/NSImageRep.h:
+	* Headers/AppKit/NSBezierPath.h:
+	* Headers/AppKit/NSGraphics.h:
+	* Headers/AppKit/NSResponder.h:
+	* Headers/AppKit/NSColorWell.h:
+	* Headers/AppKit/NSApplication.h:
+	* Headers/AppKit/NSForm.h:
+	* Headers/AppKit/NSWindow+Toolbar.h:
+	* Headers/AppKit/NSTableColumn.h:
+	* Headers/AppKit/NSNib.h:
+	* Headers/AppKit/NSComboBox.h:
+	* Headers/AppKit/NSMovieView.h:
+	* Headers/AppKit/NSButton.h:
+	* Headers/AppKit/NSSavePanel.h:
+	* Headers/AppKit/NSColor.h:
+	* Headers/AppKit/NSMovie.h:
+	* Headers/AppKit/NSCachedImageRep.h:
+	* Headers/AppKit/NSStepper.h:
+	* Headers/AppKit/NSPrinter.h:
+	* Headers/AppKit/NSHelpManager.h:
+	* Headers/AppKit/NSMenuItemCell.h:
+	* Headers/AppKit/NSPasteboard.h:
+	* Headers/AppKit/DPSOperators.h:
+	* Headers/AppKit/AppKit.h:
+	* Headers/AppKit/NSTextContainer.h:
+	* Headers/AppKit/NSNibDeclarations.h:
+	* Headers/AppKit/NSToolbar.h:
+	* Headers/AppKit/NSSearchFieldCell.h:
+	* Headers/AppKit/NSCursor.h:
+	* Headers/AppKit/NSPrintOperation.h:
+	* Headers/AppKit/NSControl.h:
+	* Headers/AppKit/NSInterfaceStyle.h:
+	* Headers/AppKit/NSMenuItem.h:
+	* Headers/AppKit/NSScroller.h:
+	* Headers/AppKit/NSDocumentFrameworkPrivate.h:
+	* Headers/AppKit/NSInputManager.h:
+	* Headers/AppKit/NSRulerMarker.h:
+	* Headers/AppKit/NSProgressIndicator.h:
+	* Headers/AppKit/NSGraphicsContext.h:
+	* Headers/AppKit/NSFont.h:
+	* Headers/AppKit/NSTextStorage.h:
+	* Headers/AppKit/NSSearchField.h:
+	* Headers/AppKit/NSOutlineView.h:
+	* Headers/AppKit/NSPageLayout.h:
+	* Headers/AppKit/NSTextView.h:
+	* Headers/AppKit/NSFileWrapper.h:
+	* Headers/AppKit/NSTabViewItem.h:
+	* Headers/AppKit/PSOperators.h:
+	* Headers/AppKit/NSDragging.h:
+	* Headers/AppKit/NSDocumentController.h:
+	* Headers/AppKit/NSColorPicking.h:
+	* Headers/AppKit/NSDrawer.h:
+	* Headers/AppKit/NSCustomImageRep.h:
+	* Headers/AppKit/NSRulerView.h:
+	* Headers/AppKit/NSMenuView.h:
+	* Headers/AppKit/NSSecureTextField.h:
+	* Headers/AppKit/NSNibLoading.h:
+	* Headers/AppKit/NSHelpPanel.h:
+	* Headers/AppKit/NSComboBoxCell.h:
+	* Headers/AppKit/NSToolbarItem.h:
+	* Headers/AppKit/NSImage.h:
+	* Headers/AppKit/NSSlider.h:
+	* Headers/AppKit/NSStepperCell.h:
+	* Headers/AppKit/NSStringDrawing.h:
+	* Headers/AppKit/NSOpenGL.h:
+	* Headers/AppKit/NSDataLink.h:
+	* Headers/AppKit/NSScrollView.h:
+	* Headers/AppKit/NSColorPanel.h:
+	* Headers/AppKit/NSEPSImageRep.h:
+	* Headers/AppKit/NSSpellProtocol.h:
+	* Headers/AppKit/NSTabView.h:
+	* Headers/AppKit/NSDataLinkPanel.h:
+	* Headers/AppKit/NSPrintInfo.h:
+	* Headers/AppKit/NSUserInterfaceValidation.h:
+	* Headers/AppKit/NSPrintPanel.h:
+	* Headers/AppKit/NSCell.h:
+	* Headers/AppKit/NSEvent.h:
+	* Headers/AppKit/NSTableView.h:
+	* Headers/AppKit/NSBrowserCell.h:
+	* Headers/AppKit/NSNibConnector.h:
+	* Headers/AppKit/NSSelection.h:
+	* Headers/AppKit/NSTextField.h:
+	* Headers/AppKit/NSSpellChecker.h:
+	* Headers/AppKit/NSView.h:
+	* Headers/AppKit/NSDocument.h:
+	* Headers/AppKit/NSBrowser.h:
+	* Headers/AppKit/NSFontPanel.h:
+	* Headers/Additions/GNUstepGUI/GSTable.h:
+	Update to use current version macros and fix a few documentation
+	errors.
+
 2006-11-06  Matt Rice  <ratmice@yahoo.com>
 
 	* Source/NSTextView_actions.m: Implement some undocumented key binding

Headers/Additions/GNUstepGUI/GSTable.h

@@ -140,7 +140,7 @@
   prisoners, which are subviews of the jails; the resizing is transmitted
   through the usual autoresizing machinery, because the jails always have
   autoresizing of subviews turned on.  This works because if a prisoner
-  sends to its superview a -frame message, the frame of the jail
+  sends to its superview an [NSView-frame] message, the frame of the jail
   (and <em>not</em> the frame of the GSTable) is returned, so that
   each prisoner will autoresize itself in its jail frame.  Moreover, any
   prisoner, being a subview of its jail, is clipped in its jail frame.  If

Headers/AppKit/AppKit.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_AppKit
 #define _GNUstep_H_AppKit
+#import <GNUstepBase/GSVersionMacros.h>
 
 /* Define library version */
 #include <GNUstepGUI/GSVersion.h>
@@ -115,7 +117,7 @@
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSWorkspace.h>
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 #include <AppKit/NSAlert.h>
 #include <AppKit/NSAffineTransform.h>
 #include <AppKit/NSBezierPath.h>

Headers/AppKit/AppKitDefines.h

@@ -18,11 +18,13 @@
    
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
    */ 
 
 #ifndef __AppKitDefines_INCLUDE
 #define __AppKitDefines_INCLUDE
+#import <GNUstepBase/GSVersionMacros.h>
 
 #ifdef GNUSTEP_WITH_DLL 
 

Headers/AppKit/AppKitExceptions.h

@@ -20,10 +20,12 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 #ifndef __AppKit_AppKitExceptions_h__
 #define __AppKit_AppKitExceptions_h__
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/AppKitDefines.h>
 
@@ -66,7 +68,7 @@ APPKIT_EXPORT NSString *NSWindowServerCommunicationException;
 APPKIT_EXPORT NSString *NSWordTablesReadException;
 APPKIT_EXPORT NSString *NSWordTablesWriteException;
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 APPKIT_EXPORT NSString *GSWindowServerInternalException;
 #endif
 

Headers/AppKit/DPSOperators.h

@@ -18,11 +18,13 @@
    
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
    */
 
 #ifndef _DPSOperators_h_INCLUDE
 #define _DPSOperators_h_INCLUDE
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSGraphicsContext.h>
 

Headers/AppKit/NSActionCell.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSActionCell
 #define _GNUstep_H_NSActionCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSCell.h>
 

Headers/AppKit/NSAffineTransform.h

@@ -21,11 +21,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 
 #ifndef _GNUstep_H_NSAffineTransform
 #define _GNUstep_H_NSAffineTransform
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSGeometry.h>
@@ -66,7 +68,7 @@ typedef	struct {
 - (void) translateXBy: (float)tranX yBy: (float)tranY;
 @end
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 @interface NSAffineTransform (GNUstep)
 - (void) translateToPoint: (NSPoint)point;
 - (void) scaleTo: (float)sx : (float)sy;

Headers/AppKit/NSAlert.h

@@ -22,11 +22,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSAlert
 #define _GNUstep_H_NSAlert
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 

Headers/AppKit/NSApplication.h

@@ -28,7 +28,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
     AutogsdocSource: NSApplication.m
     AutogsdocSource: GSServicesManager.m
@@ -37,6 +38,7 @@
 
 #ifndef _GNUstep_H_NSApplication
 #define _GNUstep_H_NSApplication
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSResponder.h>
 
@@ -67,7 +69,7 @@ enum {
   NSRunContinuesResponse = (-1002)
 };
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 #define NSUpdateWindowsRunLoopOrdering 600000
 
 typedef enum {
@@ -123,7 +125,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
  * Class methods
  */
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (void) detachDrawingThread: (SEL)selector 
 		    toTarget: (id)target 
 		  withObject: (id)argument;
@@ -149,7 +151,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 - (void) activateIgnoringOtherApps: (BOOL)flag;
 - (void) deactivate;
 - (BOOL) isActive;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) hideOtherApplications: (id)sender;
 - (void) unhideAllApplications: (id)sender;
 #endif
@@ -170,7 +172,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 - (void) stopModal;
 - (void) stopModalWithCode: (int)returnCode;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (int) runModalForWindow: (NSWindow *)theWindow
 	relativeToWindow: (NSWindow *)docWindow;
 - (void) beginSheet: (NSWindow *)sheet
@@ -202,7 +204,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 		 to: (id)aTarget
 	       from: (id)sender;
 - (id) targetForAction: (SEL)aSelector;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (id)targetForAction: (SEL)theAction 
                    to: (id)theTarget 
                  from: (id)sender;
@@ -241,14 +243,14 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 /*
  * Showing Standard Panels
  */
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 /* GNUstep extensions displaying an infoPanel, title is 'Info' */
 /* For a list of the useful values in the dictionary, see GSInfoPanel.h. 
    The entries are mostly compatible with macosx. */
 - (void) orderFrontStandardInfoPanel: (id)sender;
 - (void) orderFrontStandardInfoPanelWithOptions: (NSDictionary *)dictionary;
 #endif 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /* macosx extensions displaying an aboutPanel, title is 'About'. 
    NB: These two methods do exactly the same as the two methods above, 
    only the title is different. */
@@ -261,7 +263,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
  */
 - (NSMenu*) mainMenu;
 - (void) setMainMenu: (NSMenu*)aMenu;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) setAppleMenu: (NSMenu*)aMenu;
 #endif
 
@@ -305,7 +307,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 /*
  * Terminating the application
  */
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) replyToApplicationShouldTerminate: (BOOL)shouldTerminate;
 #endif 
 - (void) terminate: (id)sender;
@@ -316,7 +318,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 - (id) delegate;
 - (void) setDelegate: (id)anObject;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /*
  * Methods for scripting
  */
@@ -353,12 +355,12 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
 - (BOOL) writeSelectionToPasteboard: (NSPasteboard*)pboard
                               types: (NSArray*)types;
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 - (NSWindow*) iconWindow;
 #endif
 @end
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 
 @interface NSApplication (GSGUIInternal)
 - (void) _windowWillDealloc: (NSWindow *)window;
@@ -416,7 +418,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
  */
 - (BOOL) applicationShouldOpenUntitledFile:(NSApplication *)sender;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /**
  * Sent from within the [NSApplication-terminate:].  If NO is returned
  * termination will not proceed. 
@@ -510,7 +512,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
  */
 - (void) applicationWillUpdate: (NSNotification*)aNotification;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /**
  * Method called by scripting framework on OS X.  <em>Not implemented (sent)
  * yet on GNUstep.</em>
@@ -577,7 +579,7 @@ NSShowsServicesMenuItem(NSString *name);
 APPKIT_EXPORT BOOL
 NSPerformService(NSString *serviceItem, NSPasteboard *pboard);
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 APPKIT_EXPORT id
 GSContactApplication(NSString *appName, NSString *port, NSDate *expire);
 #endif

Headers/AppKit/NSAttributedString.h

@@ -23,12 +23,14 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 #ifndef _GNUstep_H_NSAttributedString
 #define _GNUstep_H_NSAttributedString
+#import <GNUstepBase/GSVersionMacros.h>
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 
 #include <Foundation/NSAttributedString.h>
 #include <Foundation/NSRange.h>
@@ -91,7 +93,7 @@ enum
 - (NSFileWrapper*) RTFDFileWrapperFromRange: (NSRange)range
   documentAttributes: (NSDictionary*)dict;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (NSArray *) textFileTypes;
 + (NSArray *) textPasteboardTypes;
 + (NSArray *) textUnfilteredFileTypes;

Headers/AppKit/NSBezierPath.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1307, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 - 1307, USA.
 */
 
 #ifndef BEZIERPATH_H
 #define BEZIERPATH_H
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/Foundation.h>
 #include <AppKit/NSFont.h>
@@ -222,7 +224,7 @@ typedef enum {
 // Hit detection  
 //
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 /** Returns the winding count, according to the PostScript definition,
     at the given point.  */
 - (int) windingCountAtPoint: (NSPoint)point;

Headers/AppKit/NSBitmapImageRep.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSBitmapImageRep
 #define _GNUstep_H_NSBitmapImageRep
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSImageRep.h>
 
@@ -48,7 +50,7 @@ typedef enum _NSTIFFCompression {
   NSTIFFCompressionOldJPEG
 } NSTIFFCompression;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 // FIXME: This is probably wrong
 typedef enum _NSBitmapImageFileType {
     NSTIFFFileType = 0,
@@ -90,7 +92,7 @@ typedef enum _NSBitmapImageFileType {
 		    bytesPerRow: (int)rowBytes
 		   bitsPerPixel: (int)pixelBits;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)colorizeByMappingGray:(float)midPoint 
 		      toColor:(NSColor *)midPointColor 
 		 blackMapping:(NSColor *)shadowColor
@@ -126,7 +128,7 @@ typedef enum _NSBitmapImageFileType {
 - (NSData*) TIFFRepresentationUsingCompression: (NSTIFFCompression)type
 					factor: (float)factor;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (NSData *)representationOfImageRepsInArray:(NSArray *)imageReps 
 				   usingType:(NSBitmapImageFileType)storageType
 				  properties:(NSDictionary *)properties;
@@ -146,7 +148,7 @@ typedef enum _NSBitmapImageFileType {
 - (void) setCompression: (NSTIFFCompression)compression
 		 factor: (float)factor;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setProperty:(NSString *)property withValue:(id)value;
 - (id)valueForProperty:(NSString *)property;
 #endif

Headers/AppKit/NSBox.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSBox
 #define _GNUstep_H_NSBox
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSView.h>
 
@@ -70,7 +72,7 @@ typedef enum _NSTitlePosition {
 - (NSFont *)titleFont;
 - (NSTitlePosition)titlePosition;
 - (NSRect)titleRect;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setTitleWithMnemonic:(NSString *)aString;
 #endif
 
@@ -88,7 +90,7 @@ typedef enum _NSTitlePosition {
 - (void)setFrameFromContentFrame:(NSRect)contentFrame;
 - (void)sizeToFit;
 
-#ifndef NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 -(NSSize) minimumSize;
 #endif
 @end

Headers/AppKit/NSBrowser.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSBrowser
 #define _GNUstep_H_NSBrowser
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSControl.h>
 
@@ -174,7 +176,7 @@
 - (void) drawTitle: (NSString *)title
 	    inRect: (NSRect)aRect
 	  ofColumn: (int)column;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) drawTitleOfColumn: (int)column 
 		    inRect: (NSRect)aRect;
 #endif 

Headers/AppKit/NSBrowserCell.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSBrowserCell
 #define _GNUstep_H_NSBrowserCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSCell.h>
 

Headers/AppKit/NSButton.h

@@ -24,11 +24,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSButton
 #define _GNUstep_H_NSButton
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSControl.h>
 #include <AppKit/NSButtonCell.h>
@@ -45,7 +47,7 @@
 // Setting the Button Type 
 //
 - (void)setButtonType:(NSButtonType)aType;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setHighlightsBy:(int)aType;
 - (void)setShowsStateBy:(int)aType;
 #endif
@@ -74,7 +76,7 @@
 - (void)setAlternateTitle:(NSString *)aString;
 - (void)setTitle:(NSString *)aString;
 - (NSString *)title;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSAttributedString *)attributedAlternateTitle;
 - (NSAttributedString *)attributedTitle;
 - (void)setAttributedAlternateTitle:(NSAttributedString *)aString;
@@ -99,7 +101,7 @@
 - (BOOL)isTransparent;
 - (void)setBordered:(BOOL)flag;
 - (void)setTransparent:(BOOL)flag;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSBezelStyle)bezelStyle;
 - (void)setBezelStyle:(NSBezelStyle)bezelStyle;
 - (void)setShowsBorderOnlyWhileMouseInside:(BOOL)show;
@@ -127,7 +129,7 @@
 //
 // Sound
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setSound:(NSSound *)aSound;
 - (NSSound *)sound;
 #endif

Headers/AppKit/NSButtonCell.h

@@ -24,11 +24,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSButtonCell
 #define _GNUstep_H_NSButtonCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSActionCell.h>
 
@@ -104,7 +106,7 @@ typedef enum _NSGradientType {
 - (void)setFont:(NSFont *)fontObject;
 - (void)setTitle:(NSString *)aString;
 - (NSString *)title;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSAttributedString *)attributedAlternateTitle;
 - (NSAttributedString *)attributedTitle;
 - (void)setAttributedAlternateTitle:(NSAttributedString *)aString;
@@ -149,7 +151,7 @@ typedef enum _NSGradientType {
 //
 - (BOOL)isTransparent;
 - (void)setTransparent:(BOOL)flag;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSBezelStyle)bezelStyle;
 - (void)setBezelStyle:(NSBezelStyle)bezelStyle;
 - (BOOL)showsBorderOnlyWhileMouseInside;
@@ -172,7 +174,7 @@ typedef enum _NSGradientType {
 //
 // Sound
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setSound:(NSSound *)aSound;
 - (NSSound *)sound;
 #endif
@@ -180,7 +182,7 @@ typedef enum _NSGradientType {
 //
 // Mouse
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)mouseEntered:(NSEvent *)event;
 - (void)mouseExited:(NSEvent *)event;
 #endif

Headers/AppKit/NSCachedImageRep.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSCachedImageRep
 #define _GNUstep_H_NSCachedImageRep
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSImageRep.h>
 #include <AppKit/NSGraphics.h>

Headers/AppKit/NSCell.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSCell
 #define _GNUstep_H_NSCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
@@ -162,7 +164,7 @@ enum {
 //
 // Class methods
 // 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (NSMenu *)defaultMenu;
 #endif
 + (BOOL) prefersTrackingUntilMouseUp;
@@ -242,7 +244,7 @@ enum {
 - (void)setWraps:(BOOL)flag;
 - (BOOL)wraps;
 - (NSText *)setUpFieldEditorAttributes:(NSText *)textObject;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setAttributedStringValue:(NSAttributedString *)attribStr;
 - (NSAttributedString *)attributedStringValue;
 - (void)setAllowsEditingTextAttributes:(BOOL)flag;
@@ -279,7 +281,7 @@ enum {
 //
 // Formatting Data and Validating Input 
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setFormatter:(NSFormatter *)newFormatter;
 - (id)formatter;
 #endif
@@ -293,7 +295,7 @@ enum {
 //
 // Menu
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setMenu:(NSMenu *)aMenu;
 - (NSMenu *)menu;
 - (NSMenu *)menuForEvent:(NSEvent *)anEvent 
@@ -318,7 +320,7 @@ enum {
 // interface so methods referring to mnemonics do nothing -- they are
 // provided for compatibility only; please use key equivalents instead
 // in your GNUstep programs.
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (BOOL)acceptsFirstResponder;
 - (void)setShowsFirstResponder:(BOOL)flag;
 - (BOOL)showsFirstResponder;
@@ -391,7 +393,7 @@ enum {
 - (NSRect)drawingRectForBounds:(NSRect)theRect;
 - (NSRect)imageRectForBounds:(NSRect)theRect;
 - (NSRect)titleRectForBounds:(NSRect)theRect;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setControlSize:(NSControlSize)controlSize;
 - (NSControlSize)controlSize;
 #endif
@@ -408,7 +410,7 @@ enum {
 	withFrame:(NSRect)cellFrame
 	   inView:(NSView *)controlView;
 - (BOOL)isHighlighted;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setHighlighted: (BOOL) flag;
 - (NSColor*)highlightColorWithFrame:(NSRect)cellFrame
 			     inView:(NSView *)controlView;
@@ -431,7 +433,7 @@ enum {
 		  start:(int)selStart	 
 		 length:(int)selLength;
 - (void)endEditing:(NSText *)textObject;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (BOOL)sendsActionOnEndEditing;
 - (void)setSendsActionOnEndEditing:(BOOL)flag;
 #endif

Headers/AppKit/NSClipView.h

@@ -22,11 +22,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 
 #ifndef _GNUstep_H_NSClipView
 #define _GNUstep_H_NSClipView
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSView.h>
 
@@ -70,7 +72,7 @@
 - (void)setBackgroundColor:(NSColor*)aColor;
 - (NSColor*)backgroundColor;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /* Setting the background drawing */
 - (void)setDrawsBackground:(BOOL)flag;
 - (BOOL)drawsBackground;

Headers/AppKit/NSColor.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSColor
 #define _GNUstep_H_NSColor
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <AppKit/AppKitDefines.h>
@@ -186,7 +188,7 @@ typedef enum _NSControlSize {
 - (void)drawSwatchInRect:(NSRect)rect;
 - (void)set;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 //
 // Changing the color
 //
@@ -241,7 +243,7 @@ typedef enum _NSControlSize {
 
 APPKIT_EXPORT NSString	*NSSystemColorsDidChangeNotification;
 
-#ifndef	STRICT_MACOS_X
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 @interface NSCoder (NSCoderAdditions)
 
 //

Headers/AppKit/NSColorList.h

@@ -25,11 +25,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSColorList
 #define _GNUstep_H_NSColorList
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <AppKit/AppKitDefines.h>

Headers/AppKit/NSColorPanel.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSColorPanel
 #define _GNUstep_H_NSColorPanel
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSBox.h>

Headers/AppKit/NSColorPicker.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSColorPicker
 #define _GNUstep_H_NSColorPicker
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <AppKit/NSColorPicking.h>

Headers/AppKit/NSColorPicking.h

@@ -22,11 +22,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */ 
 
 #ifndef _GNUstep_H_NSColorPicking
 #define _GNUstep_H_NSColorPicking
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <objc/Protocol.h>
 

Headers/AppKit/NSColorWell.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSColorWell
 #define _GNUstep_H_NSColorWell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSControl.h>
 

Headers/AppKit/NSComboBox.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSComboBox
 #define _GNUstep_H_NSComboBox
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSTextField.h>
 
@@ -79,7 +81,7 @@
 - (int) indexOfItemWithObjectValue: (id)object;
 - (NSArray *) objectValues;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /* text completion */
 - (void) setCompletes: (BOOL)completes;
 - (BOOL) completes;
@@ -91,7 +93,7 @@
 - (id) comboBox: (NSComboBox *)aComboBox objectValueForItemAtIndex:(int)index;
 - (unsigned int) comboBox: (NSComboBox *)aComboBox 
   indexOfItemWithStringValue: (NSString *)string;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /* text completion */
 - (NSString *) comboBox: (NSComboBox *)aComboBox 
 	completedString: (NSString *)aString;

Headers/AppKit/NSComboBoxCell.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSComboBoxCell
 #define _GNUstep_H_NSComboBoxCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSGeometry.h>
 #include <AppKit/NSTextFieldCell.h>
@@ -102,7 +104,7 @@
 	     ofView: (NSView *)controlView 
        untilMouseUp: (BOOL)flag;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /* text completion */
 - (NSString *)completedString:(NSString *)substring;
 - (void)setCompletes:(BOOL)completes;
@@ -116,7 +118,7 @@
   objectValueForItemAtIndex:(int)index;
 - (unsigned int)comboBoxCell:(NSComboBoxCell *)aComboBoxCell
   indexOfItemWithStringValue:(NSString *)string;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /* text completion */
 - (NSString *)comboBoxCell:(NSComboBoxCell *)aComboBoxCell 
 	   completedString:(NSString *)uncompletedString;

Headers/AppKit/NSControl.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSControl
 #define _GNUstep_H_NSControl
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSText.h>
 
@@ -107,7 +109,7 @@
 - (void)setFloatingPointFormat:(BOOL)autoRange
 			  left:(unsigned)leftDigits
 			 right:(unsigned)rightDigits;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)setFormatter:(NSFormatter*)newFormatter;
 - (id)formatter;
 #endif
@@ -150,7 +152,7 @@
 //
 // Attributed string handling
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSAttributedString *)attributedStringValue;
 - (void)setAttributedStringValue:(NSAttributedString *)attribStr;
 #endif 
@@ -165,7 +167,7 @@
 // Activation
 //
 - (void)performClick:(id)sender;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (BOOL)refusesFirstResponder;
 - (void)setRefusesFirstResponder:(BOOL)flag;
 #endif
@@ -209,7 +211,7 @@ APPKIT_EXPORT NSString *NSControlTextDidChangeNotification;
   didFailToValidatePartialString: (NSString *)string 
   errorDescription: (NSString *)error;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (BOOL) control: (NSControl *)control 
   textView: (NSTextView *)textView 
   doCommandBySelector: (SEL)command;

Headers/AppKit/NSCursor.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSCursor
 #define _GNUstep_H_NSCursor
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 
@@ -52,7 +54,7 @@
 	     hotSpot: (NSPoint)hotSpot;
 
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (id)initWithImage:(NSImage *)newImage 
 foregroundColorHint:(NSColor *)fg 
 backgroundColorHint:(NSColor *)bg
@@ -64,7 +66,7 @@ backgroundColorHint:(NSColor *)bg
  */
 - (NSPoint) hotSpot;
 - (NSImage*) image;
-#ifndef	STRICT_MACOS_X
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 - (void) setHotSpot: (NSPoint)spot;
 - (void) setImage: (NSImage *)newImage;
 #endif
@@ -94,11 +96,11 @@ backgroundColorHint:(NSColor *)bg
 + (NSCursor*) currentCursor;
 + (NSCursor*) IBeamCursor;
 
-#ifndef NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 + (NSCursor*) greenArrowCursor;
 #endif
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (NSCursor*) closedHandCursor;
 + (NSCursor*) crosshairCursor;
 + (NSCursor*) disappearingItemCursor;

Headers/AppKit/NSCustomImageRep.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSCustomImageRep
 #define _GNUstep_H_NSCustomImageRep
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSImageRep.h>
 

Headers/AppKit/NSDataLink.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSDataLink
 #define _GNUstep_H_NSDataLink
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <AppKit/AppKitDefines.h>

Headers/AppKit/NSDataLinkManager.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSDataLinkManager
 #define _GNUstep_H_NSDataLinkManager
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 

Headers/AppKit/NSDataLinkPanel.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSDataLinkPanel
 #define _GNUstep_H_NSDataLinkPanel
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSPanel.h>

Headers/AppKit/NSDocument.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSDocument
 #define _GNUstep_H_NSDocument
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <AppKit/NSNibDeclarations.h>

Headers/AppKit/NSDocumentController.h

@@ -23,12 +23,14 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 #ifndef _GNUstep_H_NSDocumentController
 #define _GNUstep_H_NSDocumentController
+#import <GNUstepBase/GSVersionMacros.h>
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 
 #include <Foundation/Foundation.h>
 #include <AppKit/NSNibDeclarations.h>
@@ -119,7 +121,7 @@
 
 @end
 
-#endif // STRICT_OPENSTEP
+#endif // GS_API_MACOSX
 
 #endif // _GNUstep_H_NSDocumentController
 

Headers/AppKit/NSDocumentFrameworkPrivate.h

@@ -23,10 +23,12 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 #ifndef _GNUstep_H_NSDocumentFramworkPrivate
 #define _GNUstep_H_NSDocumentFramworkPrivate
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include "NSDocumentController.h"
 

Headers/AppKit/NSDragging.h

@@ -22,11 +22,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */ 
 
 #ifndef _GNUstep_H_NSDragging
 #define _GNUstep_H_NSDragging
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSGeometry.h>
 
@@ -87,7 +89,7 @@ typedef enum _NSDragOperation {
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
 - (void)concludeDragOperation:(id <NSDraggingInfo>)sender;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)draggingEnded: (id <NSDraggingInfo>)sender;
 - (BOOL)wantsPeriodicDraggingUpdates;
 #endif
@@ -110,7 +112,7 @@ typedef enum _NSDragOperation {
              endedAt: (NSPoint)screenPoint
            deposited: (BOOL)didDeposit;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)draggedImage: (NSImage*)image
              endedAt: (NSPoint)screenPoint
 	   operation: (NSDragOperation)operation;

Headers/AppKit/NSDrawer.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSDrawer
 #define _GNUstep_H_NSDrawer
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSGeometry.h>
 #include <AppKit/NSResponder.h>

Headers/AppKit/NSEPSImageRep.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSEPSImageRep
 #define _GNUstep_H_NSEPSImageRep
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSGeometry.h>
 #include <AppKit/NSImageRep.h>

Headers/AppKit/NSEvent.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSEvent
 #define _GNUstep_H_NSEvent
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
@@ -203,7 +205,7 @@ enum {
 		     clickCount: (int)clickNum	
 		       pressure: (float)pressureValue;
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 + (NSEvent*) mouseEventWithType: (NSEventType)type	
 		       location: (NSPoint)location
 		  modifierFlags: (unsigned int)flags
@@ -236,7 +238,7 @@ enum {
 + (void) stopPeriodicEvents;
 
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (int) buttonNumber;
 #endif
 - (NSString *) characters;
@@ -245,7 +247,7 @@ enum {
 - (NSGraphicsContext*) context;
 - (int) data1;
 - (int) data2;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (float)deltaX;
 - (float)deltaY;
 - (float)deltaZ;
@@ -347,7 +349,7 @@ enum {
  */
 unsigned int NSEventMaskFromType(NSEventType type);
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 typedef enum {
   GSAppKitWindowMoved = 1,
   GSAppKitWindowResized,

Headers/AppKit/NSFileWrapper.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSFileWrapper
 #define _GNUstep_H_NSFileWrapper
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSDictionary.h>
 #include <AppKit/NSImage.h>

Headers/AppKit/NSFont.h

@@ -24,11 +24,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSFont
 #define _GNUstep_H_NSFont
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
@@ -110,7 +112,7 @@ APPKIT_EXPORT const float *NSFontIdentityMatrix;
 + (NSFont*) userFixedPitchFontOfSize: (float)fontSize;
 + (NSFont*) userFontOfSize: (float)fontSize;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (NSFont*) titleBarFontOfSize: (float)fontSize;
 + (NSFont*) menuFontOfSize: (float)fontSize;
 + (NSFont*) messageFontOfSize: (float)fontSize;
@@ -124,7 +126,7 @@ APPKIT_EXPORT const float *NSFontIdentityMatrix;
 //
 // Font Sizes
 //
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (float) labelFontSize;
 + (float) smallSystemFontSize;
 + (float) systemFontSize;
@@ -173,7 +175,7 @@ APPKIT_EXPORT const float *NSFontIdentityMatrix;
 - (float) widthOfString: (NSString*)string;
 - (float) defaultLineHeightForFont;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (unsigned) numberOfGlyphs;
 - (NSCharacterSet*) coveredCharacterSet;
 - (NSFontDescriptor*) fontDescriptor;
@@ -212,7 +214,7 @@ APPKIT_EXPORT const float *NSFontIdentityMatrix;
 
 @end
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 @class GSFontInfo;
 
 @interface NSFont (GNUstep)

Headers/AppKit/NSFontManager.h

@@ -26,11 +26,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSFontManager
 #define _GNUstep_H_NSFontManager
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 

Headers/AppKit/NSFontPanel.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSFontPanel
 #define _GNUstep_H_NSFontPanel
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSPanel.h>
 #include <AppKit/NSFontManager.h>

Headers/AppKit/NSForm.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSForm
 #define _GNUstep_H_NSForm
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSMatrix.h>
 

Headers/AppKit/NSFormCell.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSFormCell
 #define _GNUstep_H_NSFormCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSActionCell.h>
 
@@ -57,7 +59,7 @@
 - (float)titleWidth;
 - (float)titleWidth:(NSSize)aSize;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 //
 // Attributed title
 //

Headers/AppKit/NSGraphics.h

@@ -20,10 +20,12 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 #ifndef __NSGraphics_h__
 #define __NSGraphics_h__
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSGeometry.h>
@@ -46,7 +48,7 @@ APPKIT_EXPORT NSString *NSDeviceBlackColorSpace;
 APPKIT_EXPORT NSString *NSDeviceRGBColorSpace;
 APPKIT_EXPORT NSString *NSDeviceCMYKColorSpace;
 APPKIT_EXPORT NSString *NSNamedColorSpace;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 APPKIT_EXPORT NSString *NSPatternColorSpace;
 #endif
 APPKIT_EXPORT NSString *NSCustomColorSpace;
@@ -211,7 +213,7 @@ GSWViewIsFlipped(NSGraphicsContext *ctxt)
     (ctxt, @selector(GSWViewIsFlipped));
 }
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 @class	NSArray;
 @class	NSWindow;
 
@@ -220,7 +222,7 @@ APPKIT_EXPORT NSArray* GSAllWindows(void);
 APPKIT_EXPORT NSWindow* GSWindowWithNumber(int num);
 #endif
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 // Window operations
 APPKIT_EXPORT void NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum);
 APPKIT_EXPORT void NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum);

Headers/AppKit/NSGraphicsContext.h

@@ -23,11 +23,13 @@
    
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
    */
 
 #ifndef _NSGraphicsContext_h_INCLUDE
 #define _NSGraphicsContext_h_INCLUDE
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSMapTable.h>
@@ -92,7 +94,7 @@ typedef enum _NSImageInterpolation
 
 /*
  * The following graphics context stuff is needed by inline functions,
- * so it must always be available even when STRICT_OPENSTEP is defined.
+ * so it must always be available even when compiling for MACOSX or OPENSTEP
  */
 
 
@@ -187,7 +189,7 @@ typedef enum _GSColorSpace
 
 APPKIT_EXPORT NSGraphicsContext	*GSCurrentContext(void);
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 
 @interface NSGraphicsContext (GNUstep)
 + (void) setDefaultContextClass: (Class)defaultContextClass;

Headers/AppKit/NSHelpManager.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef __GNUstep_H_NSHelpManager
 #define __GNUstep_H_NSHelpManager
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSGeometry.h>

Headers/AppKit/NSHelpPanel.h

@@ -23,13 +23,16 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
-#ifndef	STRICT_MACOS_X
 
 #ifndef _GNUstep_H_NSHelpPanel
 #define _GNUstep_H_NSHelpPanel
+#import <GNUstepBase/GSVersionMacros.h>
+
+#if	OS_API_VERSION(GS_API_OPENSTEP,GS_API_MACOSX) || GS_API_VERSION(GS_API_NONE, GS_API_LATEST)
 
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSPanel.h>
@@ -88,6 +91,6 @@
 
 @end
 
+#endif // !GS_API_MACOSX
 #endif // _GNUstep_H_NSHelpPanel
-#endif // STRICT_MACOS_X
 

Headers/AppKit/NSImage.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSImage
 #define _GNUstep_H_NSImage
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSGraphicsContext.h>
 #include <Foundation/NSBundle.h>
@@ -86,7 +88,7 @@ typedef enum {
 - (id) initWithPasteboard: (NSPasteboard*)pasteboard;
 - (id) initWithSize: (NSSize)aSize;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (id)initWithBitmapHandle:(void *)bitmap;
 - (id)initWithContentsOfURL:(NSURL *)anURL;
 - (id)initWithIconHandle:(void *)icon;
@@ -102,8 +104,8 @@ typedef enum {
 // Referring to Images by Name 
 //
 + (id) imageNamed: (NSString*)aName;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
-#ifndef NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 + (NSImage*) _standardImageWithName: (NSString*)name;
 #endif
 #endif
@@ -133,7 +135,7 @@ typedef enum {
 		fromRect: (NSRect)aRect
 		fraction: (float)aFloat;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) compositeToPoint: (NSPoint)aPoint
 		 fromRect: (NSRect)srcRect
 		operation: (NSCompositingOperation)op
@@ -177,7 +179,7 @@ typedef enum {
 //
 - (BOOL) drawRepresentation: (NSImageRep*)imageRep
 		     inRect: (NSRect)aRect;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /** Calls -drawAtPoint:fromRect:operation:fraction: with
     <code>dstRect</code> given by <code>point</code> and the size of
     <code>srcRect</code>.  */
@@ -251,7 +253,7 @@ typedef enum {
 
 @end
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 /*
  * A formal protocol that duplicates the informal protocol for delegates.
  */

Headers/AppKit/NSImageCell.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSImageCell
 #define _GNUstep_H_NSImageCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSCell.h>
 

Headers/AppKit/NSImageRep.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSImageRep
 #define _GNUstep_H_NSImageRep
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSGeometry.h>
 #include <AppKit/AppKitDefines.h>
@@ -61,7 +63,7 @@ enum {
 + (NSArray *)imageRepsWithContentsOfFile:(NSString *)filename;
 + (id)imageRepWithPasteboard:(NSPasteboard *)pasteboard;
 + (NSArray *)imageRepsWithPasteboard:(NSPasteboard *)pasteboard;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (id)imageRepWithContentsOfURL:(NSURL *)anURL;
 + (NSArray *)imageRepsWithContentsOfURL:(NSURL *)anURL;
 #endif

Headers/AppKit/NSImageView.h

@@ -20,11 +20,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 
 #ifndef _GNUstep_H_NSImageView
 #define _GNUstep_H_NSImageView
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSControl.h>
 #include <AppKit/NSImageCell.h>

Headers/AppKit/NSInputManager.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSInputManager
 #define _GNUstep_H_NSInputManager
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <objc/Protocol.h>
 #include <objc/objc.h>

Headers/AppKit/NSInputServer.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSInputServer
 #define _GNUstep_H_NSInputServer
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <objc/Protocol.h>
 #include <Foundation/NSGeometry.h>

Headers/AppKit/NSInterfaceStyle.h

@@ -21,13 +21,15 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSInterfaceStyle
 #define _GNUstep_H_NSInterfaceStyle
+#import <GNUstepBase/GSVersionMacros.h>
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 
 #include <AppKit/AppKitDefines.h>
 
@@ -53,7 +55,7 @@ APPKIT_EXPORT NSString	*NSInterfaceStyleDefault;
 APPKIT_EXPORT NSInterfaceStyle
 NSInterfaceStyleForKey(NSString *key, NSResponder *responder);
 
-#endif // STRICT_OPENSTEP
+#endif // GS_API_MACOSX
 
 #endif // _GNUstep_H_NSInterfaceStyle
 

Headers/AppKit/NSLayoutManager.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSLayoutManager
 #define _GNUstep_H_NSLayoutManager
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <GNUstepGUI/GSLayoutManager.h>
 #include <AppKit/NSTextView.h>

Headers/AppKit/NSMatrix.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSMatrix
 #define _GNUstep_H_NSMatrix
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSControl.h>
 

Headers/AppKit/NSMenu.h

@@ -22,11 +22,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSMenu
 #define _GNUstep_H_NSMenu
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSGeometry.h>
@@ -564,7 +566,7 @@ The displayed menus on the screen have the following structure:
 - (BOOL) validateMenuItem: (id<NSMenuItem>)menuItem;
 @end
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 @interface NSObject (NSMenuActionResponder)
 - (BOOL) validateMenuItem: (id<NSMenuItem>)aMenuItem;
 @end

Headers/AppKit/NSMenuItem.h

@@ -26,11 +26,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSMenuItem
 #define _GNUstep_H_NSMenuItem
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 
@@ -347,7 +349,7 @@
 
 @end
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 @interface NSMenuItem (GNUstepExtra)
 - (void) setChangesState: (BOOL)flag;
 - (BOOL) changesState;

Headers/AppKit/NSMenuItemCell.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSMenuItemCell
 #define _GNUstep_H_NSMenuItemCell
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSActionCell.h>
 #include <AppKit/NSButtonCell.h>

Headers/AppKit/NSMenuView.h

@@ -21,11 +21,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSMenuView
 #define _GNUstep_H_NSMenuView
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSArray.h>

Headers/AppKit/NSMovie.h

@@ -22,11 +22,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSMovie
 #define _GNUstep_H_NSMovie
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 

Headers/AppKit/NSMovieView.h

@@ -22,11 +22,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSMovieView
 #define _GNUstep_H_NSMovieView
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSView.h>
 

Headers/AppKit/NSNib.h

@@ -35,11 +35,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSNib
 #define _GNUstep_H_NSNib
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSZone.h>
@@ -67,7 +69,7 @@
 - (BOOL)instantiateNibWithExternalNameTable: (NSDictionary *)externalNameTable;
 - (BOOL)instantiateNibWithOwner: (id)owner topLevelObjects: (NSArray **)topLevelObjects;
 
-#ifndef NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 - (BOOL)instantiateNibWithExternalNameTable: (NSDictionary *)externalNameTable withZone: (NSZone *)zone;
 #endif
 

Headers/AppKit/NSNibConnector.h

@@ -20,11 +20,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */ 
 
 #ifndef _GNUstep_H_NSNibConnector
 #define _GNUstep_H_NSNibConnector
+#import <GNUstepBase/GSVersionMacros.h>
 
 #ifndef GNUSTEP
 #include <Foundation/Foundation.h>

Headers/AppKit/NSNibDeclarations.h

@@ -24,13 +24,15 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _NSNibDeclarations_H_
 #define _NSNibDeclarations_H_
+#import <GNUstepBase/GSVersionMacros.h>
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 #define IBOutlet
 #define IBAction void
 #endif

Headers/AppKit/NSNibLoading.h

@@ -22,11 +22,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */ 
 
 #ifndef _GNUstep_H_NSNibLoading
 #define _GNUstep_H_NSNibLoading
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSBundle.h>
@@ -60,9 +62,9 @@
    externalNameTable: (NSDictionary *)context
 	    withZone: (NSZone *)zone;
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 - (NSString *) pathForNibResource: (NSString *)fileName;
-#endif // NO_GNUSTEP
+#endif // GS_API_NONE
 @end
 
 #endif /* _GNUstep_H_NSNibLoading */

Headers/AppKit/NSOpenGL.h

@@ -19,11 +19,13 @@
    
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
    */
 
 #ifndef _NSOpenGL_h_INCLUDE
 #define _NSOpenGL_h_INCLUDE
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 @class NSView;

Headers/AppKit/NSOpenGLView.h

@@ -19,11 +19,13 @@
    
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
    */
 
 #ifndef _NSOpenGLView_h
 #define _NSOpenGLView_h
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSView.h>
 

Headers/AppKit/NSOpenPanel.h

@@ -30,11 +30,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSOpenPanel
 #define _GNUstep_H_NSOpenPanel
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSSavePanel.h>
 
@@ -56,7 +58,7 @@
                         file: (NSString *)name
                        types: (NSArray *)fileTypes;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (int) runModalForDirectory: (NSString *)path
 			file: (NSString *)name
 		       types: (NSArray *)fileTypes
@@ -72,7 +74,7 @@
 
 - (NSArray *) filenames;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSArray *) URLs; 
 #endif
 
@@ -81,7 +83,7 @@
 - (BOOL) canChooseFiles;
 - (void) setCanChooseDirectories: (BOOL)flag;
 - (void) setCanChooseFiles: (BOOL)flag;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) setResolvesAliases: (BOOL)flag; 
 - (BOOL) resolvesAliases; 
 #endif

Headers/AppKit/NSOutlineView.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSOutlineView
 #define _GNUstep_H_NSOutlineView
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSTableView.h>
 #include <Foundation/NSMapTable.h>

Headers/AppKit/NSPageLayout.h

@@ -25,11 +25,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPageLayout
 #define _GNUstep_H_NSPageLayout
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSPanel.h>
@@ -78,8 +80,8 @@ enum {
 // Running the Panel 
 //
 - (int)runModal;
-- (int)runModalWithPrintInfo:(NSPrintInfo *)pInfo;
+- (int)runModalWithPrintInfo:(NSPrintInfo *)printInfo;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)beginSheetWithPrintInfo:(NSPrintInfo *)printInfo
                  modalForWindow:(NSWindow *)docWindow
                        delegate:(id)delegate

Headers/AppKit/NSPanel.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPanel
 #define _GNUstep_H_NSPanel
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSWindow.h>
 
@@ -55,7 +57,7 @@ enum {
 #define NSAlertAlternate NSAlertAlternateReturn
 #define NSAlertOther NSAlertOtherReturn
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 #define	NS_ALERTDEFAULT		NSAlertDefaultReturn
 #define	NS_ALERTALTERNATE	NSAlertAlternateReturn
 #define	NS_ALERTOTHER		NSAlertOtherReturn
@@ -91,7 +93,7 @@ APPKIT_EXPORT id NSGetAlertPanel(NSString *title,
 				  NSString *alternateButton, 
 				  NSString *otherButton, ...);
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 APPKIT_EXPORT id NSGetCriticalAlertPanel(NSString *title,
 					  NSString *msg,
 					  NSString *defaultButton,
@@ -114,7 +116,7 @@ APPKIT_EXPORT int NSRunAlertPanel(NSString *title,
 				   NSString *alternateButton,
 				   NSString *otherButton, ...);
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 APPKIT_EXPORT int NSRunCriticalAlertPanel(NSString *title,
 					   NSString *msg,
 					   NSString *defaultButton,
@@ -128,7 +130,7 @@ APPKIT_EXPORT int NSRunInformationalAlertPanel(NSString *title,
 						NSString *otherButton, ...);
 #endif
 
-#ifndef	STRICT_MACOS_X
+#if OS_API_VERSION(GS_API_ONE, GS_API_ONE)
 APPKIT_EXPORT int NSRunLocalizedAlertPanel(NSString *table,
 					    NSString *title,
 					    NSString *msg,
@@ -137,7 +139,7 @@ APPKIT_EXPORT int NSRunLocalizedAlertPanel(NSString *table,
 					    NSString *otherButton, ...);
 #endif
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 //
 // New alert interface of Mac OS X
 //

Headers/AppKit/NSParagraphStyle.h

@@ -1,4 +1,5 @@
 /* 
+#import <GNUstepBase/GSVersionMacros.h>
    NSParagraphStyle.h
 
      NSParagraphStyle and NSMutableParagraphStyle hold paragraph style 
@@ -25,7 +26,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #include <AppKit/NSText.h>
@@ -133,7 +135,7 @@ typedef enum _NSWritingDirection {
 - (float) maximumLineHeight;
 - (NSLineBreakMode) lineBreakMode;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /*
  *      Returns the writing direction of "language", which is an ISO 639
  *      two- or three letter code, e.g. "en", or an ISO language-region
@@ -163,7 +165,7 @@ typedef enum _NSWritingDirection {
 - (void) setTabStops: (NSArray*)array;
 - (void) setParagraphStyle: (NSParagraphStyle*)obj;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) setBaseWritingDirection: (NSWritingDirection)direction;
 #endif
 @end

Headers/AppKit/NSPasteboard.h

@@ -24,11 +24,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPasteboard
 #define _GNUstep_H_NSPasteboard
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
@@ -108,7 +110,7 @@ APPKIT_EXPORT NSString *NSDataLinkPboardType;
  */
 APPKIT_EXPORT NSString *NSGeneralPboardType;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 /**
  * Pasteboard contains a PDF document
  */
@@ -253,7 +255,7 @@ APPKIT_EXPORT NSString *NSPasteboardCommunicationException;
 - (void) pasteboard: (NSPasteboard*)sender
  provideDataForType: (NSString*)type;
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 /**
  * Implemented where GNUstep pasteboard extensions are required.<br />
  * This method is called by the pasteboard system when it does not have
@@ -282,7 +284,7 @@ APPKIT_EXPORT NSString *NSPasteboardCommunicationException;
 - (void) setHistory: (unsigned)length;
 @end
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 #include <Foundation/NSURL.h>
 
 @interface NSURL (NSPasteboard)

Headers/AppKit/NSPopUpButton.h

@@ -25,7 +25,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPopUpButton

Headers/AppKit/NSPopUpButtonCell.h

@@ -23,7 +23,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPopUpButtonCell

Headers/AppKit/NSPrintInfo.h

@@ -27,7 +27,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPrintInfo

Headers/AppKit/NSPrintOperation.h

@@ -30,11 +30,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPrintOperation
 #define _GNUstep_H_NSPrintOperation
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSGeometry.h>
@@ -92,7 +94,7 @@ typedef enum _NSPrintingPageOrder {
 + (NSPrintOperation *)printOperationWithView:(NSView *)aView
                                    printInfo:(NSPrintInfo *)aPrintInfo;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (NSPrintOperation *)PDFOperationWithView:(NSView *)aView 
                                 insideRect:(NSRect)rect 
                                     toData:(NSMutableData *)data;
@@ -124,7 +126,7 @@ typedef enum _NSPrintingPageOrder {
 //
 - (BOOL)isEPSOperation;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (BOOL)isCopyingOperation;
 #endif
 
@@ -136,7 +138,7 @@ typedef enum _NSPrintingPageOrder {
 - (void)setPrintPanel:(NSPrintPanel *)panel;
 - (void)setShowPanels:(BOOL)flag;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSView *)accessoryView;
 - (void)setAccessoryView:(NSView *)aView;
 #endif
@@ -161,7 +163,7 @@ typedef enum _NSPrintingPageOrder {
 - (void)cleanUpOperation;
 - (BOOL)deliverResult;
 - (BOOL)runOperation;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void)runOperationModalForWindow: (NSWindow *)docWindow 
                           delegate: (id)delegate 
                     didRunSelector: (SEL)didRunSelector 

Headers/AppKit/NSPrintPanel.h

@@ -26,7 +26,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
 */ 
 
@@ -90,7 +91,7 @@ enum {
 // Running the Panel 
 //
 - (int) runModal;
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) beginSheetWithPrintInfo: (NSPrintInfo *)printInfo 
                   modalForWindow: (NSWindow *)docWindow 
                         delegate: (id)delegate 

Headers/AppKit/NSPrinter.h

@@ -26,7 +26,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSPrinter
@@ -48,7 +49,10 @@ typedef enum _NSPrinterTableStatus {
 
 @interface NSPrinter : NSObject <NSCoding>
 {
-  NSString *_printerHost, *_printerName, *_printerNote, *_printerType;
+  NSString *_printerHost;
+  NSString *_printerName;
+  NSString *_printerNote;
+  NSString *_printerType;
   
   //The way openstep handled NSPrinter was odd, it had a concept of "real" 
   //printers and

Headers/AppKit/NSProgressIndicator.h

@@ -21,7 +21,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSProgressIndicator
@@ -100,7 +101,7 @@
 
 @end
 
-#ifndef NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 @interface NSProgressIndicator (GNUstepExtensions)
 
 /*

Headers/AppKit/NSResponder.h

@@ -23,11 +23,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSResponder
 #define _GNUstep_H_NSResponder
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <AppKit/NSInterfaceStyle.h>
@@ -41,7 +43,7 @@
 
 @interface NSResponder : NSObject <NSCoding>
 {
-#ifdef  STRICT_OPENSTEP
+#if  OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
   int			_interface_style;
 #else
   NSInterfaceStyle	_interface_style;
@@ -118,7 +120,7 @@
 - (void) mouseMoved: (NSEvent*)theEvent;
 - (void) mouseUp: (NSEvent*)theEvent;
 - (void) noResponderFor: (SEL)eventSelector;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) otherMouseDown: (NSEvent*)theEvent;
 - (void) otherMouseDragged: (NSEvent*)theEvent;
 - (void) otherMouseUp: (NSEvent*)theEvent;
@@ -140,7 +142,7 @@
 - (void) encodeWithCoder: (NSCoder*)aCoder;
 - (id) initWithCoder: (NSCoder*)aDecoder;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) interpretKeyEvents: (NSArray*)eventArray;
 - (BOOL) performMnemonic: (NSString*)aString;
 - (void) flushBufferedKeyEvents;
@@ -175,7 +177,7 @@
 #endif
 @end
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 @interface NSResponder (OptionalActionMethods)
 - (void) capitalizeWord: (id)sender;
 - (void) centerSelectionInVisibleArea: (id)sender;

Headers/AppKit/NSRulerMarker.h

@@ -25,7 +25,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 #ifndef _GNUstep_H_NSRulerMarker
 #define _GNUstep_H_NSRulerMarker

Headers/AppKit/NSRulerView.h

@@ -27,7 +27,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 #ifndef _GNUstep_H_NSRulerView
 #define _GNUstep_H_NSRulerView

Headers/AppKit/NSSavePanel.h

@@ -27,11 +27,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef _GNUstep_H_NSSavePanel
 #define _GNUstep_H_NSSavePanel
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSPanel.h>
 
@@ -104,7 +106,7 @@ enum {
 - (void) setPrompt: (NSString *)prompt;
 - (NSString *) prompt;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) setNameFieldLabel: (NSString *)label;
 - (NSString *) nameFieldLabel;
 - (void) setMessage: (NSString *)message;
@@ -126,7 +128,7 @@ enum {
 - (void) setDirectory: (NSString *)path;
 - (void) setRequiredFileType: (NSString *)fileType;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) setAllowedFileTypes: (NSArray *)types;
 - (void) setAllowsOtherFileTypes: (BOOL)flag;
 - (NSArray *) allowedFileTypes;
@@ -138,7 +140,7 @@ enum {
 
 - (void) validateVisibleColumns;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) setCanCreateDirectories: (BOOL)flag;
 - (BOOL) canCreateDirectories;
 #endif
@@ -149,7 +151,7 @@ enum {
 - (int) runModalForDirectory: (NSString *)path file: (NSString *)filename;
 - (int) runModal;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (int) runModalForDirectory: (NSString *)path
 			file: (NSString *)filename
 	    relativeToWindow: (NSWindow*)window;
@@ -166,7 +168,7 @@ enum {
  */
 - (NSString *) directory;
 - (NSString *) filename;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (NSURL *) URL;
 - (BOOL) isExpanded;
 #endif
@@ -211,7 +213,7 @@ enum {
 userEnteredFilename: (NSString *)fileName
           confirmed: (BOOL)okFlag;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (void) panel: (id)sender willExpand: (BOOL)expanding;
 - (void) panelSelectionDidChange: (id)sender;
 - (void) panel: (id)sender directoryDidChange: (NSString *)path;

Headers/AppKit/NSScreen.h

@@ -27,11 +27,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSScreen
 #define _GNUstep_H_NSScreen
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <Foundation/NSObject.h>
 #include <AppKit/NSGraphics.h>
@@ -63,11 +65,11 @@
 - (NSRect) frame;
 - (NSDictionary*) deviceDescription;
 
-#ifndef STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (const NSWindowDepth*) supportedWindowDepths;
 - (NSRect) visibleFrame;
 #endif
-#ifndef NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
 - (int) screenNumber;
 #endif
 

Headers/AppKit/NSScrollView.h

@@ -23,11 +23,13 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 
 #ifndef _GNUstep_H_NSScrollView
 #define _GNUstep_H_NSScrollView
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSView.h>
 
@@ -121,7 +123,7 @@
 - (float)pageScroll;
 - (void)setScrollsDynamically:(BOOL)flag;
 - (BOOL)scrollsDynamically;
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 - (float) horizontalLineScroll;
 - (float) horizontalPageScroll;
 - (float) verticalLineScroll;

Headers/AppKit/NSScroller.h

@@ -24,11 +24,13 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSScroller
 #define _GNUstep_H_NSScroller
+#import <GNUstepBase/GSVersionMacros.h>
 
 #include <AppKit/NSControl.h>
 #include <AppKit/NSCell.h>
@@ -114,7 +116,7 @@ typedef enum _NSScrollerArrow {
 - (void)trackKnob:(NSEvent *)theEvent;
 - (void)trackScrollButtons:(NSEvent *)theEvent;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 + (float)scrollerWidthForControlSize:(NSControlSize)controlSize;
 - (void)setControlSize:(NSControlSize)controlSize;
 - (NSControlSize)controlSize;

Headers/AppKit/NSSearchField.h

@@ -23,7 +23,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSSearchField

Headers/AppKit/NSSearchFieldCell.h

@@ -23,7 +23,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSSearchFieldCell

Headers/AppKit/NSSecureTextField.h

@@ -23,7 +23,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSSecureTextField

Headers/AppKit/NSSelection.h

@@ -23,7 +23,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSSelection

Headers/AppKit/NSSlider.h

@@ -20,7 +20,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 
 #ifndef _GNUstep_H_NSSlider
@@ -65,7 +66,7 @@
 // mouse handling
 - (BOOL) acceptsFirstMouse: (NSEvent*)theEvent;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 // ticks
 - (BOOL) allowsTickMarkValuesOnly;
 - (double) closestTickMarkValueToValue: (double)aValue;

Headers/AppKit/NSSliderCell.h

@@ -20,7 +20,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 */
 
 #ifndef _GNUstep_H_NSSliderCell
@@ -92,7 +93,7 @@ typedef enum _NSTickMarkPosition
 - (void) setMinValue: (double)aDouble;
 - (void) setMaxValue: (double)aDouble;
 
-#ifndef	STRICT_OPENSTEP
+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 // ticks
 - (BOOL) allowsTickMarkValuesOnly;
 - (double) closestTickMarkValueToValue: (double)aValue;

Headers/AppKit/NSSound.h

@@ -23,7 +23,8 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; see the file COPYING.LIB.
    If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */ 
 
 #ifndef _GNUstep_H_NSSound