Author: matt
Date: 2012-05-01 14:30:42 -0700 (Tue, 01 May 2012)
New Revision: 9425
Log:
Adding 'adjuster' test, continuing FLTK 2 emulation.
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/include/fltk/Widget.h
branches/branch-3.0/test2/adjuster.cxx
branches/branch-3.0/test2/hello.cxx
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2012-05-01 21:13:18 UTC (rev 9424)
+++ branches/branch-3.0/fltk.flw 2012-05-01 21:30:42 UTC (rev 9425)
@@ -315,7 +315,7 @@
folder Libraries {open
uuid_Xcode4_Group {AFD010B3-DA64-4C5E-9682-891530BD3B73}
} {
- lib_target fltk3 {open
+ lib_target fltk3 {
uuid_Xcode4_BuildConfigurationList {F8A317C2-0F96-4681-8A97-DA6FDEF118E2}
uuid_Xcode4_DebugBuildConfiguration
{034870F2-FE15-4D23-AD0D-62ED38449392}
uuid_Xcode4_ReleaseBuildConfiguration
{D584B52C-FED3-4E71-A47E-A60BA05375B9}
@@ -333,7 +333,7 @@
target_path lib
makefile_path src
} {
- folder Headers {open
+ folder Headers {
uuid_Xcode4_Group {C2F00625-E401-4002-85F6-FA183D17629D}
} {
file_ref {all.h} {
@@ -1080,7 +1080,7 @@
list_env 124
filename_and_path {include/fltk3/SelectBrowser.h}
}
- file_ref {ShapedWindow.h} {selected
+ file_ref {ShapedWindow.h} {
uuid_Xcode4_BuildFile {88C99958-E07E-4731-B1C4-70B913221C19}
uuid_Xcode4_FileRef {7031E56D-C9AA-4136-BEC9-D45D7E4AFBBB}
uuid_Xcode4_BuildFileInHeaders {8EAB82FA-6F9C-45A4-9713-6BBE90954C67}
@@ -1417,7 +1417,7 @@
filename_and_path {include/fltk3/XPMImage.h}
}
}
- folder Sources {open
+ folder Sources {
uuid_Xcode4_Group {91990322-0AF9-42F2-A077-713540EE5AB1}
} {
file_ref {cocoa.mm} {
@@ -8314,5 +8314,34 @@
uuid_Xcode4_TargetDependency {6868A066-7582-4862-BD72-1A2958009957}
}
}
+ app_target adjuster2 {open
+ uuid_Xcode4_FluidBuildRule {1CA8A9A8-AFB9-44BE-8912-2FF6EAEA43D9}
+ uuid_Xcode4_CopyFilesBuildPhase {7CD9ADA0-CF82-41DF-90C8-C1F68880C475}
+ uuid_Xcode4_ProductFileReference {0C9773B6-4E20-491A-9E97-902E3FAED7F1}
+ uuid_Xcode4_FrameworksBuildPhase {4FB7C69E-1E3E-4166-B49B-11AF0D832194}
+ uuid_Xcode4_Group {9F01513A-8D46-47F6-BCFB-F249F663F58A}
+ uuid_Xcode4_Target {0C9C0BB3-7348-453C-B2AD-DA944F9E8D1A}
+ uuid_Xcode4_BuildConfigurationList {B89CDA9D-D4BA-4973-B47A-AA16C4435E24}
+ uuid_Xcode4_ResourcesBuildPhase {C42A4352-9615-45E1-BE18-295E5F268BD9}
+ uuid_Xcode4_SourcesBuildPhase {2C80EDD6-58BA-4C48-949A-A9F1DDDA7383}
+ uuid_Xcode4_DebugBuildConfiguration
{A7B91EBB-E431-4FF5-942E-EC0DFB273384}
+ uuid_Xcode4_ReleaseBuildConfiguration
{71A2B5F0-A2EC-4652-8716-4E612831F010}
+ build_env 64
+ target_path test2
+ makefile_path test2
+ } {
+ file_ref {adjuster.cxx} {selected
+ uuid_Xcode4_BuildFileInSources {638CAE7C-A7DF-490E-811D-4A5E65C16AE3}
+ uuid_Xcode4_FileRef {92B55871-2766-4F0C-BBC4-BE3540567DBF}
+ build_env 64
+ filename_and_path {test2/adjuster.cxx}
+ }
+ target_dependency fltk3 {
+ uuid_Xcode4_BuildFileInFrameworks
{910EE880-88DF-4694-BECE-6E58A068056A}
+ uuid_Xcode4_BuildFileInCopyFiles {5C48D3CC-0C6D-45D4-9991-6CC76CB59093}
+ uuid_Xcode4_ContainerItemProxy {4304047F-0002-4307-BC25-F4207C88FE81}
+ uuid_Xcode4_TargetDependency {B577E322-F704-4B48-87B0-5EEBCEBEC7B9}
+ }
+ }
}
}
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2012-05-01 21:13:18 UTC (rev 9424)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2012-05-01 21:30:42 UTC (rev 9425)
@@ -988,6 +988,9 @@
596D02202FA9ACA0398E401D /* hello.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 1B2AA7BDC4D9093EAD63680B /* hello.cxx */; };
8A69F10A21966EA7513E7FB8 /* fltk3.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */;
};
232D3B4D756F3DB311A86286 /* fltk3.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */;
};
+ 638CAE7CEED1CB4365C16AE3 /* adjuster.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 92B55871686A05F140567DBF /* adjuster.cxx */; };
+ 910EE880CE4BD096A068056A /* fltk3.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */;
};
+ 5C48D3CC49B9F5566CB59093 /* fltk3.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */;
};
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
@@ -2011,6 +2014,18 @@
);
script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
};
+ 1CA8A9A8EB07A6E4EAEA43D9 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*.fl";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.cxx",
+ "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.h",
+ );
+ script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
+ };
/* End PBXBuildRule section */
/* Begin PBXContainerItemProxy section */
@@ -3512,6 +3527,13 @@
remoteGlobalIDString = A57FDE871C99A52BEEDEE68C;
remoteInfo = fltk3;
};
+ 4304047F430548057C88FE81 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 2204C8627A66DD596FFDC8F4 /* Project
object */;
+ proxyType = 1;
+ remoteGlobalIDString = A57FDE871C99A52BEEDEE68C;
+ remoteInfo = fltk3;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -4356,6 +4378,16 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 7CD9ADA08E5D513E8880C475 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ 5C48D3CC49B9F5566CB59093 /* fltk3 in CopyFiles
*/,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -5309,6 +5341,8 @@
7D76C0ACB6969ACB80D8F20F /* overlay1.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = overlay1.app; sourceTree = BUILT_PRODUCTS_DIR; };
1B2AA7BDC4D9093EAD63680B /* hello.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = hello.cxx; path = ../../test2/hello.cxx; sourceTree = SOURCE_ROOT; };
9228B77662AFB89487D6CD0B /* hello2.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = hello2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 92B55871686A05F140567DBF /* adjuster.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = adjuster.cxx; path = ../../test2/adjuster.cxx; sourceTree = SOURCE_ROOT;
};
+ 0C9773B6073A0EB93FAED7F1 /* adjuster2.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = adjuster2.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -6069,6 +6103,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 4FB7C69E5F58A5340D832194 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 910EE880CE4BD096A068056A /* fltk3 in Frameworks
*/,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -6160,6 +6202,7 @@
95F59D403AC05E1893AB0D94 /* fractals1.app */,
7D76C0ACB6969ACB80D8F20F /* overlay1.app */,
9228B77662AFB89487D6CD0B /* hello2.app */,
+ 0C9773B6073A0EB93FAED7F1 /* adjuster2.app */,
);
name = Products;
sourceTree = "<group>";
@@ -7936,10 +7979,19 @@
name = hello2;
sourceTree = "<group>";
};
+ 9F01513ACAB04EB2F663F58A /* adjuster2 */ = {
+ isa = PBXGroup;
+ children = (
+ 92B55871686A05F140567DBF /* adjuster.cxx */,
+ );
+ name = adjuster2;
+ sourceTree = "<group>";
+ };
2B7E88DA9A863C84CF240AC1 /* FLTK2CompatibilityTests */ = {
isa = PBXGroup;
children = (
06C907BD92361F542D5DFF5E /* hello2 */,
+ 9F01513ACAB04EB2F663F58A /* adjuster2 */,
);
name = FLTK2CompatibilityTests;
sourceTree = "<group>";
@@ -10112,6 +10164,26 @@
productReference = 9228B77662AFB89487D6CD0B /*
hello2.app */;
productType = "com.apple.product-type.application";
};
+ 0C9C0BB3367468394F9E8D1A /* adjuster2 */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = B89CDA9D9DC91E6CC4435E24 /*
Build configuration list for PBXNativeTarget "adjuster2" */;
+ buildPhases = (
+ C42A4352D3F497465F268BD9 /* Resources */,
+ 2C80EDD614F23D6BDDDA7383 /* Sources */,
+ 4FB7C69E5F58A5340D832194 /* Frameworks */,
+ 7CD9ADA08E5D513E8880C475 /* CopyFiles */,
+ );
+ buildRules = (
+ 1CA8A9A8EB07A6E4EAEA43D9 /* PBXBuildRule */,
+ );
+ dependencies = (
+ B577E322BC4CD95BCEBEC7B9 /* fltk3 */,
+ );
+ name = adjuster2;
+ productName = adjuster2;
+ productReference = 0C9773B6073A0EB93FAED7F1 /*
adjuster2.app */;
+ productType = "com.apple.product-type.application";
+ };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -10216,6 +10288,7 @@
48427F0246B6DC0672A00515 /* fractals1 */,
789BB61B3680D11F69B41C47 /* overlay1 */,
F68ECE70CF387DC9CE70030D /* hello2 */,
+ 0C9C0BB3367468394F9E8D1A /* adjuster2 */,
);
};
/* End PBXProject section */
@@ -10816,6 +10889,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C42A4352D3F497465F268BD9 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -11803,6 +11883,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 2C80EDD614F23D6BDDDA7383 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 638CAE7CEED1CB4365C16AE3 /* adjuster.cxx in
Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -12876,6 +12964,11 @@
target = A57FDE871C99A52BEEDEE68C /* fltk3 */;
targetProxy = 7DB77C01B6B5D4ED21F15472 /*
PBXContainerItemProxy */;
};
+ B577E322BC4CD95BCEBEC7B9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A57FDE871C99A52BEEDEE68C /* fltk3 */;
+ targetProxy = 7DB77C01B6B5D4ED21F15472 /*
PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@@ -18999,6 +19092,78 @@
};
name = Release;
};
+ A7B91EBBABC47823FB273384 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = NO;
+ DEPLOYMENT_LOCATION = NO;
+ DEPLOYMENT_POSTPROCESSING = NO;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = fltk.pch;
+ GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode4/,
+ ../../include/,
+ ../../include/fltk3png,
+ ../../include/fltk3jpeg,
+ ../../include/fltk3zlib,
+ );
+ INFOPLIST_FILE = "plists/adjuster2-Info.plist";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "";
+ PRODUCT_NAME = "adjuster2";
+ SDKROOT = macosx;
+ WARNING_CFLAGS = (
+ "-Wno-format-security",
+ "-Wall",
+ );
+ };
+ name = Debug;
+ };
+ 71A2B5F0E4BEC9772831F010 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEPLOYMENT_LOCATION = NO;
+ DEPLOYMENT_POSTPROCESSING = NO;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = fltk.pch;
+ GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode4/,
+ ../../include/,
+ ../../include/fltk3png,
+ ../../include/fltk3jpeg,
+ ../../include/fltk3zlib,
+ );
+ INFOPLIST_FILE = "plists/adjuster2-Info.plist";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_LDFLAGS = "";
+ PRODUCT_NAME = "adjuster2";
+ SDKROOT = macosx;
+ WARNING_CFLAGS = (
+ "-Wno-format-security",
+ "-Wall",
+ );
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
2B180F464218A02FAF04B452 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -19792,6 +19957,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ B89CDA9D9DC91E6CC4435E24 /* Build configuration list for
PBXNativeTarget "adjuster2" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A7B91EBBABC47823FB273384 /* Debug */,
+ 71A2B5F0E4BEC9772831F010 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
23BA7E8A3F8CE0AE67BF2B8A /* Build configuration list for
PBXProject "FLTK" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: branches/branch-3.0/include/fltk/Widget.h
===================================================================
--- branches/branch-3.0/include/fltk/Widget.h 2012-05-01 21:13:18 UTC (rev
9424)
+++ branches/branch-3.0/include/fltk/Widget.h 2012-05-01 21:30:42 UTC (rev
9425)
@@ -196,9 +196,17 @@
bool take_focus() ;
void throw_focus() ;
+#endif
- void redraw() ;
- void redraw(uchar c) ;
+ void redraw() {
+ ((fltk3::Widget*)_p)->redraw();
+ }
+
+ void redraw(uchar b) {
+ ((fltk3::Widget*)_p)->damage(b); // FIXME: translate "b"
+ }
+
+#if 0
void redraw_label() ;
void redraw_highlight() ;
void redraw(const Rectangle&);
Modified: branches/branch-3.0/test2/adjuster.cxx
===================================================================
--- branches/branch-3.0/test2/adjuster.cxx 2012-05-01 21:13:18 UTC (rev
9424)
+++ branches/branch-3.0/test2/adjuster.cxx 2012-05-01 21:30:42 UTC (rev
9425)
@@ -28,22 +28,26 @@
#include <stdlib.h>
#include <fltk/run.h>
#include <fltk/Window.h>
+#if 0
#include <fltk/Adjuster.h>
#include <fltk/Box.h>
#include <fltk/Rectangle.h>
+#endif
using namespace fltk;
void adjcb(Widget *o, void *v) {
+#if 0
Adjuster *a = (Adjuster*)o;
Box *b = (Box *)v;
a->format((char *)(b->text()));
a->redraw();
+#endif
}
-int main(int, char ** argv) {
+int main(int argc, char ** argv) {
Window window(320,100,argv[0]);
-
+#if 0
char buf1[100];
FrameBox b1(fltk::DOWN_BOX,20,30,80,25,buf1);
b1.color(fltk::WHITE);
@@ -57,10 +61,10 @@
Adjuster a2(b2.dx()+b2.dw(),10,25,3*25);
a2.callback(adjcb,&b2);
adjcb(&a2,&b2);
-
window.resizable(window);
+#endif
window.end();
- window.show();
+ window.show(argc, argv);
return fltk::run();
}
Modified: branches/branch-3.0/test2/hello.cxx
===================================================================
--- branches/branch-3.0/test2/hello.cxx 2012-05-01 21:13:18 UTC (rev 9424)
+++ branches/branch-3.0/test2/hello.cxx 2012-05-01 21:30:42 UTC (rev 9425)
@@ -11,9 +11,9 @@
window->begin();
Widget *box = new Widget(20, 40, 260, 100, "Hello, World!");
box->box(UP_BOX);
- //box->labelfont(HELVETICA_BOLD_ITALIC);
+ // FIXME: box->labelfont(HELVETICA_BOLD_ITALIC);
box->labelsize(36);
- //box->labeltype(SHADOW_LABEL);
+ // FIXME: box->labeltype(SHADOW_LABEL);
window->end();
window->show(argc, argv);
return run();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
