gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 19:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove includes of GSCategories.h, as this file no longer exists.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30000 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2010-03-19 08:18:43 +00:00
parent b6c4bb0066
commit c24eef3a7c
3 changed files with 48 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2010-03-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBitmapImageRep+JPEG.m: Put cinfo into a defined state * Source/NSBitmapImageRep+JPEG.m: Put cinfo into a defined state

45
Source/NSButtonCell.m
View file

@ -31,30 +31,29 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "config.h" #import "config.h"
#include <Foundation/NSLock.h> #import <Foundation/NSLock.h>
#include <Foundation/NSArray.h> #import <Foundation/NSArray.h>
#include <Foundation/NSString.h> #import <Foundation/NSString.h>
#include <Foundation/NSException.h> #import <Foundation/NSException.h>
#include <Foundation/NSDebug.h> #import <Foundation/NSDebug.h>
#include <Foundation/NSValue.h> #import <Foundation/NSValue.h>
#include <GNUstepBase/GSCategories.h>
#include "AppKit/AppKitExceptions.h" #import "AppKit/AppKitExceptions.h"
#include "AppKit/NSApplication.h" #import "AppKit/NSApplication.h"
#include "AppKit/NSBezierPath.h" #import "AppKit/NSBezierPath.h"
#include "AppKit/NSButtonCell.h" #import "AppKit/NSButtonCell.h"
#include "AppKit/NSButton.h" #import "AppKit/NSButton.h"
#include "AppKit/NSColor.h" #import "AppKit/NSColor.h"
#include "AppKit/NSEvent.h" #import "AppKit/NSEvent.h"
#include "AppKit/NSFont.h" #import "AppKit/NSFont.h"
#include "AppKit/NSGraphics.h" #import "AppKit/NSGraphics.h"
#include "AppKit/NSImage.h" #import "AppKit/NSImage.h"
#include "AppKit/NSSound.h" #import "AppKit/NSSound.h"
#include "AppKit/NSWindow.h" #import "AppKit/NSWindow.h"
#include "GNUstepGUI/GSTheme.h" #import "GNUstepGUI/GSTheme.h"
#include "GNUstepGUI/GSNibLoading.h" #import "GNUstepGUI/GSNibLoading.h"
#include "GSGuiPrivate.h" #import "GSGuiPrivate.h"
#include <math.h> #include <math.h>

34
Source/NSMenuItem.m
View file

@ -28,19 +28,19 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "config.h" #import "config.h"
#include <Foundation/NSUserDefaults.h> #import <Foundation/NSUserDefaults.h>
#include <Foundation/NSDictionary.h> #import <Foundation/NSDictionary.h>
#include <Foundation/NSDebug.h> #import <Foundation/NSDebug.h>
#include <Foundation/NSException.h> #import <Foundation/NSException.h>
#include <GNUstepBase/GSCategories.h>
#include "AppKit/NSCell.h" #import "AppKit/NSCell.h"
#include "AppKit/NSEvent.h" #import "AppKit/NSEvent.h"
#include "AppKit/NSImage.h" #import "AppKit/NSImage.h"
#include "AppKit/NSKeyValueBinding.h" #import "AppKit/NSKeyValueBinding.h"
#include "AppKit/NSMenuItem.h" #import "AppKit/NSMenuItem.h"
#include "AppKit/NSMenu.h" #import "AppKit/NSMenu.h"
#include "GSBindingHelpers.h" #import "GSBindingHelpers.h"
static BOOL usesUserKeyEquivalents = NO; static BOOL usesUserKeyEquivalents = NO;
static Class imageClass; static Class imageClass;
@ -56,6 +56,9 @@ static Class imageClass;
self = [super initWithTitle: @"-----------" self = [super initWithTitle: @"-----------"
action: NULL action: NULL
keyEquivalent: @""]; keyEquivalent: @""];
if (self == nil)
return nil;
_enabled = NO; _enabled = NO;
_changesState = NO; _changesState = NO;
return self; return self;
@ -66,7 +69,7 @@ static Class imageClass;
return YES; 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 @end
@ -127,6 +130,9 @@ static Class imageClass;
keyEquivalent: (NSString*)charCode keyEquivalent: (NSString*)charCode
{ {
self = [super init]; self = [super init];
if (self == nil)
return nil;
//_menu = nil; //_menu = nil;
[self setTitle: aString]; [self setTitle: aString];
[self setKeyEquivalent: charCode]; [self setKeyEquivalent: charCode];