gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-30 16:50:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make open panel work when gmodel fails

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4947 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-09-27 09:24:59 +00:00
parent e858f4d021
commit 14c92813af
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Sep 27 1999 Nicola Pero <n.pero@mi.flashnet.it>
* Source/NSOpenPanel.m ([+openPanel]): use NSSavePanel's new
_initWithoutGModel method if loading of gmodel fails.
For now, use always the safer _initWithoutGModel.
Thu Sep 23 1999 Nicola Pero <n.pero@mi.flashnet.it> Thu Sep 23 1999 Nicola Pero <n.pero@mi.flashnet.it>
* Source/NSBrowserCell.m ([-drawInteriorWithFrame:inView:]): Clean * Source/NSBrowserCell.m ([-drawInteriorWithFrame:inView:]): Clean

1
Headers/gnustep/gui/NSView.h
View file

@ -92,7 +92,6 @@ enum {
BOOL is_rotated_from_base; BOOL is_rotated_from_base;
BOOL is_rotated_or_scaled_from_base; BOOL is_rotated_or_scaled_from_base;
BOOL needs_display; BOOL needs_display;
BOOL disable_autodisplay;
BOOL post_frame_changes; BOOL post_frame_changes;
BOOL post_bounds_changes; BOOL post_bounds_changes;
BOOL autoresize_subviews; BOOL autoresize_subviews;

16
Source/NSOpenPanel.m
View file

@ -68,18 +68,16 @@ static NSOpenPanel *gnustep_gui_open_panel = nil;
{ {
if (!gnustep_gui_open_panel) if (!gnustep_gui_open_panel)
{ {
[GMUnarchiver decodeClassName:@"NSSavePanel" // [GMUnarchiver decodeClassName:@"NSSavePanel"
asClassName:@"NSOpenPanel"]; // asClassName:@"NSOpenPanel"];
if( ![GMModel loadIMFile:@"SavePanel" owner:NSApp] ) //if( ![GMModel loadIMFile:@"SavePanel" owner:NSApp] )
{ [[NSOpenPanel alloc] _initWithoutGModel];
[NSException raise:NSGenericException
format:@"Unable to load open panel model file"];
}
[gnustep_gui_open_panel setTitle:@"Open"]; [gnustep_gui_open_panel setTitle:@"Open"];
[GMUnarchiver decodeClassName:@"NSSavePanel" // [GMUnarchiver decodeClassName:@"NSSavePanel"
asClassName:@"NSSavePanel"]; // asClassName:@"NSSavePanel"];
} }
return gnustep_gui_open_panel; return gnustep_gui_open_panel;

3
Source/NSView.m
View file

@ -219,7 +219,6 @@ GSSetDragTypes(NSView* obj, NSArray *types)
window = nil; window = nil;
is_rotated_from_base = NO; is_rotated_from_base = NO;
is_rotated_or_scaled_from_base = NO; is_rotated_or_scaled_from_base = NO;
disable_autodisplay = NO;
needs_display = YES; needs_display = YES;
post_frame_changes = NO; post_frame_changes = NO;
autoresize_subviews = YES; autoresize_subviews = YES;
@ -2282,7 +2281,6 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
[aCoder encodeValueOfObjCType: @encode(BOOL) [aCoder encodeValueOfObjCType: @encode(BOOL)
at: &is_rotated_or_scaled_from_base]; at: &is_rotated_or_scaled_from_base];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &needs_display]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &needs_display];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &disable_autodisplay];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &post_frame_changes]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &post_frame_changes];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &autoresize_subviews]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &autoresize_subviews];
[aCoder encodeValueOfObjCType: @encode(unsigned int) at: &autoresizingMask]; [aCoder encodeValueOfObjCType: @encode(unsigned int) at: &autoresizingMask];
@ -2304,7 +2302,6 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
[aDecoder decodeValueOfObjCType: @encode(BOOL) [aDecoder decodeValueOfObjCType: @encode(BOOL)
at: &is_rotated_or_scaled_from_base]; at: &is_rotated_or_scaled_from_base];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &needs_display]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &needs_display];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &disable_autodisplay];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &post_frame_changes]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &post_frame_changes];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &autoresize_subviews]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &autoresize_subviews];
[aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &autoresizingMask]; [aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &autoresizingMask];