mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 21:50:37 +00:00
* 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. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3175 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
52b197e8af
commit
c1b0786d0a
8 changed files with 30 additions and 20 deletions
|
@ -94,7 +94,7 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
NSMenu* mainMenu = [self mainMenu];
|
||||
|
||||
[mainMenu update];
|
||||
#if XDPS_BACKEND_LIBRARY
|
||||
#if XDPS_BACKEND_LIBRARY || XRAW_BACKEND_LIBRARY
|
||||
[mainMenu display];
|
||||
#endif
|
||||
|
||||
|
@ -454,7 +454,7 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
|
||||
- (void)encodeWithModelArchiver:(GMArchiver*)archiver
|
||||
{
|
||||
#if XDPS_BACKEND_LIBRARY
|
||||
#if XDPS_BACKEND_LIBRARY || XRAW_BACKEND_LIBRARY
|
||||
[super encodeWithModelArchiver:archiver];
|
||||
#endif
|
||||
|
||||
|
@ -468,7 +468,7 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
|
||||
- (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver
|
||||
{
|
||||
#if XDPS_BACKEND_LIBRARY
|
||||
#if XDPS_BACKEND_LIBRARY || XRAW_BACKEND_LIBRARY
|
||||
self = [super initWithModelUnarchiver:unarchiver];
|
||||
#endif
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ ifeq ($(GUI_LIB), nx)
|
|||
TOOL_NAME = nib2gmodel
|
||||
endif
|
||||
|
||||
# APP_NAME = test
|
||||
APP_NAME = test
|
||||
|
||||
libgmodel_OBJC_FILES = IMCustomObject.m IMConnectors.m IMLoading.m GMAppKit.m
|
||||
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_MAIN_MODEL_FILE = test.gmodel
|
||||
test_RESOURCES = test.gmodel
|
||||
test_RESOURCE_FILES = test.gmodel
|
||||
|
||||
nib2gmodel_OBJC_FILES = IBClasses.m Translator.m nib2gmodel.m
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
backgroundColor = "Object 8";
|
||||
backingType = 0;
|
||||
contentView = "Object 10";
|
||||
frame = "{x = 0; y = 0; width = 193; height = 208}";
|
||||
frame = "{x = 100; y = 100; width = 193; height = 208}";
|
||||
frameAutosaveName = nil;
|
||||
hidesOnDeactivate = NO;
|
||||
isAutodisplay = NO;
|
||||
|
@ -92,7 +92,7 @@
|
|||
backgroundColor = "Object 8";
|
||||
backingType = 2;
|
||||
contentView = "Object 12";
|
||||
frame = "{x = 258; y = 511; width = 422; height = 304}";
|
||||
frame = "{x = 100; y = 100; width = 422; height = 304}";
|
||||
frameAutosaveName = nil;
|
||||
hidesOnDeactivate = NO;
|
||||
isAutodisplay = YES;
|
||||
|
@ -455,7 +455,7 @@
|
|||
saturation = 0.000000;
|
||||
};
|
||||
"Object 30" = {isa = NSPopUpButton; pullsDown = NO; };
|
||||
"Object 31" = {className = MyView; isa = IMCustomView; };
|
||||
"Object 31" = {className = MyView; isa = NSView; };
|
||||
"Object 32" = {
|
||||
backgroundColor = "Object 8";
|
||||
backingType = 2;
|
||||
|
|
15
Model/test.m
15
Model/test.m
|
@ -13,17 +13,18 @@
|
|||
}
|
||||
@end
|
||||
|
||||
|
||||
int main (int argc, char** argv, char** env)
|
||||
{
|
||||
id pool;
|
||||
NSArray* arguments;
|
||||
NSProcessInfo* processInfo;
|
||||
id pool = [NSAutoreleasePool new];
|
||||
NSArray* arguments;
|
||||
NSProcessInfo* processInfo;
|
||||
|
||||
pool = [NSAutoreleasePool new];
|
||||
#if LIB_FOUNDATION_LIBRARY
|
||||
[NSProcessInfo initializeWithArguments:argv count:argc environment:env];
|
||||
#endif
|
||||
#ifndef NX_CURRENT_COMPILER_RELEASE
|
||||
initialize_gnustep_backend();
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
processInfo = [NSProcessInfo processInfo];
|
||||
|
@ -34,10 +35,6 @@ int main (int argc, char** argv, char** env)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifndef NX_CURRENT_COMPILER_RELEASE
|
||||
initialize_gnustep_backend();
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
if (![GMModel loadIMFile:[arguments objectAtIndex:1]
|
||||
owner:[NSApplication sharedApplication]]) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue