Menu
▾
▴
adobe-source-commits — CVS repository commit notification
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(67) |
Apr
(455) |
May
(202) |
Jun
(136) |
Jul
(203) |
Aug
(60) |
Sep
(88) |
Oct
(64) |
Nov
(56) |
Dec
(78) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(271) |
Feb
(207) |
Mar
|
Apr
|
May
(167) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: David C. <unc...@us...> - 2005-03-30 02:31:51
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4465/sandbox/adobe-source/adobe/test/visual Added Files: Info.plist Log Message: *** empty log message *** --- NEW FILE: Info.plist --- <?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>CFBundleDocumentTypes</key> <array> <dict> <key>CFBundleTypeExtensions</key> <array> <string>adm</string> </array> <key>CFBundleTypeName</key> <string>Adam file</string> <key>CFBundleTypeRole</key> <string>Viewer</string> <key>LSTypeIsPackage</key> <false/> </dict> <dict> <key>CFBundleTypeExtensions</key> <array> <string>eve</string> </array> <key>CFBundleTypeName</key> <string>Eve file</string> <key>CFBundleTypeRole</key> <string>Viewer</string> <key>LSTypeIsPackage</key> <false/> </dict> </array> <key>CFBundleExecutable</key> <string>Adobe Begin</string> <key>CFBundleIconFile</key> <string>AppIcon.icns</string> <key>CFBundleIdentifier</key> <string>com.adobe.begin</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>CSResourcesFileMapped</key> <true/> </dict> </plist> |
|
From: David C. <unc...@us...> - 2005-03-30 02:31:47
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/English.lproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4420/sandbox/adobe-source/adobe/test/visual/English.lproj Added Files: InfoPlist.strings Log Message: *** empty log message *** --- NEW FILE: InfoPlist.strings --- (This appears to be a binary file; contents omitted.) |
|
From: David C. <unc...@us...> - 2005-03-30 02:30:53
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/English.lproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3633/English.lproj Log Message: Directory /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/English.lproj added to the repository |
|
From: David C. <unc...@us...> - 2005-03-30 02:30:32
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/visual.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3561/sandbox/adobe-source/adobe/test/visual/visual.xcode Added Files: project.pbxproj Log Message: unresolved link errors --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 39; objects = { 0249A66BFF388E3F11CA2CEA = { isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/libstdc++.a"; refType = 0; sourceTree = "<absolute>"; }; //020 //021 //022 //023 //024 //080 //081 //082 //083 //084 0867D6AAFE840B52C02AAC07 = { children = ( 0867D6ABFE840B52C02AAC07, ); isa = PBXVariantGroup; name = InfoPlist.strings; refType = 4; sourceTree = "<group>"; }; 0867D6ABFE840B52C02AAC07 = { fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; refType = 4; sourceTree = "<group>"; }; //080 //081 //082 //083 //084 //190 //191 //192 //193 //194 195DF8CFFE9D517E11CA2CBB = { children = ( 8D0C4E970486CD37000505A6, ); isa = PBXGroup; name = Products; refType = 4; sourceTree = "<group>"; }; //190 //191 //192 //193 //194 //200 //201 //202 //203 //204 20286C28FDCF999611CA2CEA = { buildSettings = { }; buildStyles = ( 4A9504C5FFE6A39111CA0CBA, 4A9504C6FFE6A39111CA0CBA, ); hasScannedForEncodings = 1; isa = PBXProject; mainGroup = 20286C29FDCF999611CA2CEA; projectDirPath = ""; targets = ( 8D0C4E890486CD37000505A6, ); }; 20286C29FDCF999611CA2CEA = { children = ( 32DBCF6D0370B57F00C91783, 894E67BC07F8593B00C05327, 89C4839707F06E96007FD3D0, 20286C2AFDCF999611CA2CEA, 894E675D07F5C0BC00C05327, 20286C2CFDCF999611CA2CEA, 20286C32FDCF999611CA2CEA, 195DF8CFFE9D517E11CA2CBB, ); isa = PBXGroup; name = visual; path = ""; refType = 4; sourceTree = "<group>"; }; 20286C2AFDCF999611CA2CEA = { children = ( 89C483CF07F10216007FD3D0, 89C4838E07F06DB5007FD3D0, 89C4838F07F06DB5007FD3D0, 89C4839007F06DB5007FD3D0, ); isa = PBXGroup; path = sources; refType = 2; sourceTree = SOURCE_ROOT; }; 20286C2CFDCF999611CA2CEA = { children = ( 89C483A907F072F6007FD3D0, 89C483AA07F072F6007FD3D0, 89C483AB07F072F6007FD3D0, 89C483AC07F072F6007FD3D0, 89C483AD07F072F6007FD3D0, 89C483AE07F072F6007FD3D0, 8D0C4E960486CD37000505A6, 0867D6AAFE840B52C02AAC07, ); isa = PBXGroup; name = Resources; path = ""; refType = 4; sourceTree = "<group>"; }; 20286C32FDCF999611CA2CEA = { children = ( 20286C33FDCF999611CA2CEA, 4A9504CAFFE6A41611CA0CBA, 4A9504C8FFE6A3BC11CA0CBA, 0249A66BFF388E3F11CA2CEA, 89323C5D07FA2E4200AB4B9B, 89323CD007FA34E600AB4B9B, ); isa = PBXGroup; name = "External Frameworks and Libraries"; path = ""; refType = 4; sourceTree = "<group>"; }; 20286C33FDCF999611CA2CEA = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; refType = 0; sourceTree = "<absolute>"; }; //200 //201 //202 //203 //204 //320 //321 //322 //323 //324 32DBCF6D0370B57F00C91783 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = visual_Prefix.pch; refType = 2; sourceTree = SOURCE_ROOT; }; //320 //321 //322 //323 //324 //4A0 //4A1 //4A2 //4A3 //4A4 4A9504C5FFE6A39111CA0CBA = { 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; ZERO_LINK = YES; }; isa = PBXBuildStyle; name = Development; }; 4A9504C6FFE6A39111CA0CBA = { buildSettings = { COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = NDEBUG; ZERO_LINK = NO; }; isa = PBXBuildStyle; name = Deployment; }; 4A9504C8FFE6A3BC11CA0CBA = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; refType = 0; sourceTree = "<absolute>"; }; 4A9504CAFFE6A41611CA0CBA = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; refType = 0; sourceTree = "<absolute>"; }; //4A0 //4A1 //4A2 //4A3 //4A4 //890 //891 //892 //893 //894 89323BAC07FA26C800AB4B9B = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = express_viewer.hpp; refType = 4; sourceTree = "<group>"; }; 89323BAD07FA26C800AB4B9B = { fileRef = 89323BAC07FA26C800AB4B9B; isa = PBXBuildFile; settings = { }; }; 89323C5D07FA2E4200AB4B9B = { isa = PBXFileReference; lastKnownFileType = archive.ar; name = libasl_dev.a; path = ../../build/asl_lib/build/libasl_dev.a; refType = 2; sourceTree = SOURCE_ROOT; }; 89323C5E07FA2E4200AB4B9B = { fileRef = 89323C5D07FA2E4200AB4B9B; isa = PBXBuildFile; settings = { }; }; 89323CD007FA34E600AB4B9B = { isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost.a; path = ../../build/boost_lib/build/libboost.a; refType = 2; sourceTree = SOURCE_ROOT; }; 89323CD107FA34E600AB4B9B = { fileRef = 89323CD007FA34E600AB4B9B; isa = PBXBuildFile; settings = { }; }; 89323CF407FA39F300AB4B9B = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; refType = 4; sourceTree = "<group>"; }; 89323CF507FA39F300AB4B9B = { fileRef = 89323CF407FA39F300AB4B9B; isa = PBXBuildFile; settings = { }; }; 894E674307F5BB0500C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = assemblage.cpp; refType = 4; sourceTree = "<group>"; }; 894E674407F5BB0500C05327 = { fileRef = 894E674307F5BB0500C05327; isa = PBXBuildFile; settings = { }; }; 894E675D07F5C0BC00C05327 = { children = ( 894E676F07F5C13400C05327, 894E676007F5C0EF00C05327, 894E678D07F5C33000C05327, 89323BAC07FA26C800AB4B9B, 894E678407F5C31C00C05327, 894E676107F5C0EF00C05327, ); isa = PBXGroup; path = headers; refType = 2; sourceTree = SOURCE_ROOT; }; 894E676007F5C0EF00C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = client_assembler.hpp; refType = 4; sourceTree = "<group>"; }; 894E676107F5C0EF00C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ui_core.hpp; refType = 4; sourceTree = "<group>"; }; 894E676207F5C0EF00C05327 = { fileRef = 894E676007F5C0EF00C05327; isa = PBXBuildFile; settings = { }; }; 894E676307F5C0EF00C05327 = { fileRef = 894E676107F5C0EF00C05327; isa = PBXBuildFile; settings = { }; }; 894E676F07F5C13400C05327 = { children = ( 894E677007F5C13400C05327, 894E677107F5C13400C05327, ); isa = PBXGroup; path = mac; refType = 4; sourceTree = "<group>"; }; 894E677007F5C13400C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = carbon_safe.hpp; refType = 4; sourceTree = "<group>"; }; 894E677107F5C13400C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ui_core_implementation.hpp; refType = 4; sourceTree = "<group>"; }; 894E677207F5C13400C05327 = { fileRef = 894E677007F5C13400C05327; isa = PBXBuildFile; settings = { }; }; 894E677307F5C13400C05327 = { fileRef = 894E677107F5C13400C05327; isa = PBXBuildFile; settings = { }; }; 894E677A07F5C23600C05327 = { children = ( 894E674307F5BB0500C05327, 89C483A007F07194007FD3D0, ); isa = PBXGroup; path = source; refType = 4; sourceTree = "<group>"; }; 894E678407F5C31C00C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = report_exception.hpp; refType = 4; sourceTree = "<group>"; }; 894E678507F5C31C00C05327 = { fileRef = 894E678407F5C31C00C05327; isa = PBXBuildFile; settings = { }; }; 894E678D07F5C33000C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = display.hpp; refType = 4; sourceTree = "<group>"; }; 894E678E07F5C33000C05327 = { fileRef = 894E678D07F5C33000C05327; isa = PBXBuildFile; settings = { }; }; 894E679407F5C35D00C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = assemblage.hpp; refType = 4; sourceTree = "<group>"; }; 894E679507F5C35D00C05327 = { fileRef = 894E679407F5C35D00C05327; isa = PBXBuildFile; settings = { }; }; 894E679907F5C36E00C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = iomanip.hpp; refType = 4; sourceTree = "<group>"; }; 894E679A07F5C36E00C05327 = { fileRef = 894E679907F5C36E00C05327; isa = PBXBuildFile; settings = { }; }; 894E67B007F5C7B000C05327 = { fileRef = 89C4838E07F06DB5007FD3D0; isa = PBXBuildFile; settings = { }; }; 894E67BC07F8593B00C05327 = { children = ( 894E67BF07F8596500C05327, ); isa = PBXGroup; name = adobe; path = ../..; refType = 2; sourceTree = SOURCE_ROOT; }; 894E67BF07F8596500C05327 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = functional.hpp; refType = 4; sourceTree = "<group>"; }; 894E67C007F8596500C05327 = { fileRef = 894E67BF07F8596500C05327; isa = PBXBuildFile; settings = { }; }; 894E67CC07F85CEC00C05327 = { fileRef = 89C483D007F10216007FD3D0; isa = PBXBuildFile; settings = { }; }; 894E67CD07F85CF500C05327 = { fileRef = 89C4838F07F06DB5007FD3D0; isa = PBXBuildFile; settings = { }; }; 894E67CE07F85CF800C05327 = { fileRef = 89C483A007F07194007FD3D0; isa = PBXBuildFile; settings = { }; }; 894E67CF07F85CFB00C05327 = { fileRef = 89C4839007F06DB5007FD3D0; isa = PBXBuildFile; settings = { }; }; 894E67D007F85CFD00C05327 = { fileRef = 89C483D107F10216007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4838E07F06DB5007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = client_assembler.cpp; refType = 4; sourceTree = "<group>"; }; 89C4838F07F06DB5007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = express_viewer.cpp; refType = 4; sourceTree = "<group>"; }; 89C4839007F06DB5007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ui_core.cpp; refType = 4; sourceTree = "<group>"; }; 89C4839707F06E96007FD3D0 = { children = ( 894E677A07F5C23600C05327, 894E679407F5C35D00C05327, 894E679907F5C36E00C05327, ); isa = PBXGroup; name = future; path = ../../future; refType = 2; sourceTree = SOURCE_ROOT; }; 89C483A007F07194007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = iomanip.cpp; refType = 4; sourceTree = "<group>"; }; 89C483A907F072F6007FD3D0 = { isa = PBXFileReference; lastKnownFileType = image.icns; name = AppIcon.icns; path = resources/AppIcon.icns; refType = 4; sourceTree = "<group>"; }; 89C483AA07F072F6007FD3D0 = { isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Begin.nib; path = resources/Begin.nib; refType = 4; sourceTree = "<group>"; }; 89C483AB07F072F6007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; name = editor.adm; path = resources/editor.adm; refType = 4; sourceTree = "<group>"; }; 89C483AC07F072F6007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; name = editor.eve; path = resources/editor.eve; refType = 4; sourceTree = "<group>"; }; 89C483AD07F072F6007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; name = eve_globals.scp; path = resources/eve_globals.scp; refType = 4; sourceTree = "<group>"; }; 89C483AE07F072F6007FD3D0 = { isa = PBXFileReference; lastKnownFileType = image.png; name = link_icon.png; path = resources/link_icon.png; refType = 4; sourceTree = "<group>"; }; 89C483AF07F072F6007FD3D0 = { fileRef = 89C483A907F072F6007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C483B007F072F6007FD3D0 = { fileRef = 89C483AA07F072F6007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C483B107F072F6007FD3D0 = { fileRef = 89C483AB07F072F6007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C483B207F072F6007FD3D0 = { fileRef = 89C483AC07F072F6007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C483B307F072F6007FD3D0 = { fileRef = 89C483AD07F072F6007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C483B407F072F6007FD3D0 = { fileRef = 89C483AE07F072F6007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C483CF07F10216007FD3D0 = { children = ( 89C483D007F10216007FD3D0, 89323CF407FA39F300AB4B9B, 89C483D107F10216007FD3D0, ); isa = PBXGroup; path = mac; refType = 4; sourceTree = "<group>"; }; 89C483D007F10216007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = display.cpp; refType = 4; sourceTree = "<group>"; }; 89C483D107F10216007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ui_core_implementation.cpp; refType = 4; sourceTree = "<group>"; }; //890 //891 //892 //893 //894 //8D0 //8D1 //8D2 //8D3 //8D4 8D0C4E890486CD37000505A6 = { buildPhases = ( 8D0C4E8C0486CD37000505A6, 8D0C4E8F0486CD37000505A6, 8D0C4E910486CD37000505A6, ); buildRules = ( ); buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = visual_Prefix.pch; HEADER_SEARCH_PATHS = "../../../ ../../../third_party/boost_tp/boost/"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "/Users/uncommon/Developer/ASL/sandbox/adobe-source/adobe/build/asl_lib/build /Users/uncommon/Developer/ASL/sandbox/adobe-source/adobe/build/boost_lib/build"; PRODUCT_NAME = visual; WARNING_CFLAGS = "-Wno-long-double"; WRAPPER_EXTENSION = app; }; dependencies = ( ); isa = PBXNativeTarget; name = visual; productInstallPath = "$(HOME)/Applications"; productName = visual; productReference = 8D0C4E970486CD37000505A6; productType = "com.apple.product-type.application"; }; 8D0C4E8C0486CD37000505A6 = { buildActionMask = 2147483647; files = ( 8D0C4E8D0486CD37000505A6, 89C483AF07F072F6007FD3D0, 89C483B007F072F6007FD3D0, 89C483B107F072F6007FD3D0, 89C483B207F072F6007FD3D0, 89C483B307F072F6007FD3D0, 89C483B407F072F6007FD3D0, 894E676207F5C0EF00C05327, 894E676307F5C0EF00C05327, 894E677207F5C13400C05327, 894E677307F5C13400C05327, 894E678507F5C31C00C05327, 894E678E07F5C33000C05327, 894E679507F5C35D00C05327, 894E679A07F5C36E00C05327, 894E67C007F8596500C05327, 89323BAD07FA26C800AB4B9B, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; 8D0C4E8D0486CD37000505A6 = { fileRef = 0867D6AAFE840B52C02AAC07; isa = PBXBuildFile; settings = { }; }; 8D0C4E8F0486CD37000505A6 = { buildActionMask = 2147483647; files = ( 894E674407F5BB0500C05327, 894E67B007F5C7B000C05327, 894E67CC07F85CEC00C05327, 894E67CD07F85CF500C05327, 894E67CE07F85CF800C05327, 894E67CF07F85CFB00C05327, 894E67D007F85CFD00C05327, 89323CF507FA39F300AB4B9B, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; 8D0C4E910486CD37000505A6 = { buildActionMask = 2147483647; files = ( 8D0C4E920486CD37000505A6, 8D0C4E930486CD37000505A6, 89323C5E07FA2E4200AB4B9B, 89323CD107FA34E600AB4B9B, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; 8D0C4E920486CD37000505A6 = { fileRef = 20286C33FDCF999611CA2CEA; isa = PBXBuildFile; settings = { }; }; 8D0C4E930486CD37000505A6 = { fileRef = 0249A66BFF388E3F11CA2CEA; isa = PBXBuildFile; settings = { }; }; 8D0C4E960486CD37000505A6 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; refType = 4; sourceTree = "<group>"; }; 8D0C4E970486CD37000505A6 = { explicitFileType = wrapper.application; includeInIndex = 0; isa = PBXFileReference; path = visual.app; refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; }; rootObject = 20286C28FDCF999611CA2CEA; } |
|
From: David C. <unc...@us...> - 2005-03-30 02:30:08
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/visual.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3283/visual.xcode Log Message: Directory /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/visual.xcode added to the repository |
|
From: David C. <unc...@us...> - 2005-03-30 01:50:31
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/asl_lib/asl_lib.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12913/sandbox/adobe-source/adobe/build/asl_lib/asl_lib.xcode Added Files: project.pbxproj Log Message: *** empty log message *** --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 39; objects = { 014CEA520018CE5811CA2923 = { 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; ZERO_LINK = YES; }; isa = PBXBuildStyle; name = Development; }; [...1089 lines suppressed...] }; dependencies = ( ); isa = PBXNativeTarget; name = asl; productName = asl_lib; productReference = D2AAC046055464E500DB518D; productType = "com.apple.product-type.library.static"; }; D2AAC046055464E500DB518D = { explicitFileType = archive.ar; includeInIndex = 0; isa = PBXFileReference; path = libasl.a; refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; }; rootObject = 08FB7793FE84155DC02AAC07; } |
|
From: David C. <unc...@us...> - 2005-03-30 01:50:07
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/asl_lib/asl_lib.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12488/asl_lib.xcode Log Message: Directory /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/asl_lib/asl_lib.xcode added to the repository |
|
From: David C. <unc...@us...> - 2005-03-30 01:49:07
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11567/sandbox/adobe-source/adobe/test/visual/headers/mac Modified Files: ui_core_implementation.hpp Log Message: fixed namespace and unneeded ## Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/mac/ui_core_implementation.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_implementation.hpp 19 Mar 2005 00:16:44 -0000 1.1 --- ui_core_implementation.hpp 30 Mar 2005 01:48:59 -0000 1.2 *************** *** 21,29 **** /****************************************************************************************************/ #define ADOBE_DELETE_PTR_SPECIALIZATION(type, func) \ template <> \ ! struct adobe::delete_ptr<##type> \ { \ ! void operator()(##type x) const \ { if (x) func(x); } \ } --- 21,33 ---- /****************************************************************************************************/ + namespace adobe { + + /****************************************************************************************************/ + #define ADOBE_DELETE_PTR_SPECIALIZATION(type, func) \ template <> \ ! struct adobe::delete_ptr<type> \ { \ ! void operator()(type x) const \ { if (x) func(x); } \ } *************** *** 53,60 **** /****************************************************************************************************/ - namespace adobe { - - /****************************************************************************************************/ - // REVISIT (fbrereto) : I'd like to be able to set this up 1) so the fudges can be made on a // per-OS-version basis, 2) so they can be adjusted without requiring --- 57,60 ---- |
|
From: David C. <unc...@us...> - 2005-03-30 01:48:30
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11053/sandbox/adobe-source/adobe/test/visual/sources/mac Modified Files: ui_core_implementation.cpp Log Message: fix for gcc Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac/ui_core_implementation.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui_core_implementation.cpp 25 Mar 2005 22:49:29 -0000 1.2 --- ui_core_implementation.cpp 30 Mar 2005 01:48:20 -0000 1.3 *************** *** 66,70 **** adobe::auto_resource<CFStringRef> string_to_cfstring(const std::string& x) { ! return adobe::auto_resource<CFStringRef>(::CFStringCreateWithCString(NULL, x.c_str(), kCFStringEncodingUTF8)); } --- 66,72 ---- adobe::auto_resource<CFStringRef> string_to_cfstring(const std::string& x) { ! adobe::auto_resource<CFStringRef> convertedString(::CFStringCreateWithCString(NULL, x.c_str(), kCFStringEncodingUTF8)); ! ! return convertedString; } |
|
From: David C. <unc...@us...> - 2005-03-30 01:47:33
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10636/sandbox/adobe-source/adobe/test/visual/sources Modified Files: ui_core.cpp Log Message: removed unneeded ## in macro Index: ui_core.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/ui_core.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core.cpp 19 Mar 2005 00:16:44 -0000 1.1 --- ui_core.cpp 30 Mar 2005 01:47:24 -0000 1.2 *************** *** 20,24 **** #define ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DEFINITION(the_class) \ ! void swap(adobe::##the_class & x, adobe::##the_class & y) { std::swap(x.object_m, y.object_m); } /****************************************************************************************************/ --- 20,24 ---- #define ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DEFINITION(the_class) \ ! void swap(adobe::the_class & x, adobe::the_class & y) { std::swap(x.object_m, y.object_m); } /****************************************************************************************************/ |
|
From: David C. <unc...@us...> - 2005-03-30 01:47:06
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10441/sandbox/adobe-source/adobe/test/visual/sources Modified Files: client_assembler.cpp Log Message: template hint for gcc Index: client_assembler.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/client_assembler.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** client_assembler.cpp 23 Mar 2005 18:51:59 -0000 1.3 --- client_assembler.cpp 30 Mar 2005 01:46:57 -0000 1.4 *************** *** 41,45 **** #include "report_exception.hpp" #include "display.hpp" ! #include "latch.hpp" #include <fstream> --- 41,45 ---- #include "report_exception.hpp" #include "display.hpp" ! //#include "latch.hpp" #include <fstream> *************** *** 1312,1316 **** { for (adobe::array_t::const_iterator iter(items_m.begin()); iter != items_m.end(); ++iter) ! control_m.add_menu_item((*iter).get<adobe::dictionary_t>()[key_name].get<std::string>(), (*iter).get<adobe::dictionary_t>()[key_value]); token.assemblage_m.hold_connection(sheet_m->monitor_value(popup_bind_m, boost::bind(&bevel_button_proxy_t<emulation>::monitor_popup_value, boost::ref(*this), _1))); --- 1312,1316 ---- { for (adobe::array_t::const_iterator iter(items_m.begin()); iter != items_m.end(); ++iter) ! control_m.add_menu_item((*iter).template get<adobe::dictionary_t>()[key_name].template get<std::string>(), (*iter).template get<adobe::dictionary_t>()[key_value]); token.assemblage_m.hold_connection(sheet_m->monitor_value(popup_bind_m, boost::bind(&bevel_button_proxy_t<emulation>::monitor_popup_value, boost::ref(*this), _1))); |
|
From: David C. <unc...@us...> - 2005-03-30 01:46:27
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/future In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10261/sandbox/adobe-source/adobe/future Modified Files: assemblage.hpp Log Message: fixed "parse error before ;" error in gcc Index: assemblage.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/assemblage.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assemblage.hpp 19 Mar 2005 00:16:42 -0000 1.1 --- assemblage.hpp 30 Mar 2005 01:46:18 -0000 1.2 *************** *** 16,19 **** --- 16,21 ---- #include <boost/function.hpp> + #include <adobe/functional.hpp> + /*************************************************************************************************/ *************** *** 46,50 **** void delete_on_destruction(T& x) { ! signal_destruction(boost::bind(adobe::delete_ptr<T>(), x)); } --- 48,53 ---- void delete_on_destruction(T& x) { ! adobe::delete_ptr<T> deleter; ! signal_destruction(boost::bind(deleter,x)); } |
|
From: David C. <unc...@us...> - 2005-03-30 01:45:03
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/boost_lib/boost_lib.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9296/sandbox/adobe-source/adobe/build/boost_lib/boost_lib.xcode Added Files: project.pbxproj Log Message: *** empty log message *** --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 39; objects = { 014CEA520018CE5811CA2923 = { 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; ZERO_LINK = YES; }; isa = PBXBuildStyle; name = Development; }; 014CEA530018CE5811CA2923 = { buildSettings = { COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; ZERO_LINK = NO; }; isa = PBXBuildStyle; name = Deployment; }; //010 //011 //012 //013 //014 //080 //081 //082 //083 //084 08FB7793FE84155DC02AAC07 = { buildSettings = { }; buildStyles = ( 014CEA520018CE5811CA2923, 014CEA530018CE5811CA2923, ); hasScannedForEncodings = 1; isa = PBXProject; mainGroup = 08FB7794FE84155DC02AAC07; projectDirPath = ""; targets = ( D2AAC045055464E500DB518D, ); }; 08FB7794FE84155DC02AAC07 = { children = ( 08FB7795FE84155DC02AAC07, 1AB674ADFE9D54B511CA2CBB, ); isa = PBXGroup; name = boost_lib; refType = 4; sourceTree = "<group>"; }; 08FB7795FE84155DC02AAC07 = { children = ( 89C4833A07EFFB17007FD3D0, 89C4834C07EFFB92007FD3D0, ); isa = PBXGroup; name = libs; path = ../../../third_party/boost_tp/boost/libs; refType = 2; sourceTree = SOURCE_ROOT; }; //080 //081 //082 //083 //084 //1A0 //1A1 //1A2 //1A3 //1A4 1AB674ADFE9D54B511CA2CBB = { children = ( D2AAC046055464E500DB518D, ); isa = PBXGroup; name = Products; refType = 4; sourceTree = "<group>"; }; //1A0 //1A1 //1A2 //1A3 //1A4 //890 //891 //892 //893 //894 89C4833A07EFFB17007FD3D0 = { children = ( 89C4833D07EFFB65007FD3D0, ); isa = PBXGroup; path = signals; refType = 4; sourceTree = "<group>"; }; 89C4833D07EFFB65007FD3D0 = { children = ( 89C4834007EFFB8A007FD3D0, 89C4834107EFFB8A007FD3D0, 89C4834207EFFB8A007FD3D0, 89C4834307EFFB8A007FD3D0, 89C4834407EFFB8A007FD3D0, ); isa = PBXGroup; path = src; refType = 4; sourceTree = "<group>"; }; 89C4834007EFFB8A007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = connection.cpp; refType = 4; sourceTree = "<group>"; }; 89C4834107EFFB8A007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = named_slot_map.cpp; refType = 4; sourceTree = "<group>"; }; 89C4834207EFFB8A007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = signal_base.cpp; refType = 4; sourceTree = "<group>"; }; 89C4834307EFFB8A007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = slot.cpp; refType = 4; sourceTree = "<group>"; }; 89C4834407EFFB8A007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = trackable.cpp; refType = 4; sourceTree = "<group>"; }; 89C4834507EFFB8A007FD3D0 = { fileRef = 89C4834007EFFB8A007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4834607EFFB8A007FD3D0 = { fileRef = 89C4834107EFFB8A007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4834707EFFB8A007FD3D0 = { fileRef = 89C4834207EFFB8A007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4834807EFFB8A007FD3D0 = { fileRef = 89C4834307EFFB8A007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4834907EFFB8A007FD3D0 = { fileRef = 89C4834407EFFB8A007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4834C07EFFB92007FD3D0 = { children = ( 89C4835107EFFBAF007FD3D0, ); isa = PBXGroup; path = thread; refType = 4; sourceTree = "<group>"; }; 89C4835107EFFBAF007FD3D0 = { children = ( 89C4835407EFFBD9007FD3D0, 89C4835507EFFBD9007FD3D0, 89C4835607EFFBD9007FD3D0, ); isa = PBXGroup; path = src; refType = 4; sourceTree = "<group>"; }; 89C4835407EFFBD9007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = exceptions.cpp; refType = 4; sourceTree = "<group>"; }; 89C4835507EFFBD9007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = mutex.cpp; refType = 4; sourceTree = "<group>"; }; 89C4835607EFFBD9007FD3D0 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = once.cpp; refType = 4; sourceTree = "<group>"; }; 89C4835707EFFBD9007FD3D0 = { fileRef = 89C4835407EFFBD9007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4835807EFFBD9007FD3D0 = { fileRef = 89C4835507EFFBD9007FD3D0; isa = PBXBuildFile; settings = { }; }; 89C4835907EFFBD9007FD3D0 = { fileRef = 89C4835607EFFBD9007FD3D0; isa = PBXBuildFile; settings = { }; }; //890 //891 //892 //893 //894 //D20 //D21 //D22 //D23 //D24 D289987405E68DCB004EDB86 = { buildActionMask = 2147483647; files = ( ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC043055464E500DB518D = { buildActionMask = 2147483647; files = ( ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC044055464E500DB518D = { buildActionMask = 2147483647; files = ( 89C4834507EFFB8A007FD3D0, 89C4834607EFFB8A007FD3D0, 89C4834707EFFB8A007FD3D0, 89C4834807EFFB8A007FD3D0, 89C4834907EFFB8A007FD3D0, 89C4835707EFFBD9007FD3D0, 89C4835807EFFBD9007FD3D0, 89C4835907EFFBD9007FD3D0, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC045055464E500DB518D = { buildPhases = ( D2AAC043055464E500DB518D, D2AAC044055464E500DB518D, D289987405E68DCB004EDB86, ); buildRules = ( ); buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; HEADER_SEARCH_PATHS = ../../../third_party/boost_tp/boost/; INSTALL_PATH = /usr/local/lib; LIBRARY_STYLE = STATIC; PRODUCT_NAME = boost; WARNING_CFLAGS = "-Wno-long-double"; }; dependencies = ( ); isa = PBXNativeTarget; name = boost; productName = boost_lib; productReference = D2AAC046055464E500DB518D; productType = "com.apple.product-type.library.static"; }; D2AAC046055464E500DB518D = { explicitFileType = archive.ar; includeInIndex = 0; isa = PBXFileReference; path = libboost.a; refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; }; rootObject = 08FB7793FE84155DC02AAC07; } |
|
From: David C. <unc...@us...> - 2005-03-30 01:44:22
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/boost_lib/boost_lib.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9076/boost_lib.xcode Log Message: Directory /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/boost_lib/boost_lib.xcode added to the repository |
|
From: Foster B. <fos...@us...> - 2005-03-29 23:29:49
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1768/adobe-source/adobe/test/visual/sources/win Modified Files: ui_core_implementation.cpp Log Message: Link widgets / tab groups / ASL 1.0.2 prep; other bugs fixed Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win/ui_core_implementation.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ui_core_implementation.cpp 28 Mar 2005 19:33:27 -0000 1.4 --- ui_core_implementation.cpp 29 Mar 2005 23:29:39 -0000 1.5 *************** *** 283,296 **** /****************************************************************************************************/ - long get_control_value(HWND control) - { - if (!control) return 0; - - return -1; - //return ::GetControl32BitValue(control); - } - - /****************************************************************************************************/ - std::string get_popup_current_text(HWND popup) { --- 283,286 ---- *************** *** 551,554 **** --- 541,545 ---- void set_popup_with_text(HWND control, const std::string& text, unsigned long cur_time) { + assert(control); } *************** *** 603,627 **** /****************************************************************************************************/ - void set_control_min_value(HWND control, long value) - { - assert(control); - } - - /****************************************************************************************************/ - - void set_control_max_value(HWND control, long value) - { - assert(control); - } - - /****************************************************************************************************/ - - void set_control_value(HWND control, long value) - { - assert(control); - } - - /****************************************************************************************************/ - template <typename T> void set_user_reference(HWND control, T data) --- 594,597 ---- *************** *** 655,714 **** /****************************************************************************************************/ ! void draw_link(HWND control, boost::int16_t) { try { static const long link_line_width(2); ! #if 0 ! adobe::link_t::implementation_t& link(*reinterpret_cast<adobe::link_t::implementation_t*>(get_user_reference(control))); ! ! RECT bounds = { 0 }; ! HWND our_window(::GetControlOwner(control)); ! CGrafPtr window_port(::GetWindowPort(our_window)); long num_prongs(link.prongs_m.size()); ! RECT window_bounds = { 0 }; ! CGContextRef context(0); point_set_t points; std::string link_icon_name("link_icon.png"); - CFBundleRef main_bundle(::CFBundleGetMainBundle()); - CFURLRef resource_bundle_url(::CFBundleCopyResourcesDirectoryURL(main_bundle)); - CFURLRef url_to_png(::CFURLCreateFromFileSystemRepresentationRelativeToBase(0, reinterpret_cast<const UInt8*>(link_icon_name.c_str()), link_icon_name.size(), false, resource_bundle_url)); - CGDataProviderRef data_ref_to_png(::CGDataProviderCreateWithURL(url_to_png)); - CGImageRef link_icon(::CGImageCreateWithPNGDataProvider(data_ref_to_png, 0, true, kCGRenderingIntentSaturation)); ! ::GetWindowBounds(our_window, kWindowContentRgn, &window_bounds); ! get_control_bounds(control, bounds); ! ! ADOBE_REQUIRE_STATUS(::QDBeginCGContext(window_port, &context)); ! ! ::CGContextTranslateCTM(context, 0, window_bounds.bottom - window_bounds.top - 1); ! ::CGContextScaleCTM(context, 1.0, -1.0); ! ::CGContextSetLineWidth(context, link_line_width); ! ::CGContextSetShouldAntialias(context, false); ! ! ::CGContextBeginPath(context); // REVISIT (sparent) : If this were aligned top instead of fill then the hieght _should_ be correct. // REVISIT (sparent) : We should require up front (and default) to a count of 2. ! ::CGContextSetRGBFillColor(context, 0, 0, 0, 1); // REVISIT (sparent) FIXED VALUE bounds.right -= 6; // inset the rect a bit to create padding for the link icon ! if (::IsControlEnabled(control) && num_prongs > 1) { for (std::size_t i(0); i < num_prongs; ++i) { ! ::CGContextFillRect(context, ::CGRectMake( bounds.left, ! bounds.top + link.prongs_m[i] - link_line_width - 1, ! bounds.right - bounds.left, ! link_line_width)); } ! ::CGContextFillRect(context, ::CGRectMake( bounds.right, ! bounds.top + link.prongs_m[0] - link_line_width - 1, ! link_line_width, ! link.prongs_m[num_prongs - 1] - link.prongs_m[0] + link_line_width)); bounds.right += 2; // reset inset for the link icon --- 625,677 ---- /****************************************************************************************************/ ! void draw_link(const adobe::link_t::implementation_t& link, HDC context) { try { static const long link_line_width(2); ! HWND parent(::GetAncestor(link.control_m, GA_ROOT)); long num_prongs(link.prongs_m.size()); ! RECT bounds = { 0 }; point_set_t points; std::string link_icon_name("link_icon.png"); ! ::GetClientRect(link.control_m, &bounds); // REVISIT (sparent) : If this were aligned top instead of fill then the hieght _should_ be correct. // REVISIT (sparent) : We should require up front (and default) to a count of 2. ! HPEN pen(::CreatePen(PS_SOLID, 1, RGB(0, 0, 0))); ! HPEN old_pen((HPEN) SelectObject(context, pen)); // REVISIT (sparent) FIXED VALUE bounds.right -= 6; // inset the rect a bit to create padding for the link icon ! if (::IsWindowEnabled(link.control_m) && num_prongs > 1) { for (std::size_t i(0); i < num_prongs; ++i) { ! long top(bounds.top + link.prongs_m[i] - link_line_width); ! ! RECT fill_rect = ! { ! bounds.left, ! top, ! bounds.right, ! top + link_line_width ! }; ! ! ::FillRect(context, &fill_rect, (HBRUSH) ::GetStockObject(BLACK_BRUSH)); } ! // link spine ! RECT fill_rect = ! { ! bounds.right, ! bounds.top + link.prongs_m[0] - link_line_width, ! bounds.right + link_line_width, ! link.prongs_m[num_prongs - 1] - link.prongs_m[0] + 1 * link_line_width ! }; ! ! ::FillRect(context, &fill_rect, (HBRUSH) ::GetStockObject(BLACK_BRUSH)); bounds.right += 2; // reset inset for the link icon *************** *** 718,728 **** (link.prongs_m[num_prongs - 1] - link.prongs_m[0]) / 2; ! ::CGContextDrawImage(context, ::CGRectMake(bounds.right - 5, center - 8, 9, 16), link_icon); } ! ::CGContextSynchronize(context); ! ! ADOBE_REQUIRE_STATUS(::QDEndCGContext(window_port, &context)); ! #endif } catch (...) --- 681,690 ---- (link.prongs_m[num_prongs - 1] - link.prongs_m[0]) / 2; ! // draw link icon here at { bounds.right - 5, center - 8, 9, 16 } } ! // clean up pen work ! SelectObject(context, old_pen); ! DeleteObject(pen); } catch (...) *************** *** 800,804 **** #if 0 adobe::hitless_t::implementation_t& hitless(*reinterpret_cast<adobe::hitless_t::implementation_t*>(::get_user_reference(control))); ! HWND window(hitless.overlay_window_m); CGrafPtr window_port(::GetWindowPort(window)); CGContextRef context(0); --- 762,766 ---- #if 0 adobe::hitless_t::implementation_t& hitless(*reinterpret_cast<adobe::hitless_t::implementation_t*>(::get_user_reference(control))); ! HWND window(hitless.overlay_window_m); CGrafPtr window_port(::GetWindowPort(window)); CGContextRef context(0); *************** *** 867,872 **** RECT top_left_rect = { left, top, left + tick_width, top + tick_height }; RECT top_right_rect = { tick_start_right, top, tick_start_right + tick_width, top + tick_height }; ! RECT bottom_left_rect = { left, tick_start_bottom, left + tick_width, tick_start_bottom + tick_height }; ! RECT bottom_right_rect = { tick_start_right, tick_start_bottom, tick_start_right + tick_width, tick_start_bottom + tick_height }; frame_set.push_back(de_t(de_t::element_type_top_left, top_left_rect, green)); --- 829,834 ---- RECT top_left_rect = { left, top, left + tick_width, top + tick_height }; RECT top_right_rect = { tick_start_right, top, tick_start_right + tick_width, top + tick_height }; ! RECT bottom_left_rect = { left, tick_start_bottom + 1, left + tick_width + 1, tick_start_bottom + tick_height }; ! RECT bottom_right_rect = { tick_start_right - 1, tick_start_bottom + 1, tick_start_right + tick_width, tick_start_bottom + tick_height }; frame_set.push_back(de_t(de_t::element_type_top_left, top_left_rect, green)); *************** *** 918,938 **** /****************************************************************************************************/ - void slider_action(HWND control) - { - adobe::slider_t::implementation_t& slider_impl(*reinterpret_cast<adobe::slider_t::implementation_t*>(get_user_reference(control))); - - try - { - if (slider_impl.value_proc_m) - slider_impl.value_proc_m(get_control_value(slider_impl.control_m)); - } - catch (...) - { - adobe::report_exception(); - } - } - - /****************************************************************************************************/ - void erase_menu(HWND combo_box) { --- 880,883 ---- *************** *** 1144,1147 **** --- 1089,1107 ---- } } + else if ( message == WM_NOTIFY ) + { + NMHDR* notice((NMHDR*) lParam); + HWND control_hwnd(notice->hwndFrom); + control_t* control(reinterpret_cast<control_t*>(get_user_reference(control_hwnd))); + tab_group_t::implementation_t* tab_group(dynamic_cast<tab_group_t::implementation_t*>(control)); + + if (notice->code == TCN_SELCHANGE && tab_group) + { + long index(::SendMessage(control_hwnd, TCM_GETCURSEL, 0, 0)); + + if (!tab_group->value_proc_m.empty()) + tab_group->value_proc_m(tab_group->items_m[index].value_m); + } + } #if 0 // Do we really need to add a set focus handler in every widget dialog handling proc? yuck. *************** *** 1620,1650 **** /****************************************************************************************************/ - void control_t::set_min_value(long value) - { - assert(control_m); - - set_control_min_value(control_m, value); - } - - /****************************************************************************************************/ - - void control_t::set_max_value(long value) - { - assert(control_m); - - set_control_max_value(control_m, value); - } - - /****************************************************************************************************/ - - void control_t::set_value(long value) - { - assert(control_m); - - set_control_value(control_m, value); - } - - /****************************************************************************************************/ - void control_t::trap_window_proc(WNDPROC new_window_proc) { --- 1580,1583 ---- *************** *** 1766,1769 **** --- 1699,1717 ---- /****************************************************************************************************/ + LRESULT CALLBACK tab_group_window_proc(HWND window, UINT message, WPARAM wParam, LPARAM lParam) + { + control_t* control(reinterpret_cast<control_t*>(get_user_reference(window))); + tab_group_t::implementation_t* tab_group(dynamic_cast<tab_group_t::implementation_t*>(control)); + bool handled(false); + + LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); + + if (control && message == WM_PAINT) frame_widget(*control); + + return result; + } + + /****************************************************************************************************/ + tab_group_t::implementation_t::implementation_t() { *************** *** 1790,1818 **** assert (!control_m); ! #if 0 ! ControlTabSize size(kControlSizeNormal); ! ControlTabDirection direction(kControlTabDirectionNorth); ! long group_value(0); ! ADOBE_REQUIRE_STATUS(::CreateTabsControl( 0, &bounds, ! size, direction, ! 0, NULL, &control_m)); for (; first != last; ++first) { ! auto_resource<CFStringRef> cfstring(string_to_cfstring(first->name_m).release()); ! ControlTabInfoRecV1 new_tab = ! { ! kControlTabInfoVersionOne, ! 0, cfstring.get() ! }; ! items_m.push_back(*first); ! set_control_max_value(control_m, ++group_value); ! set_widget_data(control_m, group_value, kControlTabInfoTag, new_tab); } - #endif } --- 1738,1771 ---- assert (!control_m); ! long width(bounds.right - bounds.left); ! long height(bounds.bottom - bounds.top); ! control_m = ::CreateWindowEx( 0, ! WC_TABCONTROL, ! NULL, ! WS_POPUP | WS_VISIBLE, ! 0, 0, width, height, ! NULL, ! NULL, ! ::GetModuleHandle(NULL), ! NULL); ! ! if (control_m == NULL) ADOBE_THROW_LAST_ERROR; ! ! set_user_reference(control_m, this); ! ! trap_window_proc(tab_group_window_proc); for (; first != last; ++first) { ! TCITEM item = { TCIF_TEXT }; ! item.pszText = (LPSTR) first->name_m.c_str(); ! item.cchTextMax = first->name_m.size(); ! ::SendMessage(control_m, TCM_INSERTITEM, ::SendMessage(control_m, TCM_GETITEMCOUNT, 0, 0), (LPARAM) &item); ! items_m.push_back(*first); } } *************** *** 1826,1836 **** theme_t masked(theme & theme_mask_s); - - // ControlSize size = kControlSizeLarge; - // if (masked == theme_normal_s) size = kControlSizeNormal; - // else if (masked == theme_small_s) size = kControlSizeSmall; - // else if (masked == theme_mini_s) size = kControlSizeMini; - - //set_widget_data(control_m, kControlEntireControl, kControlSizeTag, size); } --- 1779,1782 ---- *************** *** 1845,1849 **** // REVISIT (fbrereto) : Static values ! result.height() = 20; result.slice_m[rectangle_slices_t::vertical].frame_m.first = 20; --- 1791,1795 ---- // REVISIT (fbrereto) : Static values ! result.height() = 15; result.slice_m[rectangle_slices_t::vertical].frame_m.first = 20; *************** *** 1856,1865 **** { assert(control_m); ! tab_set_t::iterator iter(adobe::find_match(items_m, new_value, adobe::compare_members(&tab_t::value_m, std::equal_to<adobe::value_t>()))); ! if (iter == items_m.end()) return; ! ! set_control_value(control_m, (iter - items_m.begin()) + 1); } --- 1802,1811 ---- { assert(control_m); ! tab_set_t::iterator iter(adobe::find_match(items_m, new_value, adobe::compare_members(&tab_t::value_m, std::equal_to<adobe::value_t>()))); ! if (iter == items_m.end()) return; ! ! ::SendMessage(control_m, TCM_SETCURSEL, iter - items_m.begin(), 0); } *************** *** 1871,1881 **** if (!value_proc_m) - { value_proc_m = proc; - - // handle_event( control_m, kEventClassControl, - // kEventControlValueFieldChanged, - // handle_tab_group_value_change, *this); - } } --- 1817,1821 ---- *************** *** 1916,1919 **** --- 1856,1873 ---- /****************************************************************************************************/ + LRESULT CALLBACK panel_window_proc(HWND window, UINT message, WPARAM wParam, LPARAM lParam) + { + control_t* control(reinterpret_cast<control_t*>(get_user_reference(window))); + bool handled(false); + + LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); + + if (control && message == WM_PAINT) frame_widget(*control); + + return result; + } + + /****************************************************************************************************/ + panel_t::implementation_t::implementation_t() { *************** *** 1937,1946 **** { assert(!control_m); ! #if 0 ! ADOBE_REQUIRE_STATUS(::CreateUserPaneControl( 0, &bounds, ! kControlSupportsEmbedding, ! &control_m)); ! #endif set_user_reference(control_m, this); } --- 1891,1913 ---- { assert(!control_m); ! ! long width(bounds.right - bounds.left); ! long height(bounds.bottom - bounds.top); ! ! control_m = ::CreateWindowEx( WS_EX_CONTROLPARENT, ! "STATIC", ! NULL, ! WS_POPUP | WS_VISIBLE | WS_TABSTOP, ! bounds.left, bounds.top, width, height, ! NULL, ! NULL, ! ::GetModuleHandle(NULL), ! NULL); ! ! if (control_m == NULL) ADOBE_THROW_LAST_ERROR; ! set_user_reference(control_m, this); + + trap_window_proc(panel_window_proc); } *************** *** 1973,1979 **** LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); - #if 1 if (control && message == WM_PAINT) frame_widget(*control); - #endif return result; --- 1940,1944 ---- *************** *** 2183,2189 **** LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); - #if 1 if (control && message == WM_PAINT) frame_widget(*control); - #endif return result; --- 2148,2152 ---- *************** *** 2331,2337 **** LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); - #if 1 if (control && message == WM_PAINT) frame_widget(*control); - #endif return result; --- 2294,2298 ---- *************** *** 2470,2473 **** --- 2431,2482 ---- /****************************************************************************************************/ + LRESULT CALLBACK link_window_proc(HWND window, UINT message, WPARAM wParam, LPARAM lParam) + { + control_t* control(reinterpret_cast<control_t*>(get_user_reference(window))); + link_t::implementation_t* link(dynamic_cast<link_t::implementation_t*>(control)); + bool handled(false); + + if ( message == WM_NCHITTEST ) + { + handled = true; + + return HTCLIENT; + } + else if ( message == WM_LBUTTONDOWN ) + { + if ( link ) + { + link->hit_proc_m(modifiers_t()); + } + + #if 1 + RECT bounds; + + ::GetClientRect(window, &bounds); + + ::InvalidateRect(window, &bounds, TRUE); + + ::UpdateWindow(window); + #endif + + handled = true; + } + + LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); + + if (control && message == WM_PAINT) + { + HDC context(::GetWindowDC(control->control_m)); + + draw_link(*link, context); + + frame_widget(*control); // Done after the default wind proc has drawn the widget + } + + return result; + } + + /****************************************************************************************************/ + link_t::implementation_t::implementation_t() : value_m(true), visible_m(true), active_m(true) *************** *** 2498,2502 **** control_m = ::CreateWindow( "STATIC", NULL, ! WS_POPUP | WS_VISIBLE, bounds.left, bounds.top, width, height, NULL, --- 2507,2511 ---- control_m = ::CreateWindow( "STATIC", NULL, ! WS_POPUP, bounds.left, bounds.top, width, height, NULL, *************** *** 2508,2511 **** --- 2517,2522 ---- set_user_reference(control_m, this); + + trap_window_proc(link_window_proc); } *************** *** 2564,2573 **** if (!hit_proc_m) - { hit_proc_m = proc; - - //handle_event( control_m, kEventClassControl, kEventControlClick, - // handle_control_hit<implementation_t>, *this); - } } --- 2575,2579 ---- *************** *** 2660,2663 **** --- 2666,2687 ---- /****************************************************************************************************/ + void progress_bar_t::implementation_t::set_min_value(long min_value) + { + } + + /****************************************************************************************************/ + + void progress_bar_t::implementation_t::set_max_value(long max_value) + { + } + + /****************************************************************************************************/ + + void progress_bar_t::implementation_t::set_value(long value) + { + } + + /****************************************************************************************************/ + dictionary_t progress_bar_t::implementation_t::essentials() const { *************** *** 2754,2760 **** LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); - #if 1 if (control && message == WM_PAINT) frame_widget(*control); - #endif return result; --- 2778,2782 ---- *************** *** 2913,2919 **** } - #if 1 if (control && message == WM_PAINT) frame_widget(*control); - #endif return result; --- 2935,2939 ---- *************** *** 3285,3291 **** LRESULT result = handled ? 0 : ::CallWindowProc( control->default_window_proc_m, window, message, wParam, lParam ); - #if 1 if (control && message == WM_PAINT) frame_widget(*control); - #endif return result; --- 3305,3309 ---- *************** *** 3919,3922 **** --- 3937,3958 ---- /****************************************************************************************************/ + void slider_t::implementation_t::set_min_value(long min_value) + { + } + + /****************************************************************************************************/ + + void slider_t::implementation_t::set_max_value(long max_value) + { + } + + /****************************************************************************************************/ + + void slider_t::implementation_t::set_value(long value) + { + } + + /****************************************************************************************************/ + void slider_t::implementation_t::signal_value_change(const implementation::slider_value_proc_t& proc) { |
|
From: Foster B. <fos...@us...> - 2005-03-29 23:29:49
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1768/adobe-source/adobe/test/visual/sources/mac Modified Files: main.cpp Log Message: Link widgets / tab groups / ASL 1.0.2 prep; other bugs fixed Index: main.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 23 Mar 2005 18:52:00 -0000 1.3 --- main.cpp 29 Mar 2005 23:29:39 -0000 1.4 *************** *** 204,208 **** case kHICommandFrameWidgets: case kHICommandClearWidgetFrames: ! system_beep(); break; #endif --- 204,208 ---- case kHICommandFrameWidgets: case kHICommandClearWidgetFrames: ! adobe::system_beep(); break; #endif |
|
From: Foster B. <fos...@us...> - 2005-03-29 23:29:49
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1768/adobe-source/adobe/test/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: Link widgets / tab groups / ASL 1.0.2 prep; other bugs fixed Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win/ui_core_implementation.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ui_core_implementation.hpp 28 Mar 2005 19:33:27 -0000 1.4 --- ui_core_implementation.hpp 29 Mar 2005 23:29:39 -0000 1.5 *************** *** 127,134 **** bool is_focused(); void signal_focus(const implementation::control_focus_proc_t& proc); - void set_min_value(long value); - void set_max_value(long value); - void set_value(long value); - void trap_window_proc(WNDPROC new_window_proc); --- 127,130 ---- *************** *** 385,388 **** --- 381,387 ---- bool is_vertical); virtual rectangle_t best_bounds(); + void set_min_value(long min_value); + void set_max_value(long max_value); + void set_value(long value); ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); *************** *** 575,578 **** --- 574,580 ---- virtual rectangle_t best_bounds(); void set_bounds(const point_t& position, const rectangle_t& geometry); + void set_min_value(long min_value); + void set_max_value(long max_value); + void set_value(long value); void signal_value_change(const implementation::slider_value_proc_t& proc); *************** *** 606,609 **** --- 608,612 ---- void set_bevel_amount(bevel_button_bevel_amount_t amount); void set_current_menu_item(const value_t& item); + void set_value(bool) { /* stubbed out */ } void signal_hit(const implementation::bevel_button_hit_proc_t& proc); void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); |
|
From: Foster B. <fos...@us...> - 2005-03-29 23:29:47
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1768/adobe-source/adobe Modified Files: config.hpp Log Message: Link widgets / tab groups / ASL 1.0.2 prep; other bugs fixed Index: config.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/config.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.hpp 23 Mar 2005 19:43:07 -0000 1.2 --- config.hpp 29 Mar 2005 23:29:39 -0000 1.3 *************** *** 28,32 **** #define ADOBE_VERSION_SUBMINOR 1 #define ADOBE_VERSION_MINOR 0 ! #define ADOBE_VERSION_MAJOR 1 #define ADOBE_VERSION (ADOBE_VERSION_MAJOR * 100000 + ADOBE_VERSION_MINOR * 100 + ADOBE_VERSION_SUBMINOR) --- 28,32 ---- #define ADOBE_VERSION_SUBMINOR 1 #define ADOBE_VERSION_MINOR 0 ! #define ADOBE_VERSION_MAJOR 2 #define ADOBE_VERSION (ADOBE_VERSION_MAJOR * 100000 + ADOBE_VERSION_MINOR * 100 + ADOBE_VERSION_SUBMINOR) |
|
From: Foster B. <fos...@us...> - 2005-03-29 23:29:47
|
Update of /cvsroot/adobe-source/sandbox/adobe-source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1768/adobe-source Modified Files: read_me.txt Log Message: Link widgets / tab groups / ASL 1.0.2 prep; other bugs fixed Index: read_me.txt =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/read_me.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** read_me.txt 19 Mar 2005 00:16:37 -0000 1.1 --- read_me.txt 29 Mar 2005 23:29:38 -0000 1.2 *************** *** 1,13 **** ! Release Notes 2005XXYY -=-=-= REVISION HISTORY ! 2005/XX/YY Reworked ui_core API for edit_text, popup, and unit_edit_text widgets ! Improved ui_core fudge code, though it still needs improvement Added command line tutorial program for Adam (thanks to Peter Kummel for the discussion prompting the work) Fixed several ASL compilation bugs for various platforms. Added boost patch file to the distro (thanks to Nick Kraft for pointing out the omission) - // Started working on website tutorial for Eve Multiple documentation tweaks and enhancements 2005/02/28 First public release! Lots of kinks to work out still, though. --- 1,16 ---- ! Release Notes 20050401 -=-=-= REVISION HISTORY ! 2005/04/01 Started bringing Adobe Begin for Win32 online. Took a good chunk out of it, but bugs remain. ! Reworking of Win32 metrics measurement / UI enchancement on Win32 (by Ralph Thomas) ! Reworking of bjam build environment within adobe-source (by Ralph Thomas) ! Separation of platform code from express_viewer.cpp (by Ralph Thomas) ! Reworked ui_core API for edit_text, popup, and unit_edit_text widgets ! Improved ui_core fudge code, though it still needs improvement (Mac) Added command line tutorial program for Adam (thanks to Peter Kummel for the discussion prompting the work) Fixed several ASL compilation bugs for various platforms. Added boost patch file to the distro (thanks to Nick Kraft for pointing out the omission) Multiple documentation tweaks and enhancements 2005/02/28 First public release! Lots of kinks to work out still, though. |
|
From: Ralph T. <ra...@us...> - 2005-03-28 21:32:17
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28901/adobe-source/adobe/build Modified Files: Jamfile Removed Files: boost-build.jam project-root.jam Log Message: New build system, more like the Jamfiles in Boost. The asl libraries can now be build as /adobe//asl and /adobe//asl_dev (for the regular and development versions). The adam_tutorial and visual code also have nice Jamfiles now. The main benefit of the new Jamfiles is that everything gets built once only (e.g.: /adobe//asl_dev only gets build once if both visual and adam_tutorial are built). The directories which the generated binaries are delivered into are different from the old ones. We put generated binaries into a boost-style tree, e.g.: bin/<compiler>/<variant>/<link type>... --- boost-build.jam DELETED --- Index: Jamfile =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/build/Jamfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jamfile 19 Mar 2005 00:16:39 -0000 1.1 --- Jamfile 28 Mar 2005 21:31:48 -0000 1.2 *************** *** 1,12 **** import testing ; ! project ! : requirements <include>../ ! : requirements <include>../../ ! : requirements <include>../source/ ! : requirements <include>../../third_party/boost_tp/boost/ ; - build-project asl_lib/ ; - build-project asl_lib_dev/ ; - build-project boost_lib/ ; --- 1,113 ---- + # Main Jamfile for building ASL import testing ; + import os ; + # + # This is the extra code required when using serialization. + # + FUTURE_SRC = + assemblage + iomanip + iomanip_pdf + ; + # + # We build two libraries, asl and asl_dev. asl_dev includes the future + # sources and supports serialization. We define a project to make it + # easy to maintain various flags. + # + project adobe + : source-location .. + : usage-requirements + # + # These usage requirements propagate to everything which uses this project. + # + <include>../.. + ; ! alias boost_thread : /boost/thread//boost_thread ; ! alias boost_signals : /boost/signals//boost_signals ; ! # ! # Define flags we need to use to build the objects for the two libraries. ! # ! ASL_OBJ_FLAGS = ! <define>BOOST_THREAD_USE_LIB ! <define>NOMINMAX ! <define>BOOST_THREAD_USE_LIB ! <define>BOOST_ALL_NO_LIB ! # ! # Sadly we have to redefine some of the project parameters ! # here, because the bits inside [ ] are separate from the ! # rest of the setup (we put objects into [ ] so that we can ! # build the same source multiple times...). ! # ! <include>../.. ! <use>boost_thread ! <use>boost_signals ! ; ! ASL_DEV_OBJ_FLAGS = ! $(ASL_OBJ_FLAGS) ! <define>ADOBE_SERIALIZATION ! ; ! # ! # Unfortunately to get the same source file to build twice we need to do ! # some nasty [ obj ... ] type things. For more information see this page: ! # ! # http://www.boost.org/doc/html/bbv2/faq.html ! # ! lib asl_dev : ! [ obj adam_dev_o : source/adam.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj adam_evaluate_dev_o : source/adam_evaluate.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj adam_parser_dev_o : source/adam_parser.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj array_dev_o : source/array.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj dictionary_dev_o : source/dictionary.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj eve_dev_o : source/eve.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj eve_evaluate_dev_o : source/eve_evaluate.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj eve_parser_dev_o : source/eve_parser.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj expression_parser_dev_o : source/expression_parser.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj istream_dev_o : source/istream.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj lex_stream_dev_o : source/lex_stream.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj name_dev_o : source/name.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj parser_shared_dev_o : source/parser_shared.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj rectangle_dev_o : source/rectangle.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj string_pool_dev_o : source/string_pool.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj test_configuration_dev_o : source/test_configuration.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj token_dev_o : source/token.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj typeinfo_dev_o : source/typeinfo.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj value_dev_o : source/value.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! [ obj virtual_machine_dev_o : source/virtual_machine.cpp : $(ASL_DEV_OBJ_FLAGS) ] ! # ! # Add the future sources to the dev build. ! # ! future/source/$(FUTURE_SRC).cpp ! : $(ASL_DEV_OBJ_FLAGS) <link>static ! : ! : <library>boost_signals <library>boost_thread $(ASL_DEV_OBJ_FLAGS) ! ; ! # ! # The asl rule uses similar Jam hackery to build it's objects. ! # ! lib asl : ! [ obj adam_o : source/adam.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj adam_evaluate_o : source/adam_evaluate.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj adam_parser_o : source/adam_parser.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj array_o : source/array.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj dictionary_o : source/dictionary.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj eve_o : source/eve.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj eve_evaluate_o : source/eve_evaluate.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj eve_parser_o : source/eve_parser.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj expression_parser_o : source/expression_parser.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj istream_o : source/istream.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj lex_stream_o : source/lex_stream.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj name_o : source/name.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj parser_shared_o : source/parser_shared.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj rectangle_o : source/rectangle.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj string_pool_o : source/string_pool.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj test_configuration_o : source/test_configuration.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj token_o : source/token.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj typeinfo_o : source/typeinfo.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj value_o : source/value.cpp : $(ASL_OBJ_FLAGS) ] ! [ obj virtual_machine_o : source/virtual_machine.cpp : $(ASL_OBJ_FLAGS) ] ! : <use>boost_signals <use>boost_thread $(ASL_OBJ_FLAGS) <link>static ! : ! : <library>boost_signals <library>boost_thread $(ASL_OBJ_FLAGS) ; --- project-root.jam DELETED --- |
|
From: Ralph T. <ra...@us...> - 2005-03-28 21:32:17
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/adam_tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28901/adobe-source/adobe/test/adam_tutorial Modified Files: Jamfile Removed Files: boost-build.jam project-root.jam Log Message: New build system, more like the Jamfiles in Boost. The asl libraries can now be build as /adobe//asl and /adobe//asl_dev (for the regular and development versions). The adam_tutorial and visual code also have nice Jamfiles now. The main benefit of the new Jamfiles is that everything gets built once only (e.g.: /adobe//asl_dev only gets build once if both visual and adam_tutorial are built). The directories which the generated binaries are delivered into are different from the old ones. We put generated binaries into a boost-style tree, e.g.: bin/<compiler>/<variant>/<link type>... --- boost-build.jam DELETED --- Index: Jamfile =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/adam_tutorial/Jamfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jamfile 19 Mar 2005 00:16:43 -0000 1.1 --- Jamfile 28 Mar 2005 21:31:49 -0000 1.2 *************** *** 1,47 **** import testing ; ! project ! : requirements <include>../../ ! : requirements <include>../../../ ! : requirements <include>../../source/ ! : requirements <include>../../../third_party/boost_tp/boost/ ; ! exe "adam_tutorial" ! : main.cpp ! ../../source/adam.cpp ! ../../source/adam_evaluate.cpp ! ../../source/adam_parser.cpp ! ../../source/array.cpp ! ../../source/dictionary.cpp ! ../../source/eve.cpp ! ../../source/eve_evaluate.cpp ! ../../source/eve_parser.cpp ! ../../source/expression_parser.cpp ! ../../source/istream.cpp ! ../../source/lex_stream.cpp ! ../../source/name.cpp ! ../../source/parser_shared.cpp ! ../../source/rectangle.cpp ! ../../source/string_pool.cpp ! ../../source/test_configuration.cpp ! ../../source/token.cpp ! ../../source/typeinfo.cpp ! ../../source/value.cpp ! ../../source/virtual_machine.cpp ! ../../future/source/iomanip.cpp ! ../../future/source/iomanip_pdf.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/convenience.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/exception.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/operations_posix_windows.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/path_posix_windows.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/connection.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/named_slot_map.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/signal_base.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/slot.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/trackable.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/exceptions.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/mutex.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/once.cpp ! : <define>ADOBE_SERIALIZATION ; --- 1,11 ---- import testing ; ! project adobe/adam_tutorial ! : requirements <link>static ; ! exe "adam_tutorial" : ! main.cpp ! /adobe//asl_dev ! /boost/filesystem//boost_filesystem ; --- project-root.jam DELETED --- |
|
From: Ralph T. <ra...@us...> - 2005-03-28 21:31:58
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28901/adobe-source/adobe/test/visual Modified Files: Jamfile Removed Files: boost-build.jam project-root.jam Log Message: New build system, more like the Jamfiles in Boost. The asl libraries can now be build as /adobe//asl and /adobe//asl_dev (for the regular and development versions). The adam_tutorial and visual code also have nice Jamfiles now. The main benefit of the new Jamfiles is that everything gets built once only (e.g.: /adobe//asl_dev only gets build once if both visual and adam_tutorial are built). The directories which the generated binaries are delivered into are different from the old ones. We put generated binaries into a boost-style tree, e.g.: bin/<compiler>/<variant>/<link type>... --- boost-build.jam DELETED --- Index: Jamfile =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/Jamfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jamfile 21 Mar 2005 03:57:34 -0000 1.1 --- Jamfile 28 Mar 2005 21:31:49 -0000 1.2 *************** *** 1,28 **** import testing ; - import os ; if [ os.name ] = NT { - PLATFORM_SOURCE_DIR = sources/win ; - PLATFORM_FLAGS = <define>WIN32 <define>_LIB ; PLATFORM_HEADERS = headers/win ; } else { - PLATFORM_SOURCE_DIR = sources/mac ; - PLATFORM_FLAGS = ; PLATFORM_HEADERS = headers/mac ; } ! project ! : requirements <include>../../ ! : requirements <include>../../../ ! : requirements <include>../../source/ ! : requirements <include>../../../third_party/boost_tp/boost/ ! : requirements <include>./headers/ ! : requirements <include>$(PLATFORM_HEADERS) : requirements <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib /subsystem:windows" ; exe "visual" ! : sources/express_viewer_new.cpp sources/client_assembler.cpp sources/ui_core.cpp --- 1,25 ---- + # Jamfile for building the VISUAL demo import testing ; import os ; + + # + # We need to include different directories for Windows vs. Mac. + # if [ os.name ] = NT { PLATFORM_HEADERS = headers/win ; + PLATFORM_SOURCE_DIR = sources/win ; } else { PLATFORM_HEADERS = headers/mac ; + PLATFORM_SOURCE_DIR = sources/mac ; } ! project adobe/visual : requirements <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib /subsystem:windows" + : requirements <include>headers <link>static ; exe "visual" ! : sources/express_viewer.cpp sources/client_assembler.cpp sources/ui_core.cpp *************** *** 30,69 **** $(PLATFORM_SOURCE_DIR)/display.cpp $(PLATFORM_SOURCE_DIR)/ui_core_implementation.cpp ! ../../source/adam.cpp ! ../../source/adam_evaluate.cpp ! ../../source/adam_parser.cpp ! ../../source/array.cpp ! ../../source/dictionary.cpp ! ../../source/eve.cpp ! ../../source/eve_evaluate.cpp ! ../../source/eve_parser.cpp ! ../../source/expression_parser.cpp ! ../../source/istream.cpp ! ../../source/lex_stream.cpp ! ../../source/name.cpp ! ../../source/parser_shared.cpp ! ../../source/rectangle.cpp ! ../../source/string_pool.cpp ! ../../source/test_configuration.cpp ! ../../source/token.cpp ! ../../source/typeinfo.cpp ! ../../source/value.cpp ! ../../source/virtual_machine.cpp ! ../../future/source/assemblage.cpp ! ../../future/source/iomanip.cpp ! ../../future/source/iomanip_pdf.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/convenience.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/exception.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/operations_posix_windows.cpp ! ../../../third_party/boost_tp/boost/libs/filesystem/src/path_posix_windows.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/connection.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/named_slot_map.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/signal_base.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/slot.cpp ! ../../../third_party/boost_tp/boost/libs/signals/src/trackable.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/exceptions.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/mutex.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/once.cpp ! ../../../third_party/boost_tp/boost/libs/thread/src/xtime.cpp ! : <define>ADOBE_SERIALIZATION $(PLATFORM_FLAGS) <define>NOMINMAX <define>BOOST_ALL_NO_LIB <define>BOOST_THREAD_USE_LIB ! ; --- 27,32 ---- $(PLATFORM_SOURCE_DIR)/display.cpp $(PLATFORM_SOURCE_DIR)/ui_core_implementation.cpp ! /adobe//asl_dev ! /boost/filesystem//boost_filesystem ! : <include>$(PLATFORM_HEADERS) ; ! # <variant>release:<define>NDEBUG ; --- project-root.jam DELETED --- |
|
From: Ralph T. <ra...@us...> - 2005-03-28 21:31:57
|
Update of /cvsroot/adobe-source/sandbox/adobe-source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28901/adobe-source Added Files: Jamfile boost-build.jam project-root.jam Log Message: New build system, more like the Jamfiles in Boost. The asl libraries can now be build as /adobe//asl and /adobe//asl_dev (for the regular and development versions). The adam_tutorial and visual code also have nice Jamfiles now. The main benefit of the new Jamfiles is that everything gets built once only (e.g.: /adobe//asl_dev only gets build once if both visual and adam_tutorial are built). The directories which the generated binaries are delivered into are different from the old ones. We put generated binaries into a boost-style tree, e.g.: bin/<compiler>/<variant>/<link type>... --- NEW FILE: boost-build.jam --- boost-build third_party/boost_tp/boost/tools/build/v2/ ; --- NEW FILE: Jamfile --- # # This Jamfile triggers the build of the visual demo and adam tutorial. # --- NEW FILE: project-root.jam --- use-project /boost : third_party/boost_tp/boost ; use-project /adobe : adobe/build ; use-project /adobe/visual : adobe/test/visual ; use-project /adobe/adam_tutorial : adobe/test/adam_tutorial ; |
|
From: Foster B. <fos...@us...> - 2005-03-28 19:33:38
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25713/visual/sources/win Modified Files: ui_core_implementation.cpp Log Message: More Win32 implementation updates Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win/ui_core_implementation.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ui_core_implementation.cpp 24 Mar 2005 19:37:55 -0000 1.3 --- ui_core_implementation.cpp 28 Mar 2005 19:33:27 -0000 1.4 *************** *** 248,252 **** void apply_fudges(adobe::rectangle_t& geometry, const adobe::fudge_t& fudges) { - #if 0 geometry.slice_m[adobe::rectangle_slices_t::vertical].length_m += fudges.top() + fudges.bottom(); geometry.slice_m[adobe::rectangle_slices_t::horizontal].length_m += fudges.left() + fudges.right(); --- 248,251 ---- *************** *** 255,259 **** if (poi.size()) poi[0] += fudges.baseline_m; - #endif } --- 254,257 ---- *************** *** 262,266 **** void shed_fudges(adobe::point_t& position, adobe::rectangle_t& geometry, const adobe::fudge_t& fudges) { - #if 0 position.second -= fudges.top(); position.first -= fudges.left(); --- 260,263 ---- *************** *** 268,272 **** geometry.height() -= fudges.bottom(); geometry.width() -= fudges.right(); - #endif } --- 265,268 ---- *************** *** 435,442 **** switch (theme & adobe::theme_mask_s) { ! case adobe::theme_large_s: return 12; break; ! case adobe::theme_normal_s: return 11; break; // confirmed; WinXP classic mode ASCII charset ! case adobe::theme_small_s: return 10; break; ! case adobe::theme_mini_s: return 9; break; } --- 431,438 ---- switch (theme & adobe::theme_mask_s) { ! case adobe::theme_large_s: return 13; break; ! case adobe::theme_normal_s: return 12; break; // confirmed; WinXP classic mode ASCII charset ! case adobe::theme_small_s: return 11; break; ! case adobe::theme_mini_s: return 10; break; } *************** *** 504,507 **** --- 500,545 ---- /****************************************************************************************************/ + RECT get_window_client_offset_rect(HWND window) + { + assert(window); + + RECT window_rect; + RECT client_rect; + + ::GetWindowRect(window, &window_rect); + ::GetClientRect(window, &client_rect); + + ::ClientToScreen(window, (LPPOINT) &client_rect.left); + ::ClientToScreen(window, (LPPOINT) &client_rect.right); + + RECT result; + + result.left = std::abs(window_rect.left - client_rect.left); + result.top = std::abs(window_rect.top - client_rect.top); + result.right = std::abs(window_rect.right - client_rect.right); + result.bottom = std::abs(window_rect.bottom - client_rect.bottom); + + return result; + } + + /****************************************************************************************************/ + + std::pair<long, long> get_window_client_offsets(HWND window) + { + assert(window); + + RECT window_rect; + RECT client_rect; + + ::GetWindowRect(window, &window_rect); + ::GetClientRect(window, &client_rect); + + long extra_width = (window_rect.right - window_rect.left) - (client_rect.right - client_rect.left); + long extra_height = (window_rect.bottom - window_rect.top) - (client_rect.bottom - client_rect.top); + + return std::make_pair(extra_width, extra_height); + } + + /****************************************************************************************************/ #if 0 *************** *** 810,826 **** typedef draw_element_set_t::value_type de_t; ! draw_element_set_t frame_set; ! HWND window(control.control_m); ! HDC context(::GetWindowDC(window)); ! RECT bounds; ! COLORREF green(RGB(0, 255, 0)); ! COLORREF red(RGB(255, 0, 0)); ! ! ::GetClientRect(window, &bounds); long tick(3); ! long top(bounds.top); ! long left(bounds.left); ! long bottom(top + control.geometry_m.height()); long right(left + control.geometry_m.width()); long tick_width(std::min<long>(tick, control.geometry_m.width())); --- 848,863 ---- typedef draw_element_set_t::value_type de_t; ! draw_element_set_t frame_set; ! HWND window(control.control_m); ! HWND main_window(::GetAncestor(window, GA_ROOT)); ! HDC context(::GetWindowDC(main_window)); ! COLORREF green(RGB(0, 255, 0)); ! COLORREF red(RGB(255, 0, 0)); ! RECT extra(get_window_client_offset_rect(main_window)); long tick(3); ! long top(control.position_m.second + extra.top - 1); ! long left(control.position_m.first + extra.left); ! long bottom(top + control.geometry_m.height() - 1); long right(left + control.geometry_m.width()); long tick_width(std::min<long>(tick, control.geometry_m.width())); *************** *** 1144,1148 **** --- 1181,1189 ---- wc.hIcon = 0; //LoadIcon(NULL, IDI_APPLICATION); wc.hCursor = LoadCursor(NULL, IDC_ARROW); + #if 1 wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + #else + wc.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); + #endif wc.lpszMenuName = NULL; wc.lpszClassName = L"eve_dialog"; *************** *** 1259,1275 **** geometry_m = geometry; ! RECT window_rect; ! RECT client_rect; ::GetWindowRect(window_m, &window_rect); - ::GetClientRect(window_m, &client_rect); - - int extra_width = (window_rect.right - window_rect.left) - (client_rect.right - client_rect.left); - int extra_height = (window_rect.bottom - window_rect.top) - (client_rect.bottom - client_rect.top); ::MoveWindow( window_m, position.first + window_rect.left, position.second + window_rect.top, ! geometry_m.width() + extra_width, ! geometry_m.height() + extra_height, TRUE); #ifndef NDEBUG --- 1300,1312 ---- geometry_m = geometry; ! RECT window_rect; ! std::pair<long, long> extra(get_window_client_offsets(window_m)); ::GetWindowRect(window_m, &window_rect); ::MoveWindow( window_m, position.first + window_rect.left, position.second + window_rect.top, ! geometry_m.width() + extra.first, ! geometry_m.height() + extra.second, TRUE); #ifndef NDEBUG *************** *** 1439,1442 **** --- 1476,1480 ---- geometry_m = geometry; + position_m = position; #ifndef NDEBUG *************** *** 2024,2027 **** --- 2062,2067 ---- result.height() += 2 * button_height_padding; + result.slice_m[rectangle_slices_t::vertical].poi_m[0] += 2; + return result; } *************** *** 2029,2032 **** --- 2069,2079 ---- /****************************************************************************************************/ + void button_t::implementation_t::set_bounds(const point_t& position, const rectangle_t& geometry) + { + _super::set_bounds(position, geometry); + } + + /****************************************************************************************************/ + void button_t::implementation_t::set_default(bool is_default) { *************** *** 2219,2223 **** } ! long radio_button_width_padding(16); result.width() += radio_button_width_padding; --- 2266,2270 ---- } ! long radio_button_width_padding(20); result.width() += radio_button_width_padding; *************** *** 2365,2369 **** } ! long checkbox_width_padding(16); result.width() += checkbox_width_padding; --- 2412,2416 ---- } ! long checkbox_width_padding(20); result.width() += checkbox_width_padding; *************** *** 2969,2972 **** --- 3016,3029 ---- points_of_interest_t::value_type& edit_baseline(result.slice_m[rectangle_slices_t::vertical].poi_m[0]); + long frame_fudge(2 * extra); + long cursor_fudge(1); + long lines_height(result.height() * rows_m); + + result.width() += frame_fudge + cursor_fudge; + result.height() = frame_fudge + lines_height; + + if (rows_m == 1) + edit_baseline += 3; + if (using_label_m) { *************** *** 2997,3014 **** } - long frame_fudge(2 * extra); - long cursor_fudge(1); - long lines_height(result.height() * rows_m); - - result.width() += frame_fudge + cursor_fudge; - result.height() = frame_fudge + lines_height; - - // clear the baseline for multiline edit texts. - //if (rows_m > 1) - // result.slice_m[rectangle_slices_t::vertical].poi_m = points_of_interest_t(); - //else - //if (rows_m == 1) - // result.slice_m[rectangle_slices_t::vertical].poi_m[0] += extra; - #if 0 if (scroll_control_m) --- 3054,3057 ---- *************** *** 3036,3039 **** --- 3079,3083 ---- geometry_m = geometry; + position_m = position; long edit_additional(0); *************** *** 3044,3048 **** width_adjust = geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m[0] - static_width_m; ! adobe::rectangle_t label_impose; adobe::point_t label_position(position.first + width_adjust, position.second + static_adjust_m + edit_additional); --- 3088,3092 ---- width_adjust = geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m[0] - static_width_m; ! adobe::rectangle_t label_impose(geometry_m); adobe::point_t label_position(position.first + width_adjust, position.second + static_adjust_m + edit_additional); *************** *** 3050,3053 **** --- 3094,3099 ---- label_impose.width() = static_width_m; + label_impose.slice_m[rectangle_slices_t::vertical].poi_m[0] -= static_adjust_m; + get_label().set_bounds(label_position, label_impose); *************** *** 3058,3061 **** --- 3104,3109 ---- position.second += edit_additional; + geometry_m.slice_m[rectangle_slices_t::horizontal].poi_m.clear(); + geometry_m.height() -= 2 * edit_additional; geometry_m.width() -= width_adjust + 2 * edit_additional; *************** *** 3340,3343 **** --- 3388,3399 ---- points_of_interest_t::value_type& popup_baseline(result.slice_m[rectangle_slices_t::vertical].poi_m[0]); + long popup_fudge_height(7); + long popup_fudge_width(30); + + result.height() += popup_fudge_height; + result.width() += popup_fudge_width; + + popup_baseline += 4; + if (using_label_m) { *************** *** 3368,3377 **** } - long popup_fudge_height(0); - long popup_fudge_width(30); - - result.height() += popup_fudge_height; - result.width() += popup_fudge_width; - return result; } --- 3424,3427 ---- *************** *** 3386,3389 **** --- 3436,3440 ---- geometry_m = geometry; + position_m = position; long width_adjust(0); *************** *** 3393,3397 **** width_adjust = geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m[0] - static_width_m; ! adobe::rectangle_t label_impose; adobe::point_t label_position(position.first + width_adjust, position.second + static_adjust_m); --- 3444,3448 ---- width_adjust = geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m[0] - static_width_m; ! adobe::rectangle_t label_impose(geometry_m); adobe::point_t label_position(position.first + width_adjust, position.second + static_adjust_m); *************** *** 3399,3402 **** --- 3450,3455 ---- label_impose.width() = static_width_m; + label_impose.slice_m[rectangle_slices_t::vertical].poi_m[0] -= static_adjust_m; + get_label().set_bounds(label_position, label_impose); *************** *** 3407,3410 **** --- 3460,3465 ---- geometry_m.width() -= width_adjust; + geometry_m.slice_m[rectangle_slices_t::horizontal].poi_m.clear(); + long old_height = geometry_m.height(); *************** *** 3666,3686 **** // set the baseline to the (possibly new) baseline edit_baseline = baseline; - - #if 0 - // REVISIT (fbrereto) : This is an interesting problem because we're interested - // in popup alignment from the right hand side of the widget. - // Omit for now. - // popup alignment guide - result.slice_m[adobe::rectangle_slices_t::horizontal].poi_m.push_back(popup_width_m); - #endif - - // REVISIT (fbrereto) : If the widget is using a label then there are two horizontal - // guides, and the second should be adjusted to take the first - // into account. - #if 0 - if (using_label_m) - result.slice_m[adobe::rectangle_slices_t::horizontal].poi_m[1] += - result.slice_m[adobe::rectangle_slices_t::horizontal].poi_m[0]; - #endif } --- 3721,3724 ---- *************** *** 3699,3708 **** long width_adjust(0); ! adobe::rectangle_t edit_impose; adobe::point_t edit_position(pos); - if (using_label_m) - edit_impose.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0]); - edit_impose.width() = edit_width_m; edit_impose.height() = geometry.slice_m[rectangle_slices_t::vertical].length_m; --- 3737,3743 ---- long width_adjust(0); ! adobe::rectangle_t edit_impose(geometry); adobe::point_t edit_position(pos); edit_impose.width() = edit_width_m; edit_impose.height() = geometry.slice_m[rectangle_slices_t::vertical].length_m; *************** *** 3714,3718 **** if (using_popup_m) { ! adobe::rectangle_t popup_impose; adobe::point_t popup_position(pos.first + width_adjust, pos.second + popup_adjust_m); --- 3749,3753 ---- if (using_popup_m) { ! adobe::rectangle_t popup_impose(geometry); adobe::point_t popup_position(pos.first + width_adjust, pos.second + popup_adjust_m); *************** *** 3728,3731 **** --- 3763,3767 ---- geometry_m = geometry; + position_m = position; } |
|
From: Foster B. <fos...@us...> - 2005-03-28 19:33:36
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25713/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: More Win32 implementation updates Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win/ui_core_implementation.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ui_core_implementation.hpp 24 Mar 2005 19:37:55 -0000 1.3 --- ui_core_implementation.hpp 28 Mar 2005 19:33:27 -0000 1.4 *************** *** 144,147 **** --- 144,148 ---- implementation::control_focus_proc_t focus_proc_m; rectangle_t geometry_m; // saving set_bounds param for essentials + point_t position_m; // saving set_bounds param for widget framing fudge_t fudges_m; // added in best_bounds (apply_fudges); subtracted in set_bounds (shed_fudges) #ifndef NDEBUG *************** *** 280,283 **** --- 281,285 ---- const button_t::state_descriptor_t* last); virtual rectangle_t best_bounds(); + void set_bounds(const point_t& position, const rectangle_t& geometry); void set_default(bool is_default); void set_cancel(bool is_cancel); |
