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

* NSMenuItem.h ADDITIONAL_WIDTH increase defined size (fix overlap in Edit)

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3169 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
far 1998-11-03 21:04:55 +00:00
parent bcea1183c8
commit 59daf30d58
4 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Nov 3 1998 Felipe A. Rodriguez <far@ix.netcom.com>
* NSMenuItem.h ADDITIONAL_WIDTH increase defined size (fix overlap in Edit)
Mon Nov 2 1998 Felipe A. Rodriguez <far@ix.netcom.com>
* NSApplication.m optimize event translation, matching and dispatch. Add

2
Headers/gnustep/gui/NSMenuItem.h
View file

@ -93,7 +93,7 @@
enum {
INTERCELL_SPACE = 1,
RIGHT_IMAGE_WIDTH = 12,
ADDITIONAL_WIDTH = RIGHT_IMAGE_WIDTH + 6
ADDITIONAL_WIDTH = RIGHT_IMAGE_WIDTH + 15
};
#endif // _GNUstep_H_NSMenuItem

23
Source/NSView.m
View file

@ -111,20 +111,19 @@ static NSString *nsview_thread_key = @"NSViewThreadKey";
+ (NSView *)focusView
{
NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
NSMutableArray *stack = [dict objectForKey: nsview_thread_key];
NSView *current_view = nil;
NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
NSMutableArray *stack = [dict objectForKey: nsview_thread_key];
NSView *current_view = nil;
if (stack)
{
unsigned count = [stack count];
if (stack)
{
unsigned count = [stack count];
if (count > 0)
{
current_view = [stack objectAtIndex: --count];
}
}
return current_view;
if (count > 0)
current_view = [stack objectAtIndex: --count];
}
return current_view;
}
- init

40
Source/NSWindow.m
View file

@ -121,13 +121,17 @@ static BOOL _needsFlushWindows = YES;
//
- init
{
int style;
int style;
NSDebugLog(@"NSWindow -init\n");
style = NSTitledWindowMask | NSClosableWindowMask
| NSMiniaturizableWindowMask | NSResizableWindowMask;
return [self initWithContentRect:NSZeroRect styleMask:style
backing:NSBackingStoreBuffered defer:NO];
NSDebugLog(@"NSWindow -init\n");
style = NSTitledWindowMask | NSClosableWindowMask
| NSMiniaturizableWindowMask | NSResizableWindowMask;
return [self initWithContentRect:NSZeroRect
styleMask:style
backing:NSBackingStoreBuffered
defer:NO];
}
- (void)dealloc
@ -153,20 +157,24 @@ static BOOL _needsFlushWindows = YES;
// Initializing and getting a new NSWindow object
//
- initWithContentRect:(NSRect)contentRect
styleMask:(unsigned int)aStyle
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
styleMask:(unsigned int)aStyle
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
{
NSDebugLog(@"NSWindow -initWithContentRect:\n");
return [self initWithContentRect:contentRect styleMask:aStyle
backing:bufferingType defer:flag screen:nil];
NSDebugLog(@"NSWindow -initWithContentRect:\n");
return [self initWithContentRect:contentRect
styleMask:aStyle
backing:bufferingType
defer:flag
screen:nil];
}
- initWithContentRect:(NSRect)contentRect
styleMask:(unsigned int)aStyle
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
screen:aScreen
styleMask:(unsigned int)aStyle
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
screen:aScreen
{
NSApplication *theApp = [NSApplication sharedApplication];
NSRect r = [[NSScreen mainScreen] frame];