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

* Model/GNUmakefile enable build of test app, fix resource files ref.

Browse source 
* Model/test.gmodel remove ref to IMCustomView.
	* Model/GMAppKit.m add test for XRAW backend.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3175 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
far 1998-11-06 04:01:33 +00:00
parent 52b197e8af
commit c1b0786d0a
8 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Nov 5 1998 Felipe A. Rodriguez <far@ix.netcom.com>
* Model/GNUmakefile enable build of test app, fix resource files ref.
* Model/test.gmodel remove ref to IMCustomView.
* Model/GMAppKit.m add test for XRAW backend.
Wed Nov 4 1998 Felipe A. Rodriguez <far@ix.netcom.com> Wed Nov 4 1998 Felipe A. Rodriguez <far@ix.netcom.com>
* NSApplication.h/NSApplication.m remove unused ivar recycledEventsQueue. * NSApplication.h/NSApplication.m remove unused ivar recycledEventsQueue.

6
Model/GMAppKit.m
View file

@ -94,7 +94,7 @@ void __dummy_GMAppKit_functionForLinking() {}
NSMenu* mainMenu = [self mainMenu]; NSMenu* mainMenu = [self mainMenu];
[mainMenu update]; [mainMenu update];
#if XDPS_BACKEND_LIBRARY #if XDPS_BACKEND_LIBRARY || XRAW_BACKEND_LIBRARY
[mainMenu display]; [mainMenu display];
#endif #endif
@ -454,7 +454,7 @@ void __dummy_GMAppKit_functionForLinking() {}
- (void)encodeWithModelArchiver:(GMArchiver*)archiver - (void)encodeWithModelArchiver:(GMArchiver*)archiver
{ {
#if XDPS_BACKEND_LIBRARY #if XDPS_BACKEND_LIBRARY || XRAW_BACKEND_LIBRARY
[super encodeWithModelArchiver:archiver]; [super encodeWithModelArchiver:archiver];
#endif #endif
@ -468,7 +468,7 @@ void __dummy_GMAppKit_functionForLinking() {}
- (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver - (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver
{ {
#if XDPS_BACKEND_LIBRARY #if XDPS_BACKEND_LIBRARY || XRAW_BACKEND_LIBRARY
self = [super initWithModelUnarchiver:unarchiver]; self = [super initWithModelUnarchiver:unarchiver];
#endif #endif

4
Model/GNUmakefile
View file

@ -34,7 +34,7 @@ ifeq ($(GUI_LIB), nx)
TOOL_NAME = nib2gmodel TOOL_NAME = nib2gmodel
endif endif
# APP_NAME = test APP_NAME = test
libgmodel_OBJC_FILES = IMCustomObject.m IMConnectors.m IMLoading.m GMAppKit.m libgmodel_OBJC_FILES = IMCustomObject.m IMConnectors.m IMLoading.m GMAppKit.m
libgmodel_HEADER_FILES_DIR = ../Headers/AppKit libgmodel_HEADER_FILES_DIR = ../Headers/AppKit
@ -43,7 +43,7 @@ libgmodel_HEADER_FILES = IMConnectors.h IMCustomObject.h IMLoading.h GMAppKit.h
test_OBJC_FILES = test.m Controller.m test_OBJC_FILES = test.m Controller.m
test_MAIN_MODEL_FILE = test.gmodel test_MAIN_MODEL_FILE = test.gmodel
test_RESOURCES = test.gmodel test_RESOURCE_FILES = test.gmodel
nib2gmodel_OBJC_FILES = IBClasses.m Translator.m nib2gmodel.m nib2gmodel_OBJC_FILES = IBClasses.m Translator.m nib2gmodel.m

6
Model/test.gmodel
View file

@ -62,7 +62,7 @@
backgroundColor = "Object 8"; backgroundColor = "Object 8";
backingType = 0; backingType = 0;
contentView = "Object 10"; contentView = "Object 10";
frame = "{x = 0; y = 0; width = 193; height = 208}"; frame = "{x = 100; y = 100; width = 193; height = 208}";
frameAutosaveName = nil; frameAutosaveName = nil;
hidesOnDeactivate = NO; hidesOnDeactivate = NO;
isAutodisplay = NO; isAutodisplay = NO;
@ -92,7 +92,7 @@
backgroundColor = "Object 8"; backgroundColor = "Object 8";
backingType = 2; backingType = 2;
contentView = "Object 12"; contentView = "Object 12";
frame = "{x = 258; y = 511; width = 422; height = 304}"; frame = "{x = 100; y = 100; width = 422; height = 304}";
frameAutosaveName = nil; frameAutosaveName = nil;
hidesOnDeactivate = NO; hidesOnDeactivate = NO;
isAutodisplay = YES; isAutodisplay = YES;
@ -455,7 +455,7 @@
saturation = 0.000000; saturation = 0.000000;
}; };
"Object 30" = {isa = NSPopUpButton; pullsDown = NO; }; "Object 30" = {isa = NSPopUpButton; pullsDown = NO; };
"Object 31" = {className = MyView; isa = IMCustomView; }; "Object 31" = {className = MyView; isa = NSView; };
"Object 32" = { "Object 32" = {
backgroundColor = "Object 8"; backgroundColor = "Object 8";
backingType = 2; backingType = 2;

15
Model/test.m
View file

@ -13,17 +13,18 @@
} }
@end @end
int main (int argc, char** argv, char** env) int main (int argc, char** argv, char** env)
{ {
id pool; id pool = [NSAutoreleasePool new];
NSArray* arguments; NSArray* arguments;
NSProcessInfo* processInfo; NSProcessInfo* processInfo;
pool = [NSAutoreleasePool new];
#if LIB_FOUNDATION_LIBRARY #if LIB_FOUNDATION_LIBRARY
[NSProcessInfo initializeWithArguments:argv count:argc environment:env]; [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
#endif #endif
#ifndef NX_CURRENT_COMPILER_RELEASE
initialize_gnustep_backend();
#endif
#if 0 #if 0
processInfo = [NSProcessInfo processInfo]; processInfo = [NSProcessInfo processInfo];
@ -34,10 +35,6 @@ int main (int argc, char** argv, char** env)
} }
#endif #endif
#ifndef NX_CURRENT_COMPILER_RELEASE
initialize_gnustep_backend();
#endif
#if 0 #if 0
if (![GMModel loadIMFile:[arguments objectAtIndex:1] if (![GMModel loadIMFile:[arguments objectAtIndex:1]
owner:[NSApplication sharedApplication]]) { owner:[NSApplication sharedApplication]]) {

2
Source/NSApplication.m
View file

@ -149,7 +149,7 @@ NSString* mainModelFile;
{ {
if (![GMModel loadIMFile:mainModelFile if (![GMModel loadIMFile:mainModelFile
owner:[NSApplication sharedApplication]]) owner:[NSApplication sharedApplication]])
NSLog (@"Cannot load the main model file '%@", mainModelFile); NSLog (@"Cannot load the main model file '%@", mainModelFile);
} }
// post notification that // post notification that
// launch will finish // launch will finish

4
Source/NSWindow.m
View file

@ -124,8 +124,8 @@ static BOOL _needsFlushWindows = YES;
int style; int style;
NSDebugLog(@"NSWindow -init\n"); NSDebugLog(@"NSWindow -init\n");
// default style // default window
style = NSTitledWindowMask | NSClosableWindowMask // mask style = NSTitledWindowMask | NSClosableWindowMask // style mask
| NSMiniaturizableWindowMask | NSResizableWindowMask; | NSMiniaturizableWindowMask | NSResizableWindowMask;
return [self initWithContentRect:NSZeroRect return [self initWithContentRect:NSZeroRect

7
Testing/testpb.m
View file

@ -2,6 +2,7 @@
#include <Foundation/NSData.h> #include <Foundation/NSData.h>
#include <Foundation/NSArray.h> #include <Foundation/NSArray.h>
#include <Foundation/NSAutoreleasePool.h> #include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSGeometry.h>
#include <AppKit/NSPasteboard.h> #include <AppKit/NSPasteboard.h>
BOOL BOOL
@ -10,6 +11,12 @@ initialize_gnustep_backend(void)
/* Dummy replacement for the xdps function */ /* Dummy replacement for the xdps function */
return YES; return YES;
} }
void NSHighlightRect(NSRect aRect) // dummy define
{}
void NSRectFill(NSRect aRect) // dummy define
{}
void NSBeep(void) // dummy define
{}
@interface GMModel: NSObject @interface GMModel: NSObject
{ {