Menu
▾
▴
[cadcdev-svn-commits] SF.net SVN: cadcdev: [528] tiki
|
From: <at...@us...> - 2007-11-05 20:24:05
|
Revision: 528
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=528&view=rev
Author: atani
Date: 2007-11-05 12:24:01 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
preliminary full screen support for TikiSnake and events samples
preliminary project for basic menu sample
Modified Paths:
--------------
tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/classes.nib
tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/info.nib
tiki/examples/console/TikiSnake/TikiSnake.xcodeproj/project.pbxproj
tiki/examples/console/TikiSnake/src/Controller.h
tiki/examples/console/TikiSnake/src/Controller.m
tiki/examples/events/English.lproj/MainMenu.nib/classes.nib
tiki/examples/events/English.lproj/MainMenu.nib/info.nib
tiki/examples/events/events.xcodeproj/project.pbxproj
tiki/examples/events/src/Controller.h
tiki/examples/events/src/Controller.m
tiki/osx/Tiki.xcodeproj/project.pbxproj
tiki/osx/src/TikiMain.m
tiki/src/base/debug.cpp
Added Paths:
-----------
tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/keyedobjects.nib
tiki/examples/events/English.lproj/MainMenu.nib/keyedobjects.nib
tiki/examples/menu/basic/English.lproj/
tiki/examples/menu/basic/English.lproj/InfoPlist.strings
tiki/examples/menu/basic/English.lproj/MainMenu.nib/
tiki/examples/menu/basic/English.lproj/MainMenu.nib/classes.nib
tiki/examples/menu/basic/English.lproj/MainMenu.nib/info.nib
tiki/examples/menu/basic/English.lproj/MainMenu.nib/keyedobjects.nib
tiki/examples/menu/basic/Info.plist
tiki/examples/menu/basic/basic.xcodeproj/
tiki/examples/menu/basic/basic.xcodeproj/project.pbxproj
tiki/examples/menu/basic/basic_Prefix.pch
tiki/examples/menu/basic/main.m
tiki/examples/menu/basic/src/Controller.h
tiki/examples/menu/basic/src/Controller.m
tiki/examples/menu/basic/version.plist
Property Changed:
----------------
tiki/examples/console/TikiSnake/
tiki/examples/console/TikiSnake/TikiSnake.xcodeproj/
tiki/examples/events/
tiki/examples/events/events.xcodeproj/
tiki/examples/menu/basic/
tiki/osx/
tiki/osx/Tiki.xcodeproj/
Property changes on: tiki/examples/console/TikiSnake
___________________________________________________________________
Name: svn:ignore
- Debug
Release
*.user
*.nds
*.ds.gba
*.elf
tikisnake
+ Debug
Release
*.user
*.nds
*.ds.gba
*.elf
tikisnake
build
Modified: tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/classes.nib 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/classes.nib 2007-11-05 20:24:01 UTC (rev 528)
@@ -1,12 +1,41 @@
-{
- IBClasses = (
- {
- CLASS = Controller;
- LANGUAGE = ObjC;
- OUTLETS = {mainView = NSView; mainWindow = NSWindow; };
- SUPERCLASS = NSObject;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>fullScreen</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>Controller</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>fullScreen</key>
+ <string>id</string>
+ <key>mainView</key>
+ <string>NSView</string>
+ <key>mainWindow</key>
+ <string>NSWindow</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/info.nib
===================================================================
--- tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/info.nib 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/info.nib 2007-11-05 20:24:01 UTC (rev 528)
@@ -1,22 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>87 99 356 240 0 0 1280 1002 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>29</key>
- <string>94 344 338 44 0 0 1280 1002 </string>
- </dict>
<key>IBFramework Version</key>
- <string>443.0</string>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../TikiSnake.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>21</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8I127</string>
+ <string>9A581</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
Added: tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: tiki/examples/console/TikiSnake/English.lproj/MainMenu.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: tiki/examples/console/TikiSnake/TikiSnake.xcodeproj
___________________________________________________________________
Name: svn:ignore
+ *.pbxuser
*.mode1v3
Modified: tiki/examples/console/TikiSnake/TikiSnake.xcodeproj/project.pbxproj
===================================================================
--- tiki/examples/console/TikiSnake/TikiSnake.xcodeproj/project.pbxproj 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/console/TikiSnake/TikiSnake.xcodeproj/project.pbxproj 2007-11-05 20:24:01 UTC (rev 528)
@@ -19,31 +19,6 @@
C4F50EEF0799E5B40001D0D0 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4F50EEE0799E5B40001D0D0 /* OpenGL.framework */; };
/* End PBXBuildFile section */
-/* Begin PBXBuildStyle section */
- 4A9504CCFFE6A4B311CA0CBA /* Development */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- PREBINDING = NO;
- ZERO_LINK = NO;
- };
- name = Development;
- };
- 4A9504CDFFE6A4B311CA0CBA /* Deployment */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
-/* End PBXBuildStyle section */
-
/* Begin PBXCopyFilesBuildPhase section */
C4332D16079B22450025BF39 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -182,16 +157,6 @@
);
buildRules = (
);
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = ../../osx/build;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = TikiSnake_Prefix.pch;
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = TikiSnake;
- WRAPPER_EXTENSION = app;
- };
dependencies = (
);
name = TikiSnake;
@@ -206,15 +171,11 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "TikiSnake" */;
- buildSettings = {
- };
- buildStyles = (
- 4A9504CCFFE6A4B311CA0CBA /* Development */,
- 4A9504CDFFE6A4B311CA0CBA /* Deployment */,
- );
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* TikiSnake */;
projectDirPath = "";
+ projectRoot = "";
targets = (
8D1107260486CEB800E47090 /* TikiSnake */,
);
@@ -349,36 +310,45 @@
64FBB92C092EA33F00427AD0 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
HEADER_SEARCH_PATHS = (
../../include,
../../osx/include,
/sw/include,
../../3rdparty/boost,
);
+ MACOSX_DEPLOYMENT_TARGET = 10.3;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
64FBB92D092EA33F00427AD0 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
HEADER_SEARCH_PATHS = (
../../include,
../../osx/include,
/sw/include,
../../3rdparty/boost,
);
+ MACOSX_DEPLOYMENT_TARGET = 10.3;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
64FBB92E092EA33F00427AD0 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
HEADER_SEARCH_PATHS = (
../../include,
../../osx/include,
/sw/include,
../../3rdparty/boost,
);
+ MACOSX_DEPLOYMENT_TARGET = 10.3;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: tiki/examples/console/TikiSnake/src/Controller.h
===================================================================
--- tiki/examples/console/TikiSnake/src/Controller.h 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/console/TikiSnake/src/Controller.h 2007-11-05 20:24:01 UTC (rev 528)
@@ -9,4 +9,6 @@
TikiMain * tm;
}
+
+- (IBAction)fullScreen: (id)sender;
@end
Modified: tiki/examples/console/TikiSnake/src/Controller.m
===================================================================
--- tiki/examples/console/TikiSnake/src/Controller.m 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/console/TikiSnake/src/Controller.m 2007-11-05 20:24:01 UTC (rev 528)
@@ -9,7 +9,11 @@
- (void) applicationDidFinishLaunching: (NSNotification *) note
{
NSString * resPath = [[NSBundle mainBundle] resourcePath];
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ chdir([resPath UTF8String]);
+#else
chdir([resPath cString]);
+#endif
TikiMain * otm = [[TikiMain alloc] retain];
tm = otm;
[tm doMainWithWindow: mainWindow andView: mainView andMainFunc: tiki_main];
@@ -29,4 +33,14 @@
return YES;
}
+- (IBAction)fullScreen: (id) sender
+{
+ if( [mainView isInFullScreenMode] == YES ) {
+ [mainView exitFullScreenModeWithOptions: nil];
+ }
+ else {
+ [mainView enterFullScreenMode:[NSScreen mainScreen] withOptions:nil];
+ }
+}
+
@end
Property changes on: tiki/examples/events
___________________________________________________________________
Name: svn:ignore
- Debug
Release
*.user
*.nds
*.ds.gba
+ Debug
Release
build
*.user
*.nds
*.ds.gba
Modified: tiki/examples/events/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- tiki/examples/events/English.lproj/MainMenu.nib/classes.nib 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/events/English.lproj/MainMenu.nib/classes.nib 2007-11-05 20:24:01 UTC (rev 528)
@@ -1,12 +1,41 @@
-{
- IBClasses = (
- {
- CLASS = Controller;
- LANGUAGE = ObjC;
- OUTLETS = {mainView = NSView; mainWindow = NSWindow; };
- SUPERCLASS = NSObject;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>fullScreen</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>Controller</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>fullSceen</key>
+ <string>id</string>
+ <key>mainView</key>
+ <string>NSView</string>
+ <key>mainWindow</key>
+ <string>NSWindow</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: tiki/examples/events/English.lproj/MainMenu.nib/info.nib
===================================================================
--- tiki/examples/events/English.lproj/MainMenu.nib/info.nib 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/events/English.lproj/MainMenu.nib/info.nib 2007-11-05 20:24:01 UTC (rev 528)
@@ -1,22 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>87 99 356 240 0 0 1280 1002 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>29</key>
- <string>94 344 338 44 0 0 1280 1002 </string>
- </dict>
<key>IBFramework Version</key>
- <string>437.0</string>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../events.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>29</integer>
- <integer>21</integer>
+ <integer>24</integer>
</array>
<key>IBSystem Version</key>
- <string>8A428</string>
+ <string>9A581</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
Added: tiki/examples/events/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: tiki/examples/events/English.lproj/MainMenu.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: tiki/examples/events/events.xcodeproj
___________________________________________________________________
Name: svn:ignore
+ *.pbxuser
*.mode1v3
Modified: tiki/examples/events/events.xcodeproj/project.pbxproj
===================================================================
--- tiki/examples/events/events.xcodeproj/project.pbxproj 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/events/events.xcodeproj/project.pbxproj 2007-11-05 20:24:01 UTC (rev 528)
@@ -172,10 +172,12 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
- buildConfigurationList = 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "TikiEvents" */;
+ buildConfigurationList = 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "events" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* TikiEvents */;
projectDirPath = "";
+ projectRoot = "";
targets = (
8D1107260486CEB800E47090 /* TikiEvents */,
);
@@ -247,6 +249,7 @@
64FBB928092EA33F00427AD0 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = ../../osx/build/Development/;
GCC_DYNAMIC_NO_PIC = NO;
@@ -267,6 +270,7 @@
64FBB929092EA33F00427AD0 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = ../../osx/build/Deployment/;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -284,6 +288,7 @@
64FBB92A092EA33F00427AD0 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
FRAMEWORK_SEARCH_PATHS = ../../osx/build/Development/;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -350,7 +355,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "TikiEvents" */ = {
+ 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "events" */ = {
isa = XCConfigurationList;
buildConfigurations = (
64FBB92C092EA33F00427AD0 /* Development */,
Modified: tiki/examples/events/src/Controller.h
===================================================================
--- tiki/examples/events/src/Controller.h 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/events/src/Controller.h 2007-11-05 20:24:01 UTC (rev 528)
@@ -10,4 +10,6 @@
TikiMain * tm;
NSString * openFileName;
}
+
+- (IBAction)fullScreen: (id)sender;
@end
Modified: tiki/examples/events/src/Controller.m
===================================================================
--- tiki/examples/events/src/Controller.m 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/examples/events/src/Controller.m 2007-11-05 20:24:01 UTC (rev 528)
@@ -31,4 +31,14 @@
return YES;
}
+- (IBAction)fullScreen: (id) sender
+{
+ if( [mainView isInFullScreenMode] == YES ) {
+ [mainView exitFullScreenModeWithOptions: nil];
+ }
+ else {
+ [mainView enterFullScreenMode:[NSScreen mainScreen] withOptions:nil];
+ }
+}
+
@end
Property changes on: tiki/examples/menu/basic
___________________________________________________________________
Name: svn:ignore
- Debug
Release
*.user
*.nds
*.ds.gba
+ Debug
Release
build
*.user
*.nds
*.ds.gba
Added: tiki/examples/menu/basic/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Property changes on: tiki/examples/menu/basic/English.lproj/InfoPlist.strings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tiki/examples/menu/basic/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- tiki/examples/menu/basic/English.lproj/MainMenu.nib/classes.nib (rev 0)
+++ tiki/examples/menu/basic/English.lproj/MainMenu.nib/classes.nib 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>fullScreen</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>Controller</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>fullSceen</key>
+ <string>id</string>
+ <key>mainView</key>
+ <string>NSView</string>
+ <key>mainWindow</key>
+ <string>NSWindow</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Added: tiki/examples/menu/basic/English.lproj/MainMenu.nib/info.nib
===================================================================
--- tiki/examples/menu/basic/English.lproj/MainMenu.nib/info.nib (rev 0)
+++ tiki/examples/menu/basic/English.lproj/MainMenu.nib/info.nib 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../events.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>24</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9A581</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Added: tiki/examples/menu/basic/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: tiki/examples/menu/basic/English.lproj/MainMenu.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tiki/examples/menu/basic/Info.plist
===================================================================
--- tiki/examples/menu/basic/Info.plist (rev 0)
+++ tiki/examples/menu/basic/Info.plist 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>TikiEvents</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.myCocoaApp</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
Added: tiki/examples/menu/basic/basic.xcodeproj/project.pbxproj
===================================================================
--- tiki/examples/menu/basic/basic.xcodeproj/project.pbxproj (rev 0)
+++ tiki/examples/menu/basic/basic.xcodeproj/project.pbxproj 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,340 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 640060E30CDFA79800969916 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 640060E10CDFA79800969916 /* main.cpp */; };
+ 640060E90CDFA7B900969916 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 640060E80CDFA7B900969916 /* Controller.m */; };
+ 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
+ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+ 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
+ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+ C4332D17079B224F0025BF39 /* Tiki.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C4F50D800799DE840001D0D0 /* Tiki.framework */; };
+ C4F50D810799DE840001D0D0 /* Tiki.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4F50D800799DE840001D0D0 /* Tiki.framework */; };
+ C4F50EEF0799E5B40001D0D0 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4F50EEE0799E5B40001D0D0 /* OpenGL.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ C4332D16079B22450025BF39 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C4332D17079B224F0025BF39 /* Tiki.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
+ 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+ 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 640060E10CDFA79800969916 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = "<group>"; };
+ 640060E70CDFA7B900969916 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = src/Controller.h; sourceTree = "<group>"; };
+ 640060E80CDFA7B900969916 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Controller.m; path = src/Controller.m; sourceTree = "<group>"; };
+ 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+ 8D1107320486CEB800E47090 /* TikiBasicMenu.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikiBasicMenu.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ C4F50D800799DE840001D0D0 /* Tiki.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Tiki.framework; path = ../../../osx/build/Deployment/Tiki.framework; sourceTree = SOURCE_ROOT; };
+ C4F50EEE0799E5B40001D0D0 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 8D11072E0486CEB800E47090 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+ C4F50D810799DE840001D0D0 /* Tiki.framework in Frameworks */,
+ C4F50EEF0799E5B40001D0D0 /* OpenGL.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 080E96DDFE201D6D7F000001 /* Classes */ = {
+ isa = PBXGroup;
+ children = (
+ 640060E70CDFA7B900969916 /* Controller.h */,
+ 640060E80CDFA7B900969916 /* Controller.m */,
+ 640060E10CDFA79800969916 /* main.cpp */,
+ );
+ name = Classes;
+ sourceTree = "<group>";
+ };
+ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ C4F50EEE0799E5B40001D0D0 /* OpenGL.framework */,
+ C4F50D800799DE840001D0D0 /* Tiki.framework */,
+ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+ );
+ name = "Linked Frameworks";
+ sourceTree = "<group>";
+ };
+ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+ 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+ );
+ name = "Other Frameworks";
+ sourceTree = "<group>";
+ };
+ 19C28FACFE9D520D11CA2CBB /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 8D1107320486CEB800E47090 /* TikiBasicMenu.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 29B97314FDCFA39411CA2CEA /* TikiBasicMenu */ = {
+ isa = PBXGroup;
+ children = (
+ 080E96DDFE201D6D7F000001 /* Classes */,
+ 29B97315FDCFA39411CA2CEA /* Other Sources */,
+ 29B97317FDCFA39411CA2CEA /* Resources */,
+ 29B97323FDCFA39411CA2CEA /* Frameworks */,
+ 19C28FACFE9D520D11CA2CBB /* Products */,
+ );
+ name = TikiBasicMenu;
+ sourceTree = "<group>";
+ };
+ 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+ isa = PBXGroup;
+ children = (
+ 29B97316FDCFA39411CA2CEA /* main.m */,
+ );
+ name = "Other Sources";
+ sourceTree = "<group>";
+ };
+ 29B97317FDCFA39411CA2CEA /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ 8D1107310486CEB800E47090 /* Info.plist */,
+ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
+ 29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
+ );
+ name = Resources;
+ sourceTree = "<group>";
+ };
+ 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 8D1107260486CEB800E47090 /* TikiBasicMenu */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 64FBB927092EA33F00427AD0 /* Build configuration list for PBXNativeTarget "TikiBasicMenu" */;
+ buildPhases = (
+ 8D1107290486CEB800E47090 /* Resources */,
+ 8D11072C0486CEB800E47090 /* Sources */,
+ 8D11072E0486CEB800E47090 /* Frameworks */,
+ C4332D16079B22450025BF39 /* CopyFiles */,
+ C4332EE0079B242E0025BF39 /* ShellScript */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = TikiBasicMenu;
+ productInstallPath = "$(HOME)/Applications";
+ productName = TikiBasicMenu;
+ productReference = 8D1107320486CEB800E47090 /* TikiBasicMenu.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 29B97313FDCFA39411CA2CEA /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "basic" */;
+ compatibilityVersion = "Xcode 2.4";
+ hasScannedForEncodings = 1;
+ mainGroup = 29B97314FDCFA39411CA2CEA /* TikiBasicMenu */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 8D1107260486CEB800E47090 /* TikiBasicMenu */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 8D1107290486CEB800E47090 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
+ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+ C4332EE0079B242E0025BF39 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# rm -rfv ${EXECUTABLE_FOLDER_PATH}/PrivateHeaders\n";
+ };
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 8D11072C0486CEB800E47090 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D11072D0486CEB800E47090 /* main.m in Sources */,
+ 640060E30CDFA79800969916 /* main.cpp in Sources */,
+ 640060E90CDFA7B900969916 /* Controller.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 089C165DFE840E0CC02AAC07 /* English */,
+ );
+ name = InfoPlist.strings;
+ sourceTree = "<group>";
+ };
+ 29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 29B97319FDCFA39411CA2CEA /* English */,
+ );
+ name = MainMenu.nib;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+ 64FBB928092EA33F00427AD0 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
+ COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = ../../../osx/build/Development/;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = basic_Prefix.pch;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "$(HOME)/Applications";
+ PREBINDING = NO;
+ PRODUCT_NAME = TikiBasicMenu;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = NO;
+ };
+ name = Development;
+ };
+ 64FBB929092EA33F00427AD0 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(NATIVE_ARCH)";
+ COPY_PHASE_STRIP = YES;
+ FRAMEWORK_SEARCH_PATHS = ../../../osx/build/Deployment/;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = basic_Prefix.pch;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "$(HOME)/Applications";
+ PRODUCT_NAME = TikiBasicMenu;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = NO;
+ };
+ name = Deployment;
+ };
+ 64FBB92C092EA33F00427AD0 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ HEADER_SEARCH_PATHS = (
+ ../../../include,
+ ../../../osx/include,
+ /sw/include,
+ ../../../3rdparty/boost,
+ );
+ MACOSX_DEPLOYMENT_TARGET = 10.3;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Development;
+ };
+ 64FBB92D092EA33F00427AD0 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ HEADER_SEARCH_PATHS = (
+ ../../../include,
+ ../../../osx/include,
+ /sw/include,
+ ../../../3rdparty/boost,
+ );
+ MACOSX_DEPLOYMENT_TARGET = 10.3;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Deployment;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 64FBB927092EA33F00427AD0 /* Build configuration list for PBXNativeTarget "TikiBasicMenu" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 64FBB928092EA33F00427AD0 /* Development */,
+ 64FBB929092EA33F00427AD0 /* Deployment */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Development;
+ };
+ 64FBB92B092EA33F00427AD0 /* Build configuration list for PBXProject "basic" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 64FBB92C092EA33F00427AD0 /* Development */,
+ 64FBB92D092EA33F00427AD0 /* Deployment */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Development;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
Added: tiki/examples/menu/basic/basic_Prefix.pch
===================================================================
--- tiki/examples/menu/basic/basic_Prefix.pch (rev 0)
+++ tiki/examples/menu/basic/basic_Prefix.pch 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'TikiTest' target in the 'TikiTest' project
+//
+
+#ifdef __OBJC__
+ #import <Cocoa/Cocoa.h>
+#endif
Added: tiki/examples/menu/basic/main.m
===================================================================
--- tiki/examples/menu/basic/main.m (rev 0)
+++ tiki/examples/menu/basic/main.m 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,14 @@
+//
+// main.m
+// TikiEvents
+//
+// Created by Dan Potter on 1/11/05.
+// Copyright Cryptic Allusion, LLC 2005. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[])
+{
+ return NSApplicationMain(argc, (const char **) argv);
+}
Added: tiki/examples/menu/basic/src/Controller.h
===================================================================
--- tiki/examples/menu/basic/src/Controller.h (rev 0)
+++ tiki/examples/menu/basic/src/Controller.h 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,15 @@
+/* Controller */
+
+#import <Cocoa/Cocoa.h>
+#import <Tiki/TikiMain.h>
+
+@interface Controller : NSObject {
+ IBOutlet NSView *mainView;
+ IBOutlet NSWindow *mainWindow;
+
+ TikiMain * tm;
+ NSString * openFileName;
+}
+
+- (IBAction)fullScreen: (id)sender;
+@end
Added: tiki/examples/menu/basic/src/Controller.m
===================================================================
--- tiki/examples/menu/basic/src/Controller.m (rev 0)
+++ tiki/examples/menu/basic/src/Controller.m 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,44 @@
+#import "Controller.h"
+#import <Tiki/TikiMain.h>
+#import <assert.h>
+
+void tiki_main();
+
+@implementation Controller
+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+{
+ openFileName = filename;
+}
+
+- (void) applicationDidFinishLaunching: (NSNotification *) note
+{
+ TikiMain * otm = [[TikiMain alloc] retain];
+ tm = otm;
+ [tm doMainWithWindow: mainWindow andView: mainView andMainFunc: tiki_main andOpenFile:openFileName];
+ tm = nil;
+ [otm release];
+}
+
+- (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *)sender
+{
+ assert( tm );
+ [tm quitSoon];
+ return NSTerminateNow;
+}
+
+- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication *)theApplication
+{
+ return YES;
+}
+
+- (IBAction)fullScreen: (id) sender
+{
+ if( [mainView isInFullScreenMode] == YES ) {
+ [mainView exitFullScreenModeWithOptions: nil];
+ }
+ else {
+ [mainView enterFullScreenMode:[NSScreen mainScreen] withOptions:nil];
+ }
+}
+
+@end
Added: tiki/examples/menu/basic/version.plist
===================================================================
--- tiki/examples/menu/basic/version.plist (rev 0)
+++ tiki/examples/menu/basic/version.plist 2007-11-05 20:24:01 UTC (rev 528)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>BuildVersion</key>
+ <string>92</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>ProductBuildVersion</key>
+ <string>7K571</string>
+ <key>ProjectName</key>
+ <string>NibPBTemplates</string>
+ <key>SourceVersion</key>
+ <string>1200000</string>
+</dict>
+</plist>
Property changes on: tiki/osx
___________________________________________________________________
Name: svn:ignore
+ build
Property changes on: tiki/osx/Tiki.xcodeproj
___________________________________________________________________
Name: svn:ignore
+ *.pbxuser
*.mode1v3
Modified: tiki/osx/Tiki.xcodeproj/project.pbxproj
===================================================================
--- tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-11-05 20:24:01 UTC (rev 528)
@@ -13,6 +13,7 @@
2290A0FE09302D7500B7D80C /* pointerArrow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2290A0FC09302D7500B7D80C /* pointerArrow.cpp */; };
2290A10109302D9F00B7D80C /* cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2290A0FF09302D9F00B7D80C /* cursor.h */; };
2290A10209302D9F00B7D80C /* pointerArrow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2290A10009302D9F00B7D80C /* pointerArrow.h */; };
+ 6400608E0CDF9DC800969916 /* init_flags_default.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6400608D0CDF9DC800969916 /* init_flags_default.cpp */; };
640C2C30092EB8C40032DE40 /* alpharotate.h in Headers */ = {isa = PBXBuildFile; fileRef = 640C2C2F092EB8C40032DE40 /* alpharotate.h */; };
6444BEE60932A3D800A29768 /* texturetile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6444BEE50932A3D700A29768 /* texturetile.cpp */; };
6444BEE80932A3F200A29768 /* texturetile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6444BEE70932A3F200A29768 /* texturetile.h */; };
@@ -210,6 +211,7 @@
2290A0FF09302D9F00B7D80C /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cursor.h; path = ../include/Tiki/drawables/cursor.h; sourceTree = SOURCE_ROOT; };
2290A10009302D9F00B7D80C /* pointerArrow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pointerArrow.h; path = ../include/Tiki/drawables/pointerArrow.h; sourceTree = SOURCE_ROOT; };
32DBCF5E0370ADEE00C91783 /* Tiki_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tiki_Prefix.pch; sourceTree = "<group>"; };
+ 6400608D0CDF9DC800969916 /* init_flags_default.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_flags_default.cpp; sourceTree = "<group>"; };
640C2C2F092EB8C40032DE40 /* alpharotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alpharotate.h; path = ../include/Tiki/anims/alpharotate.h; sourceTree = SOURCE_ROOT; };
6444BEE50932A3D700A29768 /* texturetile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = texturetile.cpp; path = ../src/gl/drawables/texturetile.cpp; sourceTree = SOURCE_ROOT; };
6444BEE70932A3F200A29768 /* texturetile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = texturetile.h; path = ../include/Tiki/drawables/texturetile.h; sourceTree = SOURCE_ROOT; };
@@ -636,7 +638,7 @@
C4AD52E30793CDC100E1B779 /* audio */,
C42BD2D6078FC9BF00061670 /* base */,
C4F51516079A0B1C0001D0D0 /* gl */,
- C4539923079A455600F3A584 /* t */,
+ C4539923079A455600F3A584 /* hid */,
C48814FE079F8A3B0038D5B0 /* image */,
C4F5157D079A0CFB0001D0D0 /* math */,
C472B72C079B0FBA00F0C00A /* thread */,
@@ -647,6 +649,7 @@
C42BD2D6078FC9BF00061670 /* base */ = {
isa = PBXGroup;
children = (
+ 6400608D0CDF9DC800969916 /* init_flags_default.cpp */,
C4AD53070793CE9F00E1B779 /* debug.cpp */,
C4F5148D0799FBA10001D0D0 /* endian.cpp */,
C4AD52290793B4CD00E1B779 /* file.cpp */,
@@ -722,13 +725,13 @@
name = hid;
sourceTree = "<group>";
};
- C4539923079A455600F3A584 /* t */ = {
+ C4539923079A455600F3A584 /* hid */ = {
isa = PBXGroup;
children = (
C48E6CD607A48FDE00045273 /* eventcollector.cpp */,
C453992A079A477500F3A584 /* hid.cpp */,
);
- name = t;
+ name = hid;
sourceTree = "<group>";
};
C472B72C079B0FBA00F0C00A /* thread */ = {
@@ -1362,6 +1365,7 @@
6499FE710C8623A3008D9FEF /* base64.cpp in Sources */,
6499FE720C8623A3008D9FEF /* date.cpp in Sources */,
6499FEA60C8640E5008D9FEF /* cookiejar.cpp in Sources */,
+ 6400608E0CDF9DC800969916 /* init_flags_default.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1499,7 +1503,10 @@
C4B181AC0856AE7000B46BDA /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = ppc;
+ ARCHS = (
+ ppc,
+ i386,
+ );
DEBUG_INFORMATION_FORMAT = dwarf;
LIBRARY_SEARCH_PATHS = /System/Library/Frameworks/;
MACOSX_DEPLOYMENT_TARGET = 10.4;
Modified: tiki/osx/src/TikiMain.m
===================================================================
--- tiki/osx/src/TikiMain.m 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/osx/src/TikiMain.m 2007-11-05 20:24:01 UTC (rev 528)
@@ -155,14 +155,6 @@
continue;
}
- // Is the event for us?
- if ([event window] != mainWindow) {
- //NSLog([NSString stringWithFormat: @"Ignoring event not for us: %@", event]);
- [NSApp sendEvent: event];
- continue;
- }
- //NSLog([NSString stringWithFormat: @"%@", event]);
-
// Handle the event we got
type = [event type];
switch (type) {
Modified: tiki/src/base/debug.cpp
===================================================================
--- tiki/src/base/debug.cpp 2007-11-05 17:08:21 UTC (rev 527)
+++ tiki/src/base/debug.cpp 2007-11-05 20:24:01 UTC (rev 528)
@@ -15,7 +15,7 @@
using namespace Tiki::Debug;
int Debug::printf( const char * fmt, ... ) {
- if(g_tiki_init_flags & TIKI_INIT_DEBUG_CONSOLE) {
+ if(g_tiki_init_flags & TIKI_INIT_DEBUG_MASK) {
#if TIKI_PLAT == TIKI_WIN32
va_list args;
char buffer[ 16 * 1024 ];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
