From c24eef3a7c013cc21428c459985e5e77e1471d0d Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 19 Mar 2010 08:18:43 +0000
Subject: [PATCH] Remove includes of GSCategories.h, as this file no longer
 exists.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30000 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog             |  6 ++++++
 Source/NSButtonCell.m | 45 +++++++++++++++++++++----------------------
 Source/NSMenuItem.m   | 34 ++++++++++++++++++--------------
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 140698907..4b5023c96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-19 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSButtonCell.m,
+	* Source/NSMenuItem.m: Remove include of GSCategories.h, as this
+	file no longer exists.
+
 2010-03-18 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSBitmapImageRep+JPEG.m: Put cinfo into a defined state
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 85c2d1902..7acbc7208 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -31,30 +31,29 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
-#include <Foundation/NSLock.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSValue.h>
-#include <GNUstepBase/GSCategories.h>
+#import "config.h"
+#import <Foundation/NSLock.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSValue.h>
 
-#include "AppKit/AppKitExceptions.h"
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSBezierPath.h"
-#include "AppKit/NSButtonCell.h"
-#include "AppKit/NSButton.h"
-#include "AppKit/NSColor.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSSound.h"
-#include "AppKit/NSWindow.h"
-#include "GNUstepGUI/GSTheme.h"
-#include "GNUstepGUI/GSNibLoading.h"
-#include "GSGuiPrivate.h"
+#import "AppKit/AppKitExceptions.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSBezierPath.h"
+#import "AppKit/NSButtonCell.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSSound.h"
+#import "AppKit/NSWindow.h"
+#import "GNUstepGUI/GSTheme.h"
+#import "GNUstepGUI/GSNibLoading.h"
+#import "GSGuiPrivate.h"
 
 #include <math.h>
 
diff --git a/Source/NSMenuItem.m b/Source/NSMenuItem.m
index 59ec417fd..599fefcc4 100644
--- a/Source/NSMenuItem.m
+++ b/Source/NSMenuItem.m
@@ -28,19 +28,19 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#include "config.h"
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSException.h>
-#include <GNUstepBase/GSCategories.h>
-#include "AppKit/NSCell.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSKeyValueBinding.h"
-#include "AppKit/NSMenuItem.h"
-#include "AppKit/NSMenu.h"
-#include "GSBindingHelpers.h"
+#import "config.h"
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSException.h>
+
+#import "AppKit/NSCell.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSKeyValueBinding.h"
+#import "AppKit/NSMenuItem.h"
+#import "AppKit/NSMenu.h"
+#import "GSBindingHelpers.h"
 
 static BOOL usesUserKeyEquivalents = NO;
 static Class imageClass;
@@ -56,6 +56,9 @@ static Class imageClass;
   self = [super initWithTitle: @"-----------"
 		action: NULL
 		keyEquivalent: @""];
+  if (self == nil)
+    return nil;
+
   _enabled = NO;
   _changesState = NO;
   return self;
@@ -66,7 +69,7 @@ static Class imageClass;
   return YES;
 }
 
-// FIXME: We need a lot of methods to switch of changes for a separator
+// FIXME: We need a lot of methods to switch off changes for a separator
 @end
 
 
@@ -127,6 +130,9 @@ static Class imageClass;
        keyEquivalent: (NSString*)charCode
 {
   self = [super init];
+  if (self == nil)
+    return nil;
+
   //_menu = nil;
   [self setTitle: aString];
   [self setKeyEquivalent: charCode];