Index: /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/project.pbxproj
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/project.pbxproj	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/project.pbxproj	(revision 4081)
@@ -9,5 +9,5 @@
 /* Begin PBXBuildFile section */
 		088CC8E4149A494B00210C77 /* pimsghandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C020662462C009E5976 /* pimsghandler.h */; };
-		088CC8E5149A494B00210C77 /* PI_Prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BAE0B70371A74B00C91783 /* PI_Prefix.h */; };
+		088CC8E5149A494B00210C77 /* PI_PrefixQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BAE0B70371A74B00C91783 /* PI_PrefixQuartz.h */; };
 		088CC8E6149A494B00210C77 /* picolist.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C040662464E009E5976 /* picolist.h */; };
 		088CC8E7149A494B00210C77 /* picontainergen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526BFA06624512009E5976 /* picontainergen.h */; };
@@ -40,5 +40,4 @@
 		088CC902149A494B00210C77 /* pilineatt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FC0D64604000583608 /* pilineatt.h */; };
 		088CC903149A494B00210C77 /* pifontgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14080D64605E00583608 /* pifontgen.h */; };
-		088CC904149A494B00210C77 /* strutilxx.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14110D64611D00583608 /* strutilxx.h */; };
 		088CC905149A494B00210C77 /* pibwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D170E7FB7EC001AE7EF /* pibwdggen.h */; };
 		088CC906149A494B00210C77 /* pidrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D190E7FB7EC001AE7EF /* pidrawer.h */; };
@@ -109,4 +108,234 @@
 		088CC994149A494C00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
 		088CC995149A494C00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
+		08A8CA3E1615E71800825DA7 /* xp1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14740D6463FA00583608 /* xp1.cc */; };
+		08A8CA401615E71800825DA7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		08A8CA411615E71800825DA7 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
+		08A8CAB21615E80600825DA7 /* lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA611615E80600825DA7 /* lut.h */; };
+		08A8CAB31615E80600825DA7 /* parradapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA621615E80600825DA7 /* parradapter.h */; };
+		08A8CAB41615E80600825DA7 /* pi3ddrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA631615E80600825DA7 /* pi3ddrw.h */; };
+		08A8CAB51615E80600825DA7 /* pi3dwdg.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA641615E80600825DA7 /* pi3dwdg.h */; };
+		08A8CAB61615E80600825DA7 /* piapplgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA651615E80600825DA7 /* piapplgen.h */; };
+		08A8CAB81615E80600825DA7 /* piaxes.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA671615E80600825DA7 /* piaxes.h */; };
+		08A8CAB91615E80600825DA7 /* piaxestools.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA681615E80600825DA7 /* piaxestools.h */; };
+		08A8CABA1615E80600825DA7 /* pibargraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA691615E80600825DA7 /* pibargraph.h */; };
+		08A8CABB1615E80600825DA7 /* pibwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6A1615E80600825DA7 /* pibwdggen.h */; };
+		08A8CABD1615E80600825DA7 /* picmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6C1615E80600825DA7 /* picmap.h */; };
+		08A8CABE1615E80600825DA7 /* picmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6D1615E80600825DA7 /* picmapgen.h */; };
+		08A8CABF1615E80600825DA7 /* picmapview.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6E1615E80600825DA7 /* picmapview.h */; };
+		08A8CAC11615E80600825DA7 /* picolist.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA701615E80600825DA7 /* picolist.h */; };
+		08A8CAC21615E80600825DA7 /* picons.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA711615E80600825DA7 /* picons.h */; };
+		08A8CAC31615E80600825DA7 /* piconsenum.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA721615E80600825DA7 /* piconsenum.h */; };
+		08A8CAC41615E80600825DA7 /* picontainergen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA731615E80600825DA7 /* picontainergen.h */; };
+		08A8CAC61615E80600825DA7 /* pidrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA751615E80600825DA7 /* pidrawer.h */; };
+		08A8CAC71615E80600825DA7 /* pidrawwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA761615E80600825DA7 /* pidrawwin.h */; };
+		08A8CAC81615E80600825DA7 /* pidrwtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA771615E80600825DA7 /* pidrwtools.h */; };
+		08A8CAC91615E80600825DA7 /* pieldrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA781615E80600825DA7 /* pieldrw.h */; };
+		08A8CACA1615E80600825DA7 /* pierrdisp.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA791615E80600825DA7 /* pierrdisp.h */; };
+		08A8CACB1615E80600825DA7 /* pievthandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7A1615E80600825DA7 /* pievthandler.h */; };
+		08A8CACC1615E80600825DA7 /* pifilechogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7B1615E80600825DA7 /* pifilechogen.h */; };
+		08A8CACD1615E80600825DA7 /* pifilechox.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7C1615E80600825DA7 /* pifilechox.h */; };
+		08A8CACE1615E80600825DA7 /* pifontgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7D1615E80600825DA7 /* pifontgen.h */; };
+		08A8CAD01615E80600825DA7 /* pigfname.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7F1615E80600825DA7 /* pigfname.h */; };
+		08A8CAD11615E80600825DA7 /* pigraph3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA801615E80600825DA7 /* pigraph3d.h */; };
+		08A8CAD21615E80600825DA7 /* pigraphgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA811615E80600825DA7 /* pigraphgen.h */; };
+		08A8CAD31615E80600825DA7 /* pigraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA821615E80600825DA7 /* pigraphics.h */; };
+		08A8CAD41615E80600825DA7 /* pigraphps.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA831615E80600825DA7 /* pigraphps.h */; };
+		08A8CAD51615E80600825DA7 /* pigraphuc.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA841615E80600825DA7 /* pigraphuc.h */; };
+		08A8CAD71615E80600825DA7 /* pigratt.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA861615E80600825DA7 /* pigratt.h */; };
+		08A8CAD81615E80600825DA7 /* pigrcoord.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA871615E80600825DA7 /* pigrcoord.h */; };
+		08A8CAD91615E80600825DA7 /* piimage.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA881615E80600825DA7 /* piimage.h */; };
+		08A8CADA1615E80600825DA7 /* piimgtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA891615E80600825DA7 /* piimgtools.h */; };
+		08A8CADB1615E80600825DA7 /* pilineatt.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8A1615E80600825DA7 /* pilineatt.h */; };
+		08A8CADC1615E80600825DA7 /* pilistgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8B1615E80600825DA7 /* pilistgen.h */; };
+		08A8CADD1615E80600825DA7 /* pilistx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8C1615E80600825DA7 /* pilistx.h */; };
+		08A8CADE1615E80600825DA7 /* pimenubargen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8D1615E80600825DA7 /* pimenubargen.h */; };
+		08A8CAE01615E80600825DA7 /* pimenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8F1615E80600825DA7 /* pimenugen.h */; };
+		08A8CAE21615E80600825DA7 /* pimsghandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA911615E80600825DA7 /* pimsghandler.h */; };
+		08A8CAE31615E80600825DA7 /* pioptmenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA921615E80600825DA7 /* pioptmenugen.h */; };
+		08A8CAE51615E80600825DA7 /* piperiodgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA941615E80600825DA7 /* piperiodgen.h */; };
+		08A8CAE71615E80600825DA7 /* pipixmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA961615E80600825DA7 /* pipixmapgen.h */; };
+		08A8CAE91615E80600825DA7 /* pipixutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA981615E80600825DA7 /* pipixutils.h */; };
+		08A8CAEA1615E80600825DA7 /* pipplist.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA991615E80600825DA7 /* pipplist.h */; };
+		08A8CAEB1615E80600825DA7 /* pippmenubar.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9A1615E80600825DA7 /* pippmenubar.h */; };
+		08A8CAEC1615E80600825DA7 /* pippoptmenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9B1615E80600825DA7 /* pippoptmenu.h */; };
+		08A8CAED1615E80600825DA7 /* pippviewadapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9C1615E80600825DA7 /* pippviewadapter.h */; };
+		08A8CAEE1615E80600825DA7 /* piscdrawwdg.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9D1615E80600825DA7 /* piscdrawwdg.h */; };
+		08A8CAEF1615E80600825DA7 /* pistdwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9E1615E80600825DA7 /* pistdwdggen.h */; };
+		08A8CAF11615E80600825DA7 /* pistzwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA01615E80600825DA7 /* pistzwin.h */; };
+		08A8CAF21615E80600825DA7 /* pisurfdr.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA11615E80600825DA7 /* pisurfdr.h */; };
+		08A8CAF31615E80600825DA7 /* pisysdep.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA21615E80600825DA7 /* pisysdep.h */; };
+		08A8CAF41615E80600825DA7 /* pitherm.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA31615E80600825DA7 /* pitherm.h */; };
+		08A8CAF51615E80600825DA7 /* pitxtdrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA41615E80600825DA7 /* pitxtdrw.h */; };
+		08A8CAF61615E80600825DA7 /* piup.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA51615E80600825DA7 /* piup.h */; };
+		08A8CAF71615E80600825DA7 /* piupdattachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA61615E80600825DA7 /* piupdattachment.h */; };
+		08A8CAF81615E80600825DA7 /* piversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA71615E80600825DA7 /* piversion.h */; };
+		08A8CAF91615E80600825DA7 /* piwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA81615E80600825DA7 /* piwdggen.h */; };
+		08A8CAFB1615E80600825DA7 /* piwindowgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAA1615E80600825DA7 /* piwindowgen.h */; };
+		08A8CAFD1615E80600825DA7 /* pixtbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAC1615E80600825DA7 /* pixtbase.h */; };
+		08A8CAFE1615E80600825DA7 /* pixtbaseP.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAD1615E80600825DA7 /* pixtbaseP.h */; };
+		08A8CAFF1615E80600825DA7 /* piyfxdrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAE1615E80600825DA7 /* piyfxdrw.h */; };
+		08A8CB001615E80600825DA7 /* psfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAF1615E80600825DA7 /* psfile.h */; };
+		08A8CB011615E80600825DA7 /* ucckprot.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAB01615E80600825DA7 /* ucckprot.h */; };
+		08A8CB021615E80600825DA7 /* xdispim.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAB11615E80600825DA7 /* xdispim.h */; };
+		08A8CBC11616142D00825DA7 /* pimsghandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C020662462C009E5976 /* pimsghandler.h */; };
+		08A8CBC31616142D00825DA7 /* picolist.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C040662464E009E5976 /* picolist.h */; };
+		08A8CBC41616142D00825DA7 /* picontainergen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526BFA06624512009E5976 /* picontainergen.h */; };
+		08A8CBC61616142D00825DA7 /* piwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C000662461A009E5976 /* piwdggen.h */; };
+		08A8CBC71616142D00825DA7 /* pievthandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C0A066246A9009E5976 /* pievthandler.h */; };
+		08A8CBCA1616142D00825DA7 /* piwindowgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E80663268E009E5976 /* piwindowgen.h */; };
+		08A8CBCB1616142D00825DA7 /* pimenubargen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77DE06632635009E5976 /* pimenubargen.h */; };
+		08A8CBCC1616142D00825DA7 /* pimenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E00663264C009E5976 /* pimenugen.h */; };
+		08A8CBCF1616142D00825DA7 /* piapplgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77DD06632616009E5976 /* piapplgen.h */; };
+		08A8CBD11616142D00825DA7 /* pistdwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E20663266A009E5976 /* pistdwdggen.h */; };
+		08A8CBD41616142D00825DA7 /* machdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12700D6446D500583608 /* machdefs.h */; };
+		08A8CBD51616142D00825DA7 /* sopnamsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12990D6448E500583608 /* sopnamsp.h */; };
+		08A8CBD61616142D00825DA7 /* pisysdep.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12AD0D644B2B00583608 /* pisysdep.h */; };
+		08A8CBDA1616142D00825DA7 /* picmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13AB0D645C3200583608 /* picmap.h */; };
+		08A8CBDB1616142D00825DA7 /* picmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13AF0D645C4D00583608 /* picmapgen.h */; };
+		08A8CBDC1616142D00825DA7 /* piconsenum.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13BF0D645E8B00583608 /* piconsenum.h */; };
+		08A8CBDD1616142D00825DA7 /* pigratt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13F80D64604000583608 /* pigratt.h */; };
+		08A8CBDE1616142D00825DA7 /* pigrcoord.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FA0D64604000583608 /* pigrcoord.h */; };
+		08A8CBDF1616142D00825DA7 /* pilineatt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FC0D64604000583608 /* pilineatt.h */; };
+		08A8CBE01616142D00825DA7 /* pifontgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14080D64605E00583608 /* pifontgen.h */; };
+		08A8CBE21616142D00825DA7 /* pibwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D170E7FB7EC001AE7EF /* pibwdggen.h */; };
+		08A8CBE31616142D00825DA7 /* pidrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D190E7FB7EC001AE7EF /* pidrawer.h */; };
+		08A8CBE41616142D00825DA7 /* piaxes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D1F0E7FB84E001AE7EF /* piaxes.h */; };
+		08A8CBE51616142D00825DA7 /* pigraphgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D200E7FB84E001AE7EF /* pigraphgen.h */; };
+		08A8CBE61616142D00825DA7 /* pigraphuc.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D220E7FB84E001AE7EF /* pigraphuc.h */; };
+		08A8CBE71616142D00825DA7 /* psfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D230E7FB84E001AE7EF /* psfile.h */; };
+		08A8CBE81616142D00825DA7 /* ucckprot.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D2A0E7FDF45001AE7EF /* ucckprot.h */; };
+		08A8CBE91616142D00825DA7 /* pioptmenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D4F0E7FED78001AE7EF /* pioptmenugen.h */; };
+		08A8CBEB1616142D00825DA7 /* pidrwtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18BF70E83E4FE00414227 /* pidrwtools.h */; };
+		08A8CBED1616142D00825DA7 /* pigraphps.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE8E8140E87BA6D0031A5D9 /* pigraphps.h */; };
+		08A8CBEF1616142D00825DA7 /* lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA611615E80600825DA7 /* lut.h */; };
+		08A8CBF01616142D00825DA7 /* parradapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA621615E80600825DA7 /* parradapter.h */; };
+		08A8CBF11616142D00825DA7 /* pi3ddrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA631615E80600825DA7 /* pi3ddrw.h */; };
+		08A8CBF21616142D00825DA7 /* pi3dwdg.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA641615E80600825DA7 /* pi3dwdg.h */; };
+		08A8CBF31616142D00825DA7 /* piapplgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA651615E80600825DA7 /* piapplgen.h */; };
+		08A8CBF41616142D00825DA7 /* piapplx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA661615E80600825DA7 /* piapplx.h */; };
+		08A8CBF51616142D00825DA7 /* piaxes.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA671615E80600825DA7 /* piaxes.h */; };
+		08A8CBF61616142D00825DA7 /* piaxestools.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA681615E80600825DA7 /* piaxestools.h */; };
+		08A8CBF71616142D00825DA7 /* pibargraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA691615E80600825DA7 /* pibargraph.h */; };
+		08A8CBF81616142D00825DA7 /* pibwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6A1615E80600825DA7 /* pibwdggen.h */; };
+		08A8CBF91616142D00825DA7 /* pibwdgx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6B1615E80600825DA7 /* pibwdgx.h */; };
+		08A8CBFA1616142D00825DA7 /* picmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6C1615E80600825DA7 /* picmap.h */; };
+		08A8CBFB1616142D00825DA7 /* picmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6D1615E80600825DA7 /* picmapgen.h */; };
+		08A8CBFC1616142D00825DA7 /* picmapview.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6E1615E80600825DA7 /* picmapview.h */; };
+		08A8CBFD1616142D00825DA7 /* picmapx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA6F1615E80600825DA7 /* picmapx.h */; };
+		08A8CBFE1616142D00825DA7 /* picolist.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA701615E80600825DA7 /* picolist.h */; };
+		08A8CBFF1616142D00825DA7 /* picons.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA711615E80600825DA7 /* picons.h */; };
+		08A8CC001616142D00825DA7 /* piconsenum.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA721615E80600825DA7 /* piconsenum.h */; };
+		08A8CC011616142D00825DA7 /* picontainergen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA731615E80600825DA7 /* picontainergen.h */; };
+		08A8CC021616142D00825DA7 /* picontainerx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA741615E80600825DA7 /* picontainerx.h */; };
+		08A8CC031616142D00825DA7 /* pidrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA751615E80600825DA7 /* pidrawer.h */; };
+		08A8CC041616142D00825DA7 /* pidrawwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA761615E80600825DA7 /* pidrawwin.h */; };
+		08A8CC051616142D00825DA7 /* pidrwtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA771615E80600825DA7 /* pidrwtools.h */; };
+		08A8CC061616142D00825DA7 /* pieldrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA781615E80600825DA7 /* pieldrw.h */; };
+		08A8CC071616142D00825DA7 /* pierrdisp.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA791615E80600825DA7 /* pierrdisp.h */; };
+		08A8CC081616142D00825DA7 /* pievthandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7A1615E80600825DA7 /* pievthandler.h */; };
+		08A8CC091616142D00825DA7 /* pifilechogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7B1615E80600825DA7 /* pifilechogen.h */; };
+		08A8CC0A1616142D00825DA7 /* pifilechox.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7C1615E80600825DA7 /* pifilechox.h */; };
+		08A8CC0B1616142D00825DA7 /* pifontgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7D1615E80600825DA7 /* pifontgen.h */; };
+		08A8CC0C1616142D00825DA7 /* pifontx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7E1615E80600825DA7 /* pifontx.h */; };
+		08A8CC0D1616142D00825DA7 /* pigfname.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA7F1615E80600825DA7 /* pigfname.h */; };
+		08A8CC0E1616142D00825DA7 /* pigraph3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA801615E80600825DA7 /* pigraph3d.h */; };
+		08A8CC0F1616142D00825DA7 /* pigraphgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA811615E80600825DA7 /* pigraphgen.h */; };
+		08A8CC101616142D00825DA7 /* pigraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA821615E80600825DA7 /* pigraphics.h */; };
+		08A8CC111616142D00825DA7 /* pigraphps.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA831615E80600825DA7 /* pigraphps.h */; };
+		08A8CC121616142D00825DA7 /* pigraphuc.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA841615E80600825DA7 /* pigraphuc.h */; };
+		08A8CC131616142D00825DA7 /* pigraphx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA851615E80600825DA7 /* pigraphx.h */; };
+		08A8CC141616142D00825DA7 /* pigratt.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA861615E80600825DA7 /* pigratt.h */; };
+		08A8CC151616142D00825DA7 /* pigrcoord.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA871615E80600825DA7 /* pigrcoord.h */; };
+		08A8CC161616142D00825DA7 /* piimage.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA881615E80600825DA7 /* piimage.h */; };
+		08A8CC171616142D00825DA7 /* piimgtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA891615E80600825DA7 /* piimgtools.h */; };
+		08A8CC181616142D00825DA7 /* pilineatt.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8A1615E80600825DA7 /* pilineatt.h */; };
+		08A8CC191616142D00825DA7 /* pilistgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8B1615E80600825DA7 /* pilistgen.h */; };
+		08A8CC1A1616142D00825DA7 /* pilistx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8C1615E80600825DA7 /* pilistx.h */; };
+		08A8CC1B1616142D00825DA7 /* pimenubargen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8D1615E80600825DA7 /* pimenubargen.h */; };
+		08A8CC1C1616142D00825DA7 /* pimenubarx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8E1615E80600825DA7 /* pimenubarx.h */; };
+		08A8CC1D1616142D00825DA7 /* pimenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA8F1615E80600825DA7 /* pimenugen.h */; };
+		08A8CC1E1616142D00825DA7 /* pimenux.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA901615E80600825DA7 /* pimenux.h */; };
+		08A8CC1F1616142D00825DA7 /* pimsghandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA911615E80600825DA7 /* pimsghandler.h */; };
+		08A8CC201616142D00825DA7 /* pioptmenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA921615E80600825DA7 /* pioptmenugen.h */; };
+		08A8CC211616142D00825DA7 /* pioptmenux.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA931615E80600825DA7 /* pioptmenux.h */; };
+		08A8CC221616142D00825DA7 /* piperiodgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA941615E80600825DA7 /* piperiodgen.h */; };
+		08A8CC231616142D00825DA7 /* piperiodx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA951615E80600825DA7 /* piperiodx.h */; };
+		08A8CC241616142D00825DA7 /* pipixmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA961615E80600825DA7 /* pipixmapgen.h */; };
+		08A8CC251616142D00825DA7 /* pipixmapx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA971615E80600825DA7 /* pipixmapx.h */; };
+		08A8CC261616142D00825DA7 /* pipixutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA981615E80600825DA7 /* pipixutils.h */; };
+		08A8CC271616142D00825DA7 /* pipplist.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA991615E80600825DA7 /* pipplist.h */; };
+		08A8CC281616142D00825DA7 /* pippmenubar.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9A1615E80600825DA7 /* pippmenubar.h */; };
+		08A8CC291616142D00825DA7 /* pippoptmenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9B1615E80600825DA7 /* pippoptmenu.h */; };
+		08A8CC2A1616142D00825DA7 /* pippviewadapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9C1615E80600825DA7 /* pippviewadapter.h */; };
+		08A8CC2B1616142D00825DA7 /* piscdrawwdg.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9D1615E80600825DA7 /* piscdrawwdg.h */; };
+		08A8CC2C1616142D00825DA7 /* pistdwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9E1615E80600825DA7 /* pistdwdggen.h */; };
+		08A8CC2D1616142D00825DA7 /* pistdwdgx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CA9F1615E80600825DA7 /* pistdwdgx.h */; };
+		08A8CC2E1616142D00825DA7 /* pistzwin.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA01615E80600825DA7 /* pistzwin.h */; };
+		08A8CC2F1616142D00825DA7 /* pisurfdr.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA11615E80600825DA7 /* pisurfdr.h */; };
+		08A8CC301616142D00825DA7 /* pisysdep.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA21615E80600825DA7 /* pisysdep.h */; };
+		08A8CC311616142D00825DA7 /* pitherm.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA31615E80600825DA7 /* pitherm.h */; };
+		08A8CC321616142D00825DA7 /* pitxtdrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA41615E80600825DA7 /* pitxtdrw.h */; };
+		08A8CC331616142D00825DA7 /* piup.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA51615E80600825DA7 /* piup.h */; };
+		08A8CC341616142D00825DA7 /* piupdattachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA61615E80600825DA7 /* piupdattachment.h */; };
+		08A8CC351616142D00825DA7 /* piversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA71615E80600825DA7 /* piversion.h */; };
+		08A8CC361616142D00825DA7 /* piwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA81615E80600825DA7 /* piwdggen.h */; };
+		08A8CC371616142D00825DA7 /* piwdgx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAA91615E80600825DA7 /* piwdgx.h */; };
+		08A8CC381616142D00825DA7 /* piwindowgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAA1615E80600825DA7 /* piwindowgen.h */; };
+		08A8CC391616142D00825DA7 /* piwindowx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAB1615E80600825DA7 /* piwindowx.h */; };
+		08A8CC3A1616142D00825DA7 /* pixtbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAC1615E80600825DA7 /* pixtbase.h */; };
+		08A8CC3B1616142D00825DA7 /* pixtbaseP.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAD1615E80600825DA7 /* pixtbaseP.h */; };
+		08A8CC3C1616142D00825DA7 /* piyfxdrw.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAE1615E80600825DA7 /* piyfxdrw.h */; };
+		08A8CC3D1616142D00825DA7 /* psfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAAF1615E80600825DA7 /* psfile.h */; };
+		08A8CC3E1616142D00825DA7 /* ucckprot.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAB01615E80600825DA7 /* ucckprot.h */; };
+		08A8CC3F1616142D00825DA7 /* xdispim.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CAB11615E80600825DA7 /* xdispim.h */; };
+		08A8CC411616142D00825DA7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
+		08A8CC431616142D00825DA7 /* pimsghandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D0E25030665D32C009E5976 /* pimsghandler.cc */; };
+		08A8CC441616142D00825DA7 /* picontainergen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526BF706624488009E5976 /* picontainergen.cc */; };
+		08A8CC461616142D00825DA7 /* piwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526C0606624678009E5976 /* piwdggen.cc */; };
+		08A8CC481616142D00825DA7 /* pievthandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526C0806624689009E5976 /* pievthandler.cc */; };
+		08A8CC4A1616142D00825DA7 /* piwindowgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E90663268E009E5976 /* piwindowgen.cc */; };
+		08A8CC4B1616142D00825DA7 /* pimenubargen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77DF0663263C009E5976 /* pimenubargen.cc */; };
+		08A8CC4C1616142D00825DA7 /* pimenugen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E10663264C009E5976 /* pimenugen.cc */; };
+		08A8CC4F1616142D00825DA7 /* piapplgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77DC0663260E009E5976 /* piapplgen.cc */; };
+		08A8CC511616142D00825DA7 /* pistdwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E30663266A009E5976 /* pistdwdggen.cc */; };
+		08A8CC571616142D00825DA7 /* picmap.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13AD0D645C4D00583608 /* picmap.cc */; };
+		08A8CC581616142D00825DA7 /* picmapgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13AE0D645C4D00583608 /* picmapgen.cc */; };
+		08A8CC591616142D00825DA7 /* pigraphgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F60D64604000583608 /* pigraphgen.cc */; };
+		08A8CC5A1616142D00825DA7 /* pigratt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F70D64604000583608 /* pigratt.cc */; };
+		08A8CC5B1616142D00825DA7 /* pigrcoord.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F90D64604000583608 /* pigrcoord.cc */; };
+		08A8CC5C1616142D00825DA7 /* pilineatt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13FB0D64604000583608 /* pilineatt.cc */; };
+		08A8CC5D1616142D00825DA7 /* psfile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13FD0D64604000583608 /* psfile.cc */; };
+		08A8CC5E1616142D00825DA7 /* pifontgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14070D64605E00583608 /* pifontgen.cc */; };
+		08A8CC5F1616142D00825DA7 /* strutilxx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14100D64611D00583608 /* strutilxx.cc */; };
+		08A8CC601616142D00825DA7 /* pibwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D160E7FB7EC001AE7EF /* pibwdggen.cc */; };
+		08A8CC611616142D00825DA7 /* pidrawer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D180E7FB7EC001AE7EF /* pidrawer.cc */; };
+		08A8CC621616142D00825DA7 /* piaxes.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D1E0E7FB84E001AE7EF /* piaxes.cc */; };
+		08A8CC631616142D00825DA7 /* pigraphuc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D210E7FB84E001AE7EF /* pigraphuc.cc */; };
+		08A8CC641616142D00825DA7 /* pioptmenugen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D4E0E7FED78001AE7EF /* pioptmenugen.cc */; };
+		08A8CC661616142D00825DA7 /* pidrwtools.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18BF60E83E4FE00414227 /* pidrwtools.cc */; };
+		08A8CC681616142D00825DA7 /* pigraphps.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE8E8130E87BA6D0031A5D9 /* pigraphps.cc */; };
+		08A8CC6A1616142D00825DA7 /* xdispim.c in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CB031615E81B00825DA7 /* xdispim.c */; };
+		08A8CC6C1616142D00825DA7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		08A8CC6D1616142D00825DA7 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DF7756C0CC3A8DA00D784C9 /* CoreFoundation.framework */; };
+		08A8CD27161C686100825DA7 /* pexceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CD26161C686100825DA7 /* pexceptions.h */; };
+		08A8CD28161C686100825DA7 /* pexceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CD26161C686100825DA7 /* pexceptions.h */; };
+		08A8CD2A161C686E00825DA7 /* pexceptions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD29161C686E00825DA7 /* pexceptions.cc */; };
+		08A8CD2F161C68E600825DA7 /* pimenux.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD2E161C68E600825DA7 /* pimenux.cc */; };
+		08A8CD33161C690800825DA7 /* picontainerx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD32161C690800825DA7 /* picontainerx.cc */; };
+		08A8CD38161C694C00825DA7 /* piwdgx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD36161C694C00825DA7 /* piwdgx.cc */; };
+		08A8CD39161C694C00825DA7 /* piwindowx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD37161C694C00825DA7 /* piwindowx.cc */; };
+		08A8CD45161C6A7000825DA7 /* pifontx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD44161C6A7000825DA7 /* pifontx.cc */; };
+		08A8CD49161C6AB500825DA7 /* picmapx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD48161C6AB500825DA7 /* picmapx.cc */; };
+		08A8CD5E161C6C0900825DA7 /* pistdwdgx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD5D161C6C0900825DA7 /* pistdwdgx.cc */; };
+		08A8CD65161C6CE700825DA7 /* pigraphx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD64161C6CE700825DA7 /* pigraphx.cc */; };
+		08A8CD69161C6FD900825DA7 /* pioptmenux.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD68161C6FD900825DA7 /* pioptmenux.cc */; };
+		08A8CD7D161C772E00825DA7 /* piapplx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD7C161C772E00825DA7 /* piapplx.cc */; };
+		08A8CD81161C774200825DA7 /* pimenubarx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD80161C774200825DA7 /* pimenubarx.cc */; };
+		08A8CD85161C776B00825DA7 /* picons.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD84161C776B00825DA7 /* picons.cc */; };
+		08A8CD89161C778100825DA7 /* pibwdgx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD88161C778100825DA7 /* pibwdgx.cc */; };
+		08A8CD9A161C78A500825DA7 /* picons.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CD84161C776B00825DA7 /* picons.cc */; };
+		08A8CE33161C8C1F00825DA7 /* pixtbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CE32161C8C1F00825DA7 /* pixtbase.h */; };
+		08A8CE36161C8C2600825DA7 /* pixtbase.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08A8CE35161C8C2600825DA7 /* pixtbase.cc */; };
+		08A8CE69161C924E00825DA7 /* strutilxx.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A8CE68161C924E00825DA7 /* strutilxx.h */; };
 /* End PBXBuildFile section */
 
@@ -124,12 +353,118 @@
 		088CC98F149A494B00210C77 /* BaoAdc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BaoAdc.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		08A8C9AD1614A65D00825DA7 /* XP1-2-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "XP1-2-Info.plist"; sourceTree = "<group>"; };
+		08A8C9C31614A67E00825DA7 /* Info-XP0__Upgraded_ copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-XP0__Upgraded_ copy.plist"; sourceTree = "<group>"; };
+		08A8CA471615E71800825DA7 /* XP1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XP1.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		08A8CA491615E71800825DA7 /* Info-XP1__Upgraded_ copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-XP1__Upgraded_ copy.plist"; sourceTree = "<group>"; };
+		08A8CA611615E80600825DA7 /* lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lut.h; path = ../lut.h; sourceTree = SOURCE_ROOT; };
+		08A8CA621615E80600825DA7 /* parradapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = parradapter.h; path = ../parradapter.h; sourceTree = SOURCE_ROOT; };
+		08A8CA631615E80600825DA7 /* pi3ddrw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pi3ddrw.h; path = ../pi3ddrw.h; sourceTree = SOURCE_ROOT; };
+		08A8CA641615E80600825DA7 /* pi3dwdg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pi3dwdg.h; path = ../pi3dwdg.h; sourceTree = SOURCE_ROOT; };
+		08A8CA651615E80600825DA7 /* piapplgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piapplgen.h; path = ../piapplgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA661615E80600825DA7 /* piapplx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piapplx.h; path = ../piapplx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA671615E80600825DA7 /* piaxes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piaxes.h; path = ../piaxes.h; sourceTree = SOURCE_ROOT; };
+		08A8CA681615E80600825DA7 /* piaxestools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piaxestools.h; path = ../piaxestools.h; sourceTree = SOURCE_ROOT; };
+		08A8CA691615E80600825DA7 /* pibargraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pibargraph.h; path = ../pibargraph.h; sourceTree = SOURCE_ROOT; };
+		08A8CA6A1615E80600825DA7 /* pibwdggen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pibwdggen.h; path = ../pibwdggen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA6B1615E80600825DA7 /* pibwdgx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pibwdgx.h; path = ../pibwdgx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA6C1615E80600825DA7 /* picmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picmap.h; path = ../picmap.h; sourceTree = SOURCE_ROOT; };
+		08A8CA6D1615E80600825DA7 /* picmapgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picmapgen.h; path = ../picmapgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA6E1615E80600825DA7 /* picmapview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picmapview.h; path = ../picmapview.h; sourceTree = SOURCE_ROOT; };
+		08A8CA6F1615E80600825DA7 /* picmapx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picmapx.h; path = ../picmapx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA701615E80600825DA7 /* picolist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picolist.h; path = ../picolist.h; sourceTree = SOURCE_ROOT; };
+		08A8CA711615E80600825DA7 /* picons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picons.h; path = ../picons.h; sourceTree = SOURCE_ROOT; };
+		08A8CA721615E80600825DA7 /* piconsenum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piconsenum.h; path = ../piconsenum.h; sourceTree = SOURCE_ROOT; };
+		08A8CA731615E80600825DA7 /* picontainergen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picontainergen.h; path = ../picontainergen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA741615E80600825DA7 /* picontainerx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = picontainerx.h; path = ../picontainerx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA751615E80600825DA7 /* pidrawer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pidrawer.h; path = ../pidrawer.h; sourceTree = SOURCE_ROOT; };
+		08A8CA761615E80600825DA7 /* pidrawwin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pidrawwin.h; path = ../pidrawwin.h; sourceTree = SOURCE_ROOT; };
+		08A8CA771615E80600825DA7 /* pidrwtools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pidrwtools.h; path = ../pidrwtools.h; sourceTree = SOURCE_ROOT; };
+		08A8CA781615E80600825DA7 /* pieldrw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pieldrw.h; path = ../pieldrw.h; sourceTree = SOURCE_ROOT; };
+		08A8CA791615E80600825DA7 /* pierrdisp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pierrdisp.h; path = ../pierrdisp.h; sourceTree = SOURCE_ROOT; };
+		08A8CA7A1615E80600825DA7 /* pievthandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pievthandler.h; path = ../pievthandler.h; sourceTree = SOURCE_ROOT; };
+		08A8CA7B1615E80600825DA7 /* pifilechogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pifilechogen.h; path = ../pifilechogen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA7C1615E80600825DA7 /* pifilechox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pifilechox.h; path = ../pifilechox.h; sourceTree = SOURCE_ROOT; };
+		08A8CA7D1615E80600825DA7 /* pifontgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pifontgen.h; path = ../pifontgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA7E1615E80600825DA7 /* pifontx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pifontx.h; path = ../pifontx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA7F1615E80600825DA7 /* pigfname.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigfname.h; path = ../pigfname.h; sourceTree = SOURCE_ROOT; };
+		08A8CA801615E80600825DA7 /* pigraph3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigraph3d.h; path = ../pigraph3d.h; sourceTree = SOURCE_ROOT; };
+		08A8CA811615E80600825DA7 /* pigraphgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigraphgen.h; path = ../pigraphgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA821615E80600825DA7 /* pigraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigraphics.h; path = ../pigraphics.h; sourceTree = SOURCE_ROOT; };
+		08A8CA831615E80600825DA7 /* pigraphps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigraphps.h; path = ../pigraphps.h; sourceTree = SOURCE_ROOT; };
+		08A8CA841615E80600825DA7 /* pigraphuc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigraphuc.h; path = ../pigraphuc.h; sourceTree = SOURCE_ROOT; };
+		08A8CA851615E80600825DA7 /* pigraphx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigraphx.h; path = ../pigraphx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA861615E80600825DA7 /* pigratt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigratt.h; path = ../pigratt.h; sourceTree = SOURCE_ROOT; };
+		08A8CA871615E80600825DA7 /* pigrcoord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pigrcoord.h; path = ../pigrcoord.h; sourceTree = SOURCE_ROOT; };
+		08A8CA881615E80600825DA7 /* piimage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piimage.h; path = ../piimage.h; sourceTree = SOURCE_ROOT; };
+		08A8CA891615E80600825DA7 /* piimgtools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piimgtools.h; path = ../piimgtools.h; sourceTree = SOURCE_ROOT; };
+		08A8CA8A1615E80600825DA7 /* pilineatt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pilineatt.h; path = ../pilineatt.h; sourceTree = SOURCE_ROOT; };
+		08A8CA8B1615E80600825DA7 /* pilistgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pilistgen.h; path = ../pilistgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA8C1615E80600825DA7 /* pilistx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pilistx.h; path = ../pilistx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA8D1615E80600825DA7 /* pimenubargen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pimenubargen.h; path = ../pimenubargen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA8E1615E80600825DA7 /* pimenubarx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pimenubarx.h; path = ../pimenubarx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA8F1615E80600825DA7 /* pimenugen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pimenugen.h; path = ../pimenugen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA901615E80600825DA7 /* pimenux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pimenux.h; path = ../pimenux.h; sourceTree = SOURCE_ROOT; };
+		08A8CA911615E80600825DA7 /* pimsghandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pimsghandler.h; path = ../pimsghandler.h; sourceTree = SOURCE_ROOT; };
+		08A8CA921615E80600825DA7 /* pioptmenugen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pioptmenugen.h; path = ../pioptmenugen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA931615E80600825DA7 /* pioptmenux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pioptmenux.h; path = ../pioptmenux.h; sourceTree = SOURCE_ROOT; };
+		08A8CA941615E80600825DA7 /* piperiodgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piperiodgen.h; path = ../piperiodgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA951615E80600825DA7 /* piperiodx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piperiodx.h; path = ../piperiodx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA961615E80600825DA7 /* pipixmapgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pipixmapgen.h; path = ../pipixmapgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA971615E80600825DA7 /* pipixmapx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pipixmapx.h; path = ../pipixmapx.h; sourceTree = SOURCE_ROOT; };
+		08A8CA981615E80600825DA7 /* pipixutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pipixutils.h; path = ../pipixutils.h; sourceTree = SOURCE_ROOT; };
+		08A8CA991615E80600825DA7 /* pipplist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pipplist.h; path = ../pipplist.h; sourceTree = SOURCE_ROOT; };
+		08A8CA9A1615E80600825DA7 /* pippmenubar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pippmenubar.h; path = ../pippmenubar.h; sourceTree = SOURCE_ROOT; };
+		08A8CA9B1615E80600825DA7 /* pippoptmenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pippoptmenu.h; path = ../pippoptmenu.h; sourceTree = SOURCE_ROOT; };
+		08A8CA9C1615E80600825DA7 /* pippviewadapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pippviewadapter.h; path = ../pippviewadapter.h; sourceTree = SOURCE_ROOT; };
+		08A8CA9D1615E80600825DA7 /* piscdrawwdg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piscdrawwdg.h; path = ../piscdrawwdg.h; sourceTree = SOURCE_ROOT; };
+		08A8CA9E1615E80600825DA7 /* pistdwdggen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pistdwdggen.h; path = ../pistdwdggen.h; sourceTree = SOURCE_ROOT; };
+		08A8CA9F1615E80600825DA7 /* pistdwdgx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pistdwdgx.h; path = ../pistdwdgx.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA01615E80600825DA7 /* pistzwin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pistzwin.h; path = ../pistzwin.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA11615E80600825DA7 /* pisurfdr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pisurfdr.h; path = ../pisurfdr.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA21615E80600825DA7 /* pisysdep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pisysdep.h; path = ../pisysdep.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA31615E80600825DA7 /* pitherm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pitherm.h; path = ../pitherm.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA41615E80600825DA7 /* pitxtdrw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pitxtdrw.h; path = ../pitxtdrw.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA51615E80600825DA7 /* piup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piup.h; path = ../piup.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA61615E80600825DA7 /* piupdattachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piupdattachment.h; path = ../piupdattachment.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA71615E80600825DA7 /* piversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piversion.h; path = ../piversion.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA81615E80600825DA7 /* piwdggen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piwdggen.h; path = ../piwdggen.h; sourceTree = SOURCE_ROOT; };
+		08A8CAA91615E80600825DA7 /* piwdgx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piwdgx.h; path = ../piwdgx.h; sourceTree = SOURCE_ROOT; };
+		08A8CAAA1615E80600825DA7 /* piwindowgen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piwindowgen.h; path = ../piwindowgen.h; sourceTree = SOURCE_ROOT; };
+		08A8CAAB1615E80600825DA7 /* piwindowx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piwindowx.h; path = ../piwindowx.h; sourceTree = SOURCE_ROOT; };
+		08A8CAAC1615E80600825DA7 /* pixtbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pixtbase.h; path = ../pixtbase.h; sourceTree = SOURCE_ROOT; };
+		08A8CAAD1615E80600825DA7 /* pixtbaseP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pixtbaseP.h; path = ../pixtbaseP.h; sourceTree = SOURCE_ROOT; };
+		08A8CAAE1615E80600825DA7 /* piyfxdrw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piyfxdrw.h; path = ../piyfxdrw.h; sourceTree = SOURCE_ROOT; };
+		08A8CAAF1615E80600825DA7 /* psfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psfile.h; path = ../psfile.h; sourceTree = SOURCE_ROOT; };
+		08A8CAB01615E80600825DA7 /* ucckprot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ucckprot.h; path = ../ucckprot.h; sourceTree = SOURCE_ROOT; };
+		08A8CAB11615E80600825DA7 /* xdispim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xdispim.h; path = ../xdispim.h; sourceTree = SOURCE_ROOT; };
+		08A8CB031615E81B00825DA7 /* xdispim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xdispim.c; path = ../xdispim.c; sourceTree = SOURCE_ROOT; };
+		08A8CC731616142D00825DA7 /* PI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		08A8CC751616142D00825DA7 /* Info-PI__Upgraded_ copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-PI__Upgraded_ copy.plist"; sourceTree = "<group>"; };
+		08A8CD26161C686100825DA7 /* pexceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pexceptions.h; path = ../../../SophyaLib/BaseTools/pexceptions.h; sourceTree = SOURCE_ROOT; };
+		08A8CD29161C686E00825DA7 /* pexceptions.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pexceptions.cc; path = ../../../SophyaLib/BaseTools/pexceptions.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD2E161C68E600825DA7 /* pimenux.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pimenux.cc; path = ../pimenux.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD32161C690800825DA7 /* picontainerx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = picontainerx.cc; path = ../picontainerx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD36161C694C00825DA7 /* piwdgx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = piwdgx.cc; path = ../piwdgx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD37161C694C00825DA7 /* piwindowx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = piwindowx.cc; path = ../piwindowx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD44161C6A7000825DA7 /* pifontx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pifontx.cc; path = ../pifontx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD48161C6AB500825DA7 /* picmapx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = picmapx.cc; path = ../picmapx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD5D161C6C0900825DA7 /* pistdwdgx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pistdwdgx.cc; path = ../pistdwdgx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD64161C6CE700825DA7 /* pigraphx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pigraphx.cc; path = ../pigraphx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD68161C6FD900825DA7 /* pioptmenux.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pioptmenux.cc; path = ../pioptmenux.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD7C161C772E00825DA7 /* piapplx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = piapplx.cc; path = ../piapplx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD80161C774200825DA7 /* pimenubarx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pimenubarx.cc; path = ../pimenubarx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD84161C776B00825DA7 /* picons.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = picons.cc; path = ../picons.cc; sourceTree = SOURCE_ROOT; };
+		08A8CD88161C778100825DA7 /* pibwdgx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pibwdgx.cc; path = ../pibwdgx.cc; sourceTree = SOURCE_ROOT; };
+		08A8CE32161C8C1F00825DA7 /* pixtbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pixtbase.h; path = ../pixtbase.h; sourceTree = SOURCE_ROOT; };
+		08A8CE35161C8C2600825DA7 /* pixtbase.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pixtbase.cc; path = ../pixtbase.cc; sourceTree = SOURCE_ROOT; };
+		08A8CE68161C924E00825DA7 /* strutilxx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strutilxx.h; path = ../../../SophyaLib/SUtils/strutilxx.h; sourceTree = SOURCE_ROOT; };
 		08FB77AAFE841565C02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		32BAE0B70371A74B00C91783 /* PI_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PI_Prefix.h; sourceTree = SOURCE_ROOT; };
+		32BAE0B70371A74B00C91783 /* PI_PrefixQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PI_PrefixQuartz.h; sourceTree = "<group>"; };
 		6D0E25030665D32C009E5976 /* pimsghandler.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pimsghandler.cc; path = ../pimsghandler.cc; sourceTree = SOURCE_ROOT; };
 		6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = QuartzAppTest.cpp; sourceTree = SOURCE_ROOT; };
 		6D189BFE0619C1F5009E5976 /* piwdgquartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = piwdgquartz.h; sourceTree = "<group>"; };
 		6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = piwdgquartz.cpp; sourceTree = "<group>"; };
-		6D41F30A064771A8009E5976 /* PIContainerQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIContainerQuartz.h; sourceTree = SOURCE_ROOT; };
-		6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIContainerQuartz.cpp; sourceTree = SOURCE_ROOT; };
+		6D41F30A064771A8009E5976 /* PIContainerQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIContainerQuartz.h; sourceTree = "<group>"; };
+		6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIContainerQuartz.cpp; sourceTree = "<group>"; };
 		6D526BF706624488009E5976 /* picontainergen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = picontainergen.cc; path = ../picontainergen.cc; sourceTree = SOURCE_ROOT; };
 		6D526BFA06624512009E5976 /* picontainergen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = picontainergen.h; path = ../picontainergen.h; sourceTree = SOURCE_ROOT; };
@@ -165,13 +500,12 @@
 		6D6F14070D64605E00583608 /* pifontgen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pifontgen.cc; path = ../pifontgen.cc; sourceTree = SOURCE_ROOT; };
 		6D6F14080D64605E00583608 /* pifontgen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pifontgen.h; path = ../pifontgen.h; sourceTree = SOURCE_ROOT; };
-		6D6F14100D64611D00583608 /* strutilxx.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = strutilxx.cc; path = ../../SophyaLib/SUtils/strutilxx.cc; sourceTree = SOURCE_ROOT; };
-		6D6F14110D64611D00583608 /* strutilxx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = strutilxx.h; path = ../../SophyaLib/SUtils/strutilxx.h; sourceTree = SOURCE_ROOT; };
-		6D6F14740D6463FA00583608 /* xp1.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xp1.cc; path = ../../Tests/xp1.cc; sourceTree = SOURCE_ROOT; };
-		6D7D4E500667277A009E5976 /* PIMenuBarQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIMenuBarQuartz.h; sourceTree = SOURCE_ROOT; };
-		6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIMenuBarQuartz.cpp; sourceTree = SOURCE_ROOT; };
-		6D7D4E5506673450009E5976 /* PIMenuQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIMenuQuartz.h; sourceTree = SOURCE_ROOT; };
-		6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIMenuQuartz.cpp; sourceTree = SOURCE_ROOT; };
-		6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIWindowQuartz.h; sourceTree = SOURCE_ROOT; };
-		6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIWindowQuartz.cpp; sourceTree = SOURCE_ROOT; };
+		6D6F14100D64611D00583608 /* strutilxx.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = strutilxx.cc; path = ../../../SophyaLib/SUtils/strutilxx.cc; sourceTree = SOURCE_ROOT; };
+		6D6F14740D6463FA00583608 /* xp1.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xp1.cc; path = ../Tests/xp1.cc; sourceTree = SOURCE_ROOT; };
+		6D7D4E500667277A009E5976 /* PIMenuBarQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIMenuBarQuartz.h; sourceTree = "<group>"; };
+		6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIMenuBarQuartz.cpp; sourceTree = "<group>"; };
+		6D7D4E5506673450009E5976 /* PIMenuQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIMenuQuartz.h; sourceTree = "<group>"; };
+		6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIMenuQuartz.cpp; sourceTree = "<group>"; };
+		6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIWindowQuartz.h; sourceTree = "<group>"; };
+		6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIWindowQuartz.cpp; sourceTree = "<group>"; };
 		6DC3740A070405C7009E5976 /* todo.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = todo.txt; sourceTree = "<group>"; };
 		6DD04EE3113D3FCB00B55104 /* pieventquartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pieventquartz.h; sourceTree = "<group>"; };
@@ -216,6 +550,6 @@
 		6DF26D4F0E7FED78001AE7EF /* pioptmenugen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pioptmenugen.h; path = ../pioptmenugen.h; sourceTree = SOURCE_ROOT; };
 		6DF7756C0CC3A8DA00D784C9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		6DFD5AD406774017009E5976 /* PIApplQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIApplQuartz.h; sourceTree = SOURCE_ROOT; };
-		6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIApplQuartz.cpp; sourceTree = SOURCE_ROOT; };
+		6DFD5AD406774017009E5976 /* PIApplQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIApplQuartz.h; sourceTree = "<group>"; };
+		6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIApplQuartz.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -271,4 +605,22 @@
 			files = (
 				088CC995149A494C00210C77 /* PI.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CA3F1615E71800825DA7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				08A8CA401615E71800825DA7 /* Carbon.framework in Frameworks */,
+				08A8CA411615E71800825DA7 /* PI.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CC6B1616142D00825DA7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				08A8CC6C1616142D00825DA7 /* Carbon.framework in Frameworks */,
+				08A8CC6D1616142D00825DA7 /* CoreFoundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -286,4 +638,6 @@
 				088CC984149A494B00210C77 /* PIT0.app */,
 				088CC98F149A494B00210C77 /* BaoAdc.app */,
+				08A8CA471615E71800825DA7 /* XP1.app */,
+				08A8CC731616142D00825DA7 /* PI.framework */,
 			);
 			name = Products;
@@ -308,4 +662,8 @@
 				088CC973149A494B00210C77 /* Info-XP1__Upgraded_.plist */,
 				088CC983149A494B00210C77 /* Info-PIT0__Upgraded_.plist */,
+				08A8C9AD1614A65D00825DA7 /* XP1-2-Info.plist */,
+				08A8C9C31614A67E00825DA7 /* Info-XP0__Upgraded_ copy.plist */,
+				08A8CA491615E71800825DA7 /* Info-XP1__Upgraded_ copy.plist */,
+				08A8CC751616142D00825DA7 /* Info-PI__Upgraded_ copy.plist */,
 			);
 			name = PI;
@@ -329,8 +687,112 @@
 			sourceTree = "<group>";
 		};
+		08A8CD8C161C786300825DA7 /* Quartz */ = {
+			isa = PBXGroup;
+			children = (
+				6D6F137F0D6458E200583608 /* pigraphquartz.cpp */,
+				6D6F134D0D64572500583608 /* picmapquartz.cpp */,
+				6D6F13300D64550C00583608 /* pifontquartz.cpp */,
+				6DF012F50CBF6A510026E580 /* PIPeriodQuartz.cpp */,
+				6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */,
+				6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */,
+				6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */,
+				6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */,
+				6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */,
+				6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */,
+				6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */,
+				6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */,
+				6DE18C190E83E91700414227 /* pibwdgquartz.cpp */,
+				6DD04EE4113D3FCB00B55104 /* pieventquartz.cpp */,
+			);
+			name = Quartz;
+			sourceTree = "<group>";
+		};
+		08A8CD8D161C786C00825DA7 /* X */ = {
+			isa = PBXGroup;
+			children = (
+				08A8CD7C161C772E00825DA7 /* piapplx.cc */,
+				08A8CD88161C778100825DA7 /* pibwdgx.cc */,
+				08A8CD80161C774200825DA7 /* pimenubarx.cc */,
+				08A8CD5D161C6C0900825DA7 /* pistdwdgx.cc */,
+				08A8CD64161C6CE700825DA7 /* pigraphx.cc */,
+				08A8CD44161C6A7000825DA7 /* pifontx.cc */,
+				08A8CD68161C6FD900825DA7 /* pioptmenux.cc */,
+				08A8CE35161C8C2600825DA7 /* pixtbase.cc */,
+				08A8CD48161C6AB500825DA7 /* picmapx.cc */,
+				08A8CD29161C686E00825DA7 /* pexceptions.cc */,
+				08A8CD36161C694C00825DA7 /* piwdgx.cc */,
+				08A8CD37161C694C00825DA7 /* piwindowx.cc */,
+				08A8CD2E161C68E600825DA7 /* pimenux.cc */,
+				08A8CD32161C690800825DA7 /* picontainerx.cc */,
+				08A8CB031615E81B00825DA7 /* xdispim.c */,
+			);
+			name = X;
+			sourceTree = "<group>";
+		};
+		08A8CD9B161C78AB00825DA7 /* Quartz */ = {
+			isa = PBXGroup;
+			children = (
+				6DD04EE3113D3FCB00B55104 /* pieventquartz.h */,
+				6DE18C180E83E91700414227 /* pibwdgquartz.h */,
+				6DE18B840E837AD800414227 /* pioptmenuquartz.h */,
+				6D6F12F30D644DA100583608 /* pigraphquartz.h */,
+				6D6F134F0D64573200583608 /* picmapquartz.h */,
+				6D6F132E0D6454DD00583608 /* pifontquartz.h */,
+				6DFD5AD406774017009E5976 /* PIApplQuartz.h */,
+				6D7D4E5506673450009E5976 /* PIMenuQuartz.h */,
+				6D7D4E500667277A009E5976 /* PIMenuBarQuartz.h */,
+				6D41F30A064771A8009E5976 /* PIContainerQuartz.h */,
+				6DF012F40CBF6A510026E580 /* PIPeriodQuartz.h */,
+				6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */,
+				6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */,
+				6D189BFE0619C1F5009E5976 /* piwdgquartz.h */,
+			);
+			name = Quartz;
+			sourceTree = "<group>";
+		};
+		08A8CD9C161C78B000825DA7 /* X */ = {
+			isa = PBXGroup;
+			children = (
+				08A8CA661615E80600825DA7 /* piapplx.h */,
+				08A8CE32161C8C1F00825DA7 /* pixtbase.h */,
+				08A8CA6B1615E80600825DA7 /* pibwdgx.h */,
+				08A8CA6F1615E80600825DA7 /* picmapx.h */,
+				08A8CA741615E80600825DA7 /* picontainerx.h */,
+				08A8CA7E1615E80600825DA7 /* pifontx.h */,
+				08A8CA851615E80600825DA7 /* pigraphx.h */,
+				08A8CA8E1615E80600825DA7 /* pimenubarx.h */,
+				08A8CA901615E80600825DA7 /* pimenux.h */,
+				08A8CA931615E80600825DA7 /* pioptmenux.h */,
+				08A8CA951615E80600825DA7 /* piperiodx.h */,
+				08A8CA971615E80600825DA7 /* pipixmapx.h */,
+				08A8CA9F1615E80600825DA7 /* pistdwdgx.h */,
+				08A8CAA91615E80600825DA7 /* piwdgx.h */,
+				08A8CAAB1615E80600825DA7 /* piwindowx.h */,
+			);
+			name = X;
+			sourceTree = "<group>";
+		};
+		08A8CD9E161C793C00825DA7 /* Quartz */ = {
+			isa = PBXGroup;
+			children = (
+				32BAE0B70371A74B00C91783 /* PI_PrefixQuartz.h */,
+			);
+			name = Quartz;
+			sourceTree = "<group>";
+		};
+		08A8CD9F161C794700825DA7 /* X */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = X;
+			sourceTree = "<group>";
+		};
 		6D078000061854AA009E5976 /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				08A8CD9F161C794700825DA7 /* X */,
+				08A8CD9E161C793C00825DA7 /* Quartz */,
 				6DE8E8130E87BA6D0031A5D9 /* pigraphps.cc */,
+				6D6F14100D64611D00583608 /* strutilxx.cc */,
 				6DE8E8140E87BA6D0031A5D9 /* pigraphps.h */,
 				6DE18BF60E83E4FE00414227 /* pidrwtools.cc */,
@@ -349,6 +811,5 @@
 				6DF26D180E7FB7EC001AE7EF /* pidrawer.cc */,
 				6DF26D190E7FB7EC001AE7EF /* pidrawer.h */,
-				6D6F14100D64611D00583608 /* strutilxx.cc */,
-				6D6F14110D64611D00583608 /* strutilxx.h */,
+				08A8CE68161C924E00825DA7 /* strutilxx.h */,
 				6D6F14070D64605E00583608 /* pifontgen.cc */,
 				6D6F14080D64605E00583608 /* pifontgen.h */,
@@ -369,5 +830,4 @@
 				6D6F12990D6448E500583608 /* sopnamsp.h */,
 				6D6F12700D6446D500583608 /* machdefs.h */,
-				32BAE0B70371A74B00C91783 /* PI_Prefix.h */,
 				6D526C040662464E009E5976 /* picolist.h */,
 				6D526C000662461A009E5976 /* piwdggen.h */,
@@ -407,18 +867,74 @@
 			isa = PBXGroup;
 			children = (
-				6DD04EE3113D3FCB00B55104 /* pieventquartz.h */,
-				6DE18C180E83E91700414227 /* pibwdgquartz.h */,
-				6DE18B840E837AD800414227 /* pioptmenuquartz.h */,
-				6D6F12F30D644DA100583608 /* pigraphquartz.h */,
-				6D6F134F0D64573200583608 /* picmapquartz.h */,
-				6D6F132E0D6454DD00583608 /* pifontquartz.h */,
-				6DFD5AD406774017009E5976 /* PIApplQuartz.h */,
-				6D7D4E5506673450009E5976 /* PIMenuQuartz.h */,
-				6D7D4E500667277A009E5976 /* PIMenuBarQuartz.h */,
-				6D41F30A064771A8009E5976 /* PIContainerQuartz.h */,
-				6DF012F40CBF6A510026E580 /* PIPeriodQuartz.h */,
-				6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */,
-				6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */,
-				6D189BFE0619C1F5009E5976 /* piwdgquartz.h */,
+				08A8CD9C161C78B000825DA7 /* X */,
+				08A8CD9B161C78AB00825DA7 /* Quartz */,
+				08A8CD26161C686100825DA7 /* pexceptions.h */,
+				08A8CA611615E80600825DA7 /* lut.h */,
+				08A8CA621615E80600825DA7 /* parradapter.h */,
+				08A8CA631615E80600825DA7 /* pi3ddrw.h */,
+				08A8CA641615E80600825DA7 /* pi3dwdg.h */,
+				08A8CA651615E80600825DA7 /* piapplgen.h */,
+				08A8CA671615E80600825DA7 /* piaxes.h */,
+				08A8CA681615E80600825DA7 /* piaxestools.h */,
+				08A8CA691615E80600825DA7 /* pibargraph.h */,
+				08A8CA6A1615E80600825DA7 /* pibwdggen.h */,
+				08A8CA6C1615E80600825DA7 /* picmap.h */,
+				08A8CA6D1615E80600825DA7 /* picmapgen.h */,
+				08A8CA6E1615E80600825DA7 /* picmapview.h */,
+				08A8CA701615E80600825DA7 /* picolist.h */,
+				08A8CA711615E80600825DA7 /* picons.h */,
+				08A8CA721615E80600825DA7 /* piconsenum.h */,
+				08A8CA731615E80600825DA7 /* picontainergen.h */,
+				08A8CA751615E80600825DA7 /* pidrawer.h */,
+				08A8CA761615E80600825DA7 /* pidrawwin.h */,
+				08A8CA771615E80600825DA7 /* pidrwtools.h */,
+				08A8CA781615E80600825DA7 /* pieldrw.h */,
+				08A8CA791615E80600825DA7 /* pierrdisp.h */,
+				08A8CA7A1615E80600825DA7 /* pievthandler.h */,
+				08A8CA7B1615E80600825DA7 /* pifilechogen.h */,
+				08A8CA7C1615E80600825DA7 /* pifilechox.h */,
+				08A8CA7D1615E80600825DA7 /* pifontgen.h */,
+				08A8CA7F1615E80600825DA7 /* pigfname.h */,
+				08A8CA801615E80600825DA7 /* pigraph3d.h */,
+				08A8CA811615E80600825DA7 /* pigraphgen.h */,
+				08A8CA821615E80600825DA7 /* pigraphics.h */,
+				08A8CA831615E80600825DA7 /* pigraphps.h */,
+				08A8CA841615E80600825DA7 /* pigraphuc.h */,
+				08A8CA861615E80600825DA7 /* pigratt.h */,
+				08A8CA871615E80600825DA7 /* pigrcoord.h */,
+				08A8CA881615E80600825DA7 /* piimage.h */,
+				08A8CA891615E80600825DA7 /* piimgtools.h */,
+				08A8CA8A1615E80600825DA7 /* pilineatt.h */,
+				08A8CA8B1615E80600825DA7 /* pilistgen.h */,
+				08A8CA8C1615E80600825DA7 /* pilistx.h */,
+				08A8CA8D1615E80600825DA7 /* pimenubargen.h */,
+				08A8CA8F1615E80600825DA7 /* pimenugen.h */,
+				08A8CA911615E80600825DA7 /* pimsghandler.h */,
+				08A8CA921615E80600825DA7 /* pioptmenugen.h */,
+				08A8CA941615E80600825DA7 /* piperiodgen.h */,
+				08A8CA961615E80600825DA7 /* pipixmapgen.h */,
+				08A8CA981615E80600825DA7 /* pipixutils.h */,
+				08A8CA991615E80600825DA7 /* pipplist.h */,
+				08A8CA9A1615E80600825DA7 /* pippmenubar.h */,
+				08A8CA9B1615E80600825DA7 /* pippoptmenu.h */,
+				08A8CA9C1615E80600825DA7 /* pippviewadapter.h */,
+				08A8CA9D1615E80600825DA7 /* piscdrawwdg.h */,
+				08A8CA9E1615E80600825DA7 /* pistdwdggen.h */,
+				08A8CAA01615E80600825DA7 /* pistzwin.h */,
+				08A8CAA11615E80600825DA7 /* pisurfdr.h */,
+				08A8CAA21615E80600825DA7 /* pisysdep.h */,
+				08A8CAA31615E80600825DA7 /* pitherm.h */,
+				08A8CAA41615E80600825DA7 /* pitxtdrw.h */,
+				08A8CAA51615E80600825DA7 /* piup.h */,
+				08A8CAA61615E80600825DA7 /* piupdattachment.h */,
+				08A8CAA71615E80600825DA7 /* piversion.h */,
+				08A8CAA81615E80600825DA7 /* piwdggen.h */,
+				08A8CAAA1615E80600825DA7 /* piwindowgen.h */,
+				08A8CAAC1615E80600825DA7 /* pixtbase.h */,
+				08A8CAAD1615E80600825DA7 /* pixtbaseP.h */,
+				08A8CAAE1615E80600825DA7 /* piyfxdrw.h */,
+				08A8CAAF1615E80600825DA7 /* psfile.h */,
+				08A8CAB01615E80600825DA7 /* ucckprot.h */,
+				08A8CAB11615E80600825DA7 /* xdispim.h */,
 			);
 			name = Headers;
@@ -428,18 +944,7 @@
 			isa = PBXGroup;
 			children = (
-				6D6F137F0D6458E200583608 /* pigraphquartz.cpp */,
-				6D6F134D0D64572500583608 /* picmapquartz.cpp */,
-				6D6F13300D64550C00583608 /* pifontquartz.cpp */,
-				6DF012F50CBF6A510026E580 /* PIPeriodQuartz.cpp */,
-				6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */,
-				6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */,
-				6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */,
-				6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */,
-				6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */,
-				6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */,
-				6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */,
-				6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */,
-				6DE18C190E83E91700414227 /* pibwdgquartz.cpp */,
-				6DD04EE4113D3FCB00B55104 /* pieventquartz.cpp */,
+				08A8CD8D161C786C00825DA7 /* X */,
+				08A8CD8C161C786300825DA7 /* Quartz */,
+				08A8CD84161C776B00825DA7 /* picons.cc */,
 			);
 			name = Specific;
@@ -454,5 +959,5 @@
 			files = (
 				088CC8E4149A494B00210C77 /* pimsghandler.h in Headers */,
-				088CC8E5149A494B00210C77 /* PI_Prefix.h in Headers */,
+				088CC8E5149A494B00210C77 /* PI_PrefixQuartz.h in Headers */,
 				088CC8E6149A494B00210C77 /* picolist.h in Headers */,
 				088CC8E7149A494B00210C77 /* picontainergen.h in Headers */,
@@ -485,5 +990,4 @@
 				088CC902149A494B00210C77 /* pilineatt.h in Headers */,
 				088CC903149A494B00210C77 /* pifontgen.h in Headers */,
-				088CC904149A494B00210C77 /* strutilxx.h in Headers */,
 				088CC905149A494B00210C77 /* pibwdggen.h in Headers */,
 				088CC906149A494B00210C77 /* pidrawer.h in Headers */,
@@ -499,4 +1003,72 @@
 				088CC910149A494B00210C77 /* pigraphps.h in Headers */,
 				088CC911149A494B00210C77 /* pieventquartz.h in Headers */,
+				08A8CAB21615E80600825DA7 /* lut.h in Headers */,
+				08A8CAB31615E80600825DA7 /* parradapter.h in Headers */,
+				08A8CAB41615E80600825DA7 /* pi3ddrw.h in Headers */,
+				08A8CAB51615E80600825DA7 /* pi3dwdg.h in Headers */,
+				08A8CAB61615E80600825DA7 /* piapplgen.h in Headers */,
+				08A8CAB81615E80600825DA7 /* piaxes.h in Headers */,
+				08A8CAB91615E80600825DA7 /* piaxestools.h in Headers */,
+				08A8CABA1615E80600825DA7 /* pibargraph.h in Headers */,
+				08A8CABB1615E80600825DA7 /* pibwdggen.h in Headers */,
+				08A8CABD1615E80600825DA7 /* picmap.h in Headers */,
+				08A8CABE1615E80600825DA7 /* picmapgen.h in Headers */,
+				08A8CABF1615E80600825DA7 /* picmapview.h in Headers */,
+				08A8CAC11615E80600825DA7 /* picolist.h in Headers */,
+				08A8CAC21615E80600825DA7 /* picons.h in Headers */,
+				08A8CAC31615E80600825DA7 /* piconsenum.h in Headers */,
+				08A8CAC41615E80600825DA7 /* picontainergen.h in Headers */,
+				08A8CAC61615E80600825DA7 /* pidrawer.h in Headers */,
+				08A8CAC71615E80600825DA7 /* pidrawwin.h in Headers */,
+				08A8CAC81615E80600825DA7 /* pidrwtools.h in Headers */,
+				08A8CAC91615E80600825DA7 /* pieldrw.h in Headers */,
+				08A8CACA1615E80600825DA7 /* pierrdisp.h in Headers */,
+				08A8CACB1615E80600825DA7 /* pievthandler.h in Headers */,
+				08A8CACC1615E80600825DA7 /* pifilechogen.h in Headers */,
+				08A8CACD1615E80600825DA7 /* pifilechox.h in Headers */,
+				08A8CACE1615E80600825DA7 /* pifontgen.h in Headers */,
+				08A8CAD01615E80600825DA7 /* pigfname.h in Headers */,
+				08A8CAD11615E80600825DA7 /* pigraph3d.h in Headers */,
+				08A8CAD21615E80600825DA7 /* pigraphgen.h in Headers */,
+				08A8CAD31615E80600825DA7 /* pigraphics.h in Headers */,
+				08A8CAD41615E80600825DA7 /* pigraphps.h in Headers */,
+				08A8CAD51615E80600825DA7 /* pigraphuc.h in Headers */,
+				08A8CAD71615E80600825DA7 /* pigratt.h in Headers */,
+				08A8CAD81615E80600825DA7 /* pigrcoord.h in Headers */,
+				08A8CAD91615E80600825DA7 /* piimage.h in Headers */,
+				08A8CADA1615E80600825DA7 /* piimgtools.h in Headers */,
+				08A8CADB1615E80600825DA7 /* pilineatt.h in Headers */,
+				08A8CADC1615E80600825DA7 /* pilistgen.h in Headers */,
+				08A8CADD1615E80600825DA7 /* pilistx.h in Headers */,
+				08A8CADE1615E80600825DA7 /* pimenubargen.h in Headers */,
+				08A8CAE01615E80600825DA7 /* pimenugen.h in Headers */,
+				08A8CAE21615E80600825DA7 /* pimsghandler.h in Headers */,
+				08A8CAE31615E80600825DA7 /* pioptmenugen.h in Headers */,
+				08A8CAE51615E80600825DA7 /* piperiodgen.h in Headers */,
+				08A8CAE71615E80600825DA7 /* pipixmapgen.h in Headers */,
+				08A8CAE91615E80600825DA7 /* pipixutils.h in Headers */,
+				08A8CAEA1615E80600825DA7 /* pipplist.h in Headers */,
+				08A8CAEB1615E80600825DA7 /* pippmenubar.h in Headers */,
+				08A8CAEC1615E80600825DA7 /* pippoptmenu.h in Headers */,
+				08A8CAED1615E80600825DA7 /* pippviewadapter.h in Headers */,
+				08A8CAEE1615E80600825DA7 /* piscdrawwdg.h in Headers */,
+				08A8CAEF1615E80600825DA7 /* pistdwdggen.h in Headers */,
+				08A8CAF11615E80600825DA7 /* pistzwin.h in Headers */,
+				08A8CAF21615E80600825DA7 /* pisurfdr.h in Headers */,
+				08A8CAF31615E80600825DA7 /* pisysdep.h in Headers */,
+				08A8CAF41615E80600825DA7 /* pitherm.h in Headers */,
+				08A8CAF51615E80600825DA7 /* pitxtdrw.h in Headers */,
+				08A8CAF61615E80600825DA7 /* piup.h in Headers */,
+				08A8CAF71615E80600825DA7 /* piupdattachment.h in Headers */,
+				08A8CAF81615E80600825DA7 /* piversion.h in Headers */,
+				08A8CAF91615E80600825DA7 /* piwdggen.h in Headers */,
+				08A8CAFB1615E80600825DA7 /* piwindowgen.h in Headers */,
+				08A8CAFD1615E80600825DA7 /* pixtbase.h in Headers */,
+				08A8CAFE1615E80600825DA7 /* pixtbaseP.h in Headers */,
+				08A8CAFF1615E80600825DA7 /* piyfxdrw.h in Headers */,
+				08A8CB001615E80600825DA7 /* psfile.h in Headers */,
+				08A8CB011615E80600825DA7 /* ucckprot.h in Headers */,
+				08A8CB021615E80600825DA7 /* xdispim.h in Headers */,
+				08A8CD28161C686100825DA7 /* pexceptions.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -527,4 +1099,132 @@
 			buildActionMask = 2147483647;
 			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CA3B1615E71800825DA7 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CBC01616142D00825DA7 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				08A8CBC11616142D00825DA7 /* pimsghandler.h in Headers */,
+				08A8CBC31616142D00825DA7 /* picolist.h in Headers */,
+				08A8CBC41616142D00825DA7 /* picontainergen.h in Headers */,
+				08A8CBC61616142D00825DA7 /* piwdggen.h in Headers */,
+				08A8CBC71616142D00825DA7 /* pievthandler.h in Headers */,
+				08A8CBCA1616142D00825DA7 /* piwindowgen.h in Headers */,
+				08A8CBCB1616142D00825DA7 /* pimenubargen.h in Headers */,
+				08A8CBCC1616142D00825DA7 /* pimenugen.h in Headers */,
+				08A8CBCF1616142D00825DA7 /* piapplgen.h in Headers */,
+				08A8CBD11616142D00825DA7 /* pistdwdggen.h in Headers */,
+				08A8CBD41616142D00825DA7 /* machdefs.h in Headers */,
+				08A8CBD51616142D00825DA7 /* sopnamsp.h in Headers */,
+				08A8CBD61616142D00825DA7 /* pisysdep.h in Headers */,
+				08A8CBDA1616142D00825DA7 /* picmap.h in Headers */,
+				08A8CBDB1616142D00825DA7 /* picmapgen.h in Headers */,
+				08A8CBDC1616142D00825DA7 /* piconsenum.h in Headers */,
+				08A8CBDD1616142D00825DA7 /* pigratt.h in Headers */,
+				08A8CBDE1616142D00825DA7 /* pigrcoord.h in Headers */,
+				08A8CBDF1616142D00825DA7 /* pilineatt.h in Headers */,
+				08A8CBE01616142D00825DA7 /* pifontgen.h in Headers */,
+				08A8CBE21616142D00825DA7 /* pibwdggen.h in Headers */,
+				08A8CBE31616142D00825DA7 /* pidrawer.h in Headers */,
+				08A8CBE41616142D00825DA7 /* piaxes.h in Headers */,
+				08A8CBE51616142D00825DA7 /* pigraphgen.h in Headers */,
+				08A8CBE61616142D00825DA7 /* pigraphuc.h in Headers */,
+				08A8CBE71616142D00825DA7 /* psfile.h in Headers */,
+				08A8CBE81616142D00825DA7 /* ucckprot.h in Headers */,
+				08A8CBE91616142D00825DA7 /* pioptmenugen.h in Headers */,
+				08A8CBEB1616142D00825DA7 /* pidrwtools.h in Headers */,
+				08A8CBED1616142D00825DA7 /* pigraphps.h in Headers */,
+				08A8CBEF1616142D00825DA7 /* lut.h in Headers */,
+				08A8CBF01616142D00825DA7 /* parradapter.h in Headers */,
+				08A8CBF11616142D00825DA7 /* pi3ddrw.h in Headers */,
+				08A8CBF21616142D00825DA7 /* pi3dwdg.h in Headers */,
+				08A8CBF31616142D00825DA7 /* piapplgen.h in Headers */,
+				08A8CBF41616142D00825DA7 /* piapplx.h in Headers */,
+				08A8CBF51616142D00825DA7 /* piaxes.h in Headers */,
+				08A8CBF61616142D00825DA7 /* piaxestools.h in Headers */,
+				08A8CBF71616142D00825DA7 /* pibargraph.h in Headers */,
+				08A8CBF81616142D00825DA7 /* pibwdggen.h in Headers */,
+				08A8CBF91616142D00825DA7 /* pibwdgx.h in Headers */,
+				08A8CBFA1616142D00825DA7 /* picmap.h in Headers */,
+				08A8CBFB1616142D00825DA7 /* picmapgen.h in Headers */,
+				08A8CBFC1616142D00825DA7 /* picmapview.h in Headers */,
+				08A8CBFD1616142D00825DA7 /* picmapx.h in Headers */,
+				08A8CBFE1616142D00825DA7 /* picolist.h in Headers */,
+				08A8CBFF1616142D00825DA7 /* picons.h in Headers */,
+				08A8CC001616142D00825DA7 /* piconsenum.h in Headers */,
+				08A8CC011616142D00825DA7 /* picontainergen.h in Headers */,
+				08A8CC021616142D00825DA7 /* picontainerx.h in Headers */,
+				08A8CC031616142D00825DA7 /* pidrawer.h in Headers */,
+				08A8CC041616142D00825DA7 /* pidrawwin.h in Headers */,
+				08A8CC051616142D00825DA7 /* pidrwtools.h in Headers */,
+				08A8CC061616142D00825DA7 /* pieldrw.h in Headers */,
+				08A8CC071616142D00825DA7 /* pierrdisp.h in Headers */,
+				08A8CC081616142D00825DA7 /* pievthandler.h in Headers */,
+				08A8CC091616142D00825DA7 /* pifilechogen.h in Headers */,
+				08A8CC0A1616142D00825DA7 /* pifilechox.h in Headers */,
+				08A8CC0B1616142D00825DA7 /* pifontgen.h in Headers */,
+				08A8CC0C1616142D00825DA7 /* pifontx.h in Headers */,
+				08A8CC0D1616142D00825DA7 /* pigfname.h in Headers */,
+				08A8CC0E1616142D00825DA7 /* pigraph3d.h in Headers */,
+				08A8CC0F1616142D00825DA7 /* pigraphgen.h in Headers */,
+				08A8CC101616142D00825DA7 /* pigraphics.h in Headers */,
+				08A8CC111616142D00825DA7 /* pigraphps.h in Headers */,
+				08A8CC121616142D00825DA7 /* pigraphuc.h in Headers */,
+				08A8CC131616142D00825DA7 /* pigraphx.h in Headers */,
+				08A8CC141616142D00825DA7 /* pigratt.h in Headers */,
+				08A8CC151616142D00825DA7 /* pigrcoord.h in Headers */,
+				08A8CC161616142D00825DA7 /* piimage.h in Headers */,
+				08A8CC171616142D00825DA7 /* piimgtools.h in Headers */,
+				08A8CC181616142D00825DA7 /* pilineatt.h in Headers */,
+				08A8CC191616142D00825DA7 /* pilistgen.h in Headers */,
+				08A8CC1A1616142D00825DA7 /* pilistx.h in Headers */,
+				08A8CC1B1616142D00825DA7 /* pimenubargen.h in Headers */,
+				08A8CC1C1616142D00825DA7 /* pimenubarx.h in Headers */,
+				08A8CC1D1616142D00825DA7 /* pimenugen.h in Headers */,
+				08A8CC1E1616142D00825DA7 /* pimenux.h in Headers */,
+				08A8CC1F1616142D00825DA7 /* pimsghandler.h in Headers */,
+				08A8CC201616142D00825DA7 /* pioptmenugen.h in Headers */,
+				08A8CC211616142D00825DA7 /* pioptmenux.h in Headers */,
+				08A8CC221616142D00825DA7 /* piperiodgen.h in Headers */,
+				08A8CC231616142D00825DA7 /* piperiodx.h in Headers */,
+				08A8CC241616142D00825DA7 /* pipixmapgen.h in Headers */,
+				08A8CC251616142D00825DA7 /* pipixmapx.h in Headers */,
+				08A8CC261616142D00825DA7 /* pipixutils.h in Headers */,
+				08A8CC271616142D00825DA7 /* pipplist.h in Headers */,
+				08A8CC281616142D00825DA7 /* pippmenubar.h in Headers */,
+				08A8CC291616142D00825DA7 /* pippoptmenu.h in Headers */,
+				08A8CC2A1616142D00825DA7 /* pippviewadapter.h in Headers */,
+				08A8CC2B1616142D00825DA7 /* piscdrawwdg.h in Headers */,
+				08A8CC2C1616142D00825DA7 /* pistdwdggen.h in Headers */,
+				08A8CC2D1616142D00825DA7 /* pistdwdgx.h in Headers */,
+				08A8CC2E1616142D00825DA7 /* pistzwin.h in Headers */,
+				08A8CC2F1616142D00825DA7 /* pisurfdr.h in Headers */,
+				08A8CC301616142D00825DA7 /* pisysdep.h in Headers */,
+				08A8CC311616142D00825DA7 /* pitherm.h in Headers */,
+				08A8CC321616142D00825DA7 /* pitxtdrw.h in Headers */,
+				08A8CC331616142D00825DA7 /* piup.h in Headers */,
+				08A8CC341616142D00825DA7 /* piupdattachment.h in Headers */,
+				08A8CC351616142D00825DA7 /* piversion.h in Headers */,
+				08A8CC361616142D00825DA7 /* piwdggen.h in Headers */,
+				08A8CC371616142D00825DA7 /* piwdgx.h in Headers */,
+				08A8CC381616142D00825DA7 /* piwindowgen.h in Headers */,
+				08A8CC391616142D00825DA7 /* piwindowx.h in Headers */,
+				08A8CC3A1616142D00825DA7 /* pixtbase.h in Headers */,
+				08A8CC3B1616142D00825DA7 /* pixtbaseP.h in Headers */,
+				08A8CC3C1616142D00825DA7 /* piyfxdrw.h in Headers */,
+				08A8CC3D1616142D00825DA7 /* psfile.h in Headers */,
+				08A8CC3E1616142D00825DA7 /* ucckprot.h in Headers */,
+				08A8CC3F1616142D00825DA7 /* xdispim.h in Headers */,
+				08A8CD27161C686100825DA7 /* pexceptions.h in Headers */,
+				08A8CE33161C8C1F00825DA7 /* pixtbase.h in Headers */,
+				08A8CE69161C924E00825DA7 /* strutilxx.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -533,7 +1233,7 @@
 
 /* Begin PBXNativeTarget section */
-		088CC8E2149A494B00210C77 /* PI (Upgraded) */ = {
+		088CC8E2149A494B00210C77 /* PI-Quartz */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 088CC940149A494B00210C77 /* Build configuration list for PBXNativeTarget "PI (Upgraded)" */;
+			buildConfigurationList = 088CC940149A494B00210C77 /* Build configuration list for PBXNativeTarget "PI-Quartz" */;
 			buildPhases = (
 				088CC8E3149A494B00210C77 /* Headers */,
@@ -547,5 +1247,5 @@
 			dependencies = (
 			);
-			name = "PI (Upgraded)";
+			name = "PI-Quartz";
 			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 			productName = PI;
@@ -553,7 +1253,7 @@
 			productType = "com.apple.product-type.framework";
 		};
-		088CC946149A494B00210C77 /* PIAQTest (Upgraded) */ = {
+		088CC946149A494B00210C77 /* PIAQTest-Quartz */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 088CC94F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIAQTest (Upgraded)" */;
+			buildConfigurationList = 088CC94F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIAQTest-Quartz" */;
 			buildPhases = (
 				088CC947149A494B00210C77 /* Headers */,
@@ -567,5 +1267,5 @@
 			dependencies = (
 			);
-			name = "PIAQTest (Upgraded)";
+			name = "PIAQTest-Quartz";
 			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 			productName = PIAQTest;
@@ -573,7 +1273,7 @@
 			productType = "com.apple.product-type.application";
 		};
-		088CC956149A494B00210C77 /* XP0 (Upgraded) */ = {
+		088CC956149A494B00210C77 /* XP0-Quartz */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 088CC95F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP0 (Upgraded)" */;
+			buildConfigurationList = 088CC95F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP0-Quartz" */;
 			buildPhases = (
 				088CC957149A494B00210C77 /* Headers */,
@@ -587,5 +1287,5 @@
 			dependencies = (
 			);
-			name = "XP0 (Upgraded)";
+			name = "XP0-Quartz";
 			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 			productName = PIAQTest;
@@ -593,7 +1293,7 @@
 			productType = "com.apple.product-type.application";
 		};
-		088CC966149A494B00210C77 /* XP1 (Upgraded) */ = {
+		088CC966149A494B00210C77 /* XP1-Quartz */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 088CC96F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP1 (Upgraded)" */;
+			buildConfigurationList = 088CC96F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP1-Quartz" */;
 			buildPhases = (
 				088CC967149A494B00210C77 /* Headers */,
@@ -607,5 +1307,5 @@
 			dependencies = (
 			);
-			name = "XP1 (Upgraded)";
+			name = "XP1-Quartz";
 			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 			productName = PIAQTest;
@@ -613,7 +1313,7 @@
 			productType = "com.apple.product-type.application";
 		};
-		088CC976149A494B00210C77 /* PIT0 (Upgraded) */ = {
+		088CC976149A494B00210C77 /* PIT0-Quartz */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 088CC97F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIT0 (Upgraded)" */;
+			buildConfigurationList = 088CC97F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIT0-Quartz" */;
 			buildPhases = (
 				088CC977149A494B00210C77 /* Headers */,
@@ -627,5 +1327,5 @@
 			dependencies = (
 			);
-			name = "PIT0 (Upgraded)";
+			name = "PIT0-Quartz";
 			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 			productName = PIAQTest;
@@ -633,7 +1333,7 @@
 			productType = "com.apple.product-type.application";
 		};
-		088CC986149A494B00210C77 /* BaoAdc (Copied) */ = {
+		088CC986149A494B00210C77 /* BaoAdc-Quartz */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 088CC98B149A494B00210C77 /* Build configuration list for PBXNativeTarget "BaoAdc (Copied)" */;
+			buildConfigurationList = 088CC98B149A494B00210C77 /* Build configuration list for PBXNativeTarget "BaoAdc-Quartz" */;
 			buildPhases = (
 				088CC987149A494B00210C77 /* Resources */,
@@ -645,8 +1345,48 @@
 			dependencies = (
 			);
-			name = "BaoAdc (Copied)";
+			name = "BaoAdc-Quartz";
 			productName = BaoAdc;
 			productReference = 088CC98F149A494B00210C77 /* BaoAdc.app */;
 			productType = "com.apple.product-type.application";
+		};
+		08A8CA3A1615E71800825DA7 /* XP1-X */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 08A8CA431615E71800825DA7 /* Build configuration list for PBXNativeTarget "XP1-X" */;
+			buildPhases = (
+				08A8CA3B1615E71800825DA7 /* Headers */,
+				08A8CA3C1615E71800825DA7 /* Resources */,
+				08A8CA3D1615E71800825DA7 /* Sources */,
+				08A8CA3F1615E71800825DA7 /* Frameworks */,
+				08A8CA421615E71800825DA7 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XP1-X";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PIAQTest;
+			productReference = 08A8CA471615E71800825DA7 /* XP1.app */;
+			productType = "com.apple.product-type.application";
+		};
+		08A8CBBF1616142D00825DA7 /* PI-X */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 08A8CC6F1616142D00825DA7 /* Build configuration list for PBXNativeTarget "PI-X" */;
+			buildPhases = (
+				08A8CBC01616142D00825DA7 /* Headers */,
+				08A8CC401616142D00825DA7 /* Resources */,
+				08A8CC421616142D00825DA7 /* Sources */,
+				08A8CC6B1616142D00825DA7 /* Frameworks */,
+				08A8CC6E1616142D00825DA7 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "PI-X";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PI;
+			productReference = 08A8CC731616142D00825DA7 /* PI.framework */;
+			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -670,10 +1410,12 @@
 			projectRoot = "";
 			targets = (
-				088CC8E2149A494B00210C77 /* PI (Upgraded) */,
-				088CC946149A494B00210C77 /* PIAQTest (Upgraded) */,
-				088CC956149A494B00210C77 /* XP0 (Upgraded) */,
-				088CC966149A494B00210C77 /* XP1 (Upgraded) */,
-				088CC976149A494B00210C77 /* PIT0 (Upgraded) */,
-				088CC986149A494B00210C77 /* BaoAdc (Copied) */,
+				088CC8E2149A494B00210C77 /* PI-Quartz */,
+				088CC946149A494B00210C77 /* PIAQTest-Quartz */,
+				088CC956149A494B00210C77 /* XP0-Quartz */,
+				088CC966149A494B00210C77 /* XP1-Quartz */,
+				088CC976149A494B00210C77 /* PIT0-Quartz */,
+				088CC986149A494B00210C77 /* BaoAdc-Quartz */,
+				08A8CA3A1615E71800825DA7 /* XP1-X */,
+				08A8CBBF1616142D00825DA7 /* PI-X */,
 			);
 		};
@@ -724,4 +1466,19 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		08A8CA3C1615E71800825DA7 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CC401616142D00825DA7 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				08A8CC411616142D00825DA7 /* InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
@@ -756,4 +1513,18 @@
 		};
 		088CC97E149A494B00210C77 /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CA421615E71800825DA7 /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CC6E1616142D00825DA7 /* Rez */ = {
 			isa = PBXRezBuildPhase;
 			buildActionMask = 2147483647;
@@ -808,4 +1579,5 @@
 				088CC93A149A494B00210C77 /* pigraphps.cc in Sources */,
 				088CC93B149A494B00210C77 /* pieventquartz.cpp in Sources */,
+				08A8CD9A161C78A500825DA7 /* picons.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -847,4 +1619,60 @@
 			buildActionMask = 2147483647;
 			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CA3D1615E71800825DA7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				08A8CA3E1615E71800825DA7 /* xp1.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08A8CC421616142D00825DA7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				08A8CC431616142D00825DA7 /* pimsghandler.cc in Sources */,
+				08A8CC441616142D00825DA7 /* picontainergen.cc in Sources */,
+				08A8CC461616142D00825DA7 /* piwdggen.cc in Sources */,
+				08A8CC481616142D00825DA7 /* pievthandler.cc in Sources */,
+				08A8CC4A1616142D00825DA7 /* piwindowgen.cc in Sources */,
+				08A8CC4B1616142D00825DA7 /* pimenubargen.cc in Sources */,
+				08A8CC4C1616142D00825DA7 /* pimenugen.cc in Sources */,
+				08A8CC4F1616142D00825DA7 /* piapplgen.cc in Sources */,
+				08A8CC511616142D00825DA7 /* pistdwdggen.cc in Sources */,
+				08A8CC571616142D00825DA7 /* picmap.cc in Sources */,
+				08A8CC581616142D00825DA7 /* picmapgen.cc in Sources */,
+				08A8CC591616142D00825DA7 /* pigraphgen.cc in Sources */,
+				08A8CC5A1616142D00825DA7 /* pigratt.cc in Sources */,
+				08A8CC5B1616142D00825DA7 /* pigrcoord.cc in Sources */,
+				08A8CC5C1616142D00825DA7 /* pilineatt.cc in Sources */,
+				08A8CC5D1616142D00825DA7 /* psfile.cc in Sources */,
+				08A8CC5E1616142D00825DA7 /* pifontgen.cc in Sources */,
+				08A8CC5F1616142D00825DA7 /* strutilxx.cc in Sources */,
+				08A8CC601616142D00825DA7 /* pibwdggen.cc in Sources */,
+				08A8CC611616142D00825DA7 /* pidrawer.cc in Sources */,
+				08A8CC621616142D00825DA7 /* piaxes.cc in Sources */,
+				08A8CD38161C694C00825DA7 /* piwdgx.cc in Sources */,
+				08A8CC631616142D00825DA7 /* pigraphuc.cc in Sources */,
+				08A8CC641616142D00825DA7 /* pioptmenugen.cc in Sources */,
+				08A8CC661616142D00825DA7 /* pidrwtools.cc in Sources */,
+				08A8CC681616142D00825DA7 /* pigraphps.cc in Sources */,
+				08A8CC6A1616142D00825DA7 /* xdispim.c in Sources */,
+				08A8CD2A161C686E00825DA7 /* pexceptions.cc in Sources */,
+				08A8CD2F161C68E600825DA7 /* pimenux.cc in Sources */,
+				08A8CD33161C690800825DA7 /* picontainerx.cc in Sources */,
+				08A8CD39161C694C00825DA7 /* piwindowx.cc in Sources */,
+				08A8CD45161C6A7000825DA7 /* pifontx.cc in Sources */,
+				08A8CD49161C6AB500825DA7 /* picmapx.cc in Sources */,
+				08A8CD5E161C6C0900825DA7 /* pistdwdgx.cc in Sources */,
+				08A8CD65161C6CE700825DA7 /* pigraphx.cc in Sources */,
+				08A8CD69161C6FD900825DA7 /* pioptmenux.cc in Sources */,
+				08A8CD7D161C772E00825DA7 /* piapplx.cc in Sources */,
+				08A8CD81161C774200825DA7 /* pimenubarx.cc in Sources */,
+				08A8CD85161C776B00825DA7 /* picons.cc in Sources */,
+				08A8CD89161C778100825DA7 /* pibwdgx.cc in Sources */,
+				08A8CE36161C8C2600825DA7 /* pixtbase.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -879,13 +1707,16 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_USE_GCC3_PFE_SUPPORT = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = ../../../SophyaLib/SUtils;
 				INFOPLIST_FILE = "Info-PI__Upgraded_.plist";
 				INSTALL_PATH = /Library/PI;
 				LIBRARY_SEARCH_PATHS = "";
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = PI;
+				SDKROOT = macosx;
 				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "i386 x86_64";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -914,9 +1745,12 @@
 				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 				LIBRARY_SEARCH_PATHS = "";
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = PI;
+				SDKROOT = macosx;
 				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "i386 x86_64";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -943,9 +1777,12 @@
 				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 				LIBRARY_SEARCH_PATHS = "";
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = PI;
+				SDKROOT = macosx;
 				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "i386 x86_64";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -961,8 +1798,5 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -975,4 +1809,5 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = "Info-PIAQTest__Upgraded_.plist";
 				OTHER_CFLAGS = "";
@@ -982,4 +1817,5 @@
 				PRODUCT_NAME = PIAQTest;
 				SECTORDER_FLAGS = "";
+				SKIP_INSTALL = YES;
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -1006,5 +1842,5 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = "Info-PIAQTest__Upgraded_.plist";
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				INSTALL_PATH = /Users/garnier/Work/PI/trunk/SophyaPI/PI/Quartz/build;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -1055,8 +1891,5 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1148,8 +1981,5 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)/**";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1453,10 +2283,246 @@
 			name = Default;
 		};
+		08A8CA441615E71800825DA7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)/**";
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_USE_GCC3_PFE_SUPPORT = NO;
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					../SophyaLib/SUtils,
+				);
+				INFOPLIST_FILE = "Info-XP1__Upgraded_ copy.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_64)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = XP1;
+				SDKROOT = macosx;
+				SECTORDER_FLAGS = "";
+				VALID_ARCHS = x86_64;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = YES;
+			};
+			name = Development;
+		};
+		08A8CA451615E71800825DA7 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-XP1__Upgraded_ copy.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SDKROOT = macosx;
+				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "x86_64 i386";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		08A8CA461615E71800825DA7 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-XP1__Upgraded_ copy.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SDKROOT = macosx;
+				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "x86_64 i386";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+			};
+			name = Default;
+		};
+		08A8CC701616142D00825DA7 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				COPY_PHASE_STRIP = NO;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = "";
+				FRAMEWORK_VERSION = A;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = Darwin;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_USE_GCC3_PFE_SUPPORT = NO;
+				HEADER_SEARCH_PATHS = (
+					/sw/include,
+					../../../SophyaLib/SUtils,
+				);
+				INFOPLIST_FILE = "Info-PI__Upgraded_ copy.plist";
+				INSTALL_PATH = /Library/PI;
+				LIBRARY_SEARCH_PATHS = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_64)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-lXt",
+					"-lXaw",
+					"-lX11",
+					"-lXmu",
+					"-L/usr/X11R6/lib",
+					"-L/sw/lib",
+					"-lXm",
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = PI;
+				SDKROOT = macosx;
+				SECTORDER_FLAGS = "";
+				VALID_ARCHS = x86_64;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = framework;
+				ZERO_LINK = YES;
+			};
+			name = Development;
+		};
+		08A8CC711616142D00825DA7 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				COPY_PHASE_STRIP = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = "";
+				FRAMEWORK_VERSION = A;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../../../SophyaLib/SUtils,
+					/sw/include,
+				);
+				INFOPLIST_FILE = "Info-PI__Upgraded_ copy.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				LIBRARY_SEARCH_PATHS = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PI;
+				SDKROOT = macosx;
+				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "x86_64 i386";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = framework;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		08A8CC721616142D00825DA7 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = "";
+				FRAMEWORK_VERSION = A;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = "";
+				INFOPLIST_FILE = "Info-PI__Upgraded_ copy.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				LIBRARY_SEARCH_PATHS = "";
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PI;
+				SDKROOT = macosx;
+				SECTORDER_FLAGS = "";
+				VALID_ARCHS = "x86_64 i386";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Default;
+		};
 		6DF29DE20B71EEB300F55B65 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = Quartz;
+				DEAD_CODE_STRIPPING = NO;
+				GCC_VERSION = 4.2;
+				HEADER_SEARCH_PATHS = (
+					/usr/include,
+					../SophyaLib/SUtils,
+					Quartz,
+				);
+				LINK_WITH_STANDARD_LIBRARIES = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = /usr/include;
 			};
 			name = Development;
@@ -1466,5 +2532,5 @@
 			buildSettings = {
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+				SDKROOT = macosx;
 			};
 			name = Deployment;
@@ -1474,5 +2540,5 @@
 			buildSettings = {
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+				SDKROOT = macosx;
 			};
 			name = Default;
@@ -1481,5 +2547,5 @@
 
 /* Begin XCConfigurationList section */
-		088CC940149A494B00210C77 /* Build configuration list for PBXNativeTarget "PI (Upgraded)" */ = {
+		088CC940149A494B00210C77 /* Build configuration list for PBXNativeTarget "PI-Quartz" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1491,5 +2557,5 @@
 			defaultConfigurationName = Default;
 		};
-		088CC94F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIAQTest (Upgraded)" */ = {
+		088CC94F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIAQTest-Quartz" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1501,5 +2567,5 @@
 			defaultConfigurationName = Default;
 		};
-		088CC95F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP0 (Upgraded)" */ = {
+		088CC95F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP0-Quartz" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1511,5 +2577,5 @@
 			defaultConfigurationName = Default;
 		};
-		088CC96F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP1 (Upgraded)" */ = {
+		088CC96F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP1-Quartz" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1521,5 +2587,5 @@
 			defaultConfigurationName = Default;
 		};
-		088CC97F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIT0 (Upgraded)" */ = {
+		088CC97F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIT0-Quartz" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1531,5 +2597,5 @@
 			defaultConfigurationName = Default;
 		};
-		088CC98B149A494B00210C77 /* Build configuration list for PBXNativeTarget "BaoAdc (Copied)" */ = {
+		088CC98B149A494B00210C77 /* Build configuration list for PBXNativeTarget "BaoAdc-Quartz" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1537,4 +2603,24 @@
 				088CC98D149A494B00210C77 /* Deployment */,
 				088CC98E149A494B00210C77 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		08A8CA431615E71800825DA7 /* Build configuration list for PBXNativeTarget "XP1-X" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				08A8CA441615E71800825DA7 /* Development */,
+				08A8CA451615E71800825DA7 /* Deployment */,
+				08A8CA461615E71800825DA7 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		08A8CC6F1616142D00825DA7 /* Build configuration list for PBXNativeTarget "PI-X" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				08A8CC701616142D00825DA7 /* Development */,
+				08A8CC711616142D00825DA7 /* Deployment */,
+				08A8CC721616142D00825DA7 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
Index: /trunk/SophyaPI/PI/Quartz/PIApplQuartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PIApplQuartz.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/PIApplQuartz.cpp	(revision 4081)
@@ -98,3 +98,2 @@
 }
 
-
Index: /trunk/SophyaPI/PI/Quartz/PIContainerQuartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PIContainerQuartz.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/PIContainerQuartz.cpp	(revision 4081)
@@ -14,4 +14,5 @@
 :PIContainerGen(par, nom, sx, sy, px, py)
 {
+	printf("PIContainerQuartz::PIContainerQuartz \n");
 }
 
Index: /trunk/SophyaPI/PI/Quartz/PIWindowQuartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PIWindowQuartz.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/PIWindowQuartz.cpp	(revision 4081)
@@ -17,5 +17,5 @@
 	
     SetRect(&wdgRect,px,py,px+sx,py+sy);
-	windowAttributes = kWindowStandardDocumentAttributes | kWindowCompositingAttribute ;
+	windowAttributes = kWindowStandardDocumentAttributes | kWindowCompositingAttribute | kWindowStandardHandlerAttribute | kWindowLiveResizeAttribute;
 	
 	err = CreateNewWindow (kDocumentWindowClass, windowAttributes, &wdgRect, &wRef);
@@ -30,4 +30,25 @@
 	HIViewGetBounds (wdgHIView, &bounds);
 
+//////
+/*
+ CGRect myBoundingBox;// 1
+	
+    myBoundingBox = CGRectMake (0, 0, myWidth, myHeight);// 2
+    myBitmapContext = MyCreateBitmapContext (400, 300);// 3
+    // ********** Your drawing code here ********** // 4
+    CGContextSetRGBFillColor (myBitmapContext, 1, 0, 0, 1);
+    CGContextFillRect (myBitmapContext, CGRectMake (0, 0, 200, 100 ));
+    CGContextSetRGBFillColor (myBitmapContext, 0, 0, 1, .5);
+    CGContextFillRect (myBitmapContext, CGRectMake (0, 0, 100, 200 ));
+    myImage = CGBitmapContextCreateImage (myBitmapContext);// 5
+    CGContextDrawImage(myContext, myBoundingBox, myImage);// 6
+    char *bitmapData = CGBitmapContextGetData(myBitmapContext); // 7
+    CGContextRelease (myBitmapContext);// 8
+    if (bitmapData) free(bitmapData); // 9
+    CGImageRelease(myImage);
+*/	
+///////
+
+	
 	printf("PIWindowQuartz::PIWindowQuartz Window View Bounds (%g %g) [%g %g] \n",
 											bounds.origin.x, bounds.origin.y,
@@ -40,4 +61,44 @@
 
 }
+/*
+ 
+CGContextRef PIWindowQuartz::MyCreateBitmapContext (int pixelsWide,
+									int pixelsHigh)
+{
+    CGContextRef    context = NULL;
+    CGColorSpaceRef colorSpace;
+    void *          bitmapData;
+    int             bitmapByteCount;
+    int             bitmapBytesPerRow;
+	
+    bitmapBytesPerRow   = (pixelsWide * 4);// 1
+    bitmapByteCount     = (bitmapBytesPerRow * pixelsHigh);
+	
+    colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);// 2
+    bitmapData = calloc( bitmapByteCount );// 3
+    if (bitmapData == NULL)
+    {
+        fprintf (stderr, "Memory not allocated!");
+        return NULL;
+    }
+    context = CGBitmapContextCreate (bitmapData,// 4
+									 pixelsWide,
+									 pixelsHigh,
+									 8,      // bits per component
+									 bitmapBytesPerRow,
+									 colorSpace,
+									 kCGImageAlphaPremultipliedLast);
+    if (context== NULL)
+    {
+        free (bitmapData);// 5
+        fprintf (stderr, "Context not created!");
+        return NULL;
+    }
+    CGColorSpaceRelease( colorSpace );// 6
+	
+    return context;// 7
+}
+*/
+////
 
 void PIWindowQuartz::SetSize(int sx, int sy)
Index: /trunk/SophyaPI/PI/Quartz/QuartzAppTest.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/QuartzAppTest.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/QuartzAppTest.cpp	(revision 4081)
@@ -145,10 +145,10 @@
 	
     /* Creation of Main Window */	
-    windowFirst = new PIWindow((PIMsgHandler *)mainApp, (const char *)"Window First",PIWK_normal, 700, 300, 50, 50);
+    windowFirst = new PIWindow((PIMsgHandler *)mainApp, (const char *)"Window First",PIWK_normal, 700, 700, 50, 50);
 	
     /* Creation of general graphical objects */
 	piLabel = new PILabel(windowFirst,(const char *)"Label", 80, 40, 150, 50);
 
-	piButton = new PIButton(windowFirst, "Hello", 777, 60, 20, 80, 80);
+	piButton = new PIButton(windowFirst, "Hello------2", 777, 60, 20, 80, 80);
 	
 	optMenu = new PIOptMenu(windowFirst, "Opt Menu", 100, 25, 150, 80);
@@ -159,8 +159,8 @@
 	optMenu->AppendPDMenu(popMenu);
 	
-	piLabel->SetLabel("Etiquette");
+	piLabel->SetLabel("Etiquette-------2");
 	
 	/* Creation of graphic Context */
-	twdg = new TstBWdg(windowFirst, "Test BaseQuartz", 400, 250, 300, 50);
+	twdg = new TstBWdg(windowFirst, "Test BaseQuartz", 500, 500, 200, 200);
 	windowFirst->Show();
 	
@@ -186,5 +186,5 @@
 void TstBWdg::Draw(PIGraphic* g, int x0, int y0, int dx, int dy)
 {
-	std::cout << "TstBWdg::Draw ";
+	std::cout << "TstBWdg::Draw +++++++++";
 
 	/*
@@ -205,4 +205,11 @@
 	g->DrawFBox(px, py, len, hei);
 	
+	PIGrCoord px2(0);
+	PIGrCoord py2(0);
+	PIGrCoord len2(500);
+	PIGrCoord hei2(500);
+	g->SelForeground(PI_Red);
+	g->DrawFBox(px2, py2, len2, hei2);
+	
 	px = 200 ; py = 50;
 	g->DrawString (px, py, "Graphic Text", 1);
Index: /trunk/SophyaPI/PI/Quartz/machdefs.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/machdefs.h	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/machdefs.h	(revision 4081)
@@ -362,8 +362,10 @@
 #define NO_VALUES_H
 /* BMX */
-#include "PI_Prefix.h"
+#ifdef __PIWQUARTZ__
+#include "PI_PrefixQuartz.h"
 /* #include "osx_values.h" */
 /* Faute de mieux pour le moment : */
 #define drand48() ((double)(random())/LONG_MAX)
+#endif
 #endif
 
Index: /trunk/SophyaPI/PI/Quartz/pibwdgquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pibwdgquartz.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/pibwdgquartz.cpp	(revision 4081)
@@ -15,12 +15,14 @@
 : PIBaseWdgGen(par,nom,sx,sy,px,py)
 {
-	HIRect localHIRect;
+
+ HIRect localHIRect;
 	HIViewRef rootView;
 	HIViewRef contentView;
 	OSStatus err;
+	fName = nom;
 	
 	rootView = ((PIWdg*)par)->GetHIViewRef();
 	err = HIViewGetBounds (rootView, &localHIRect);
-												
+
 	err = HIScrollViewCreate(kHIScrollViewOptionsVertScroll | kHIScrollViewOptionsHorizScroll, &wdgHIView);
 	err += HIViewSetVisible (wdgHIView, true);	
@@ -40,8 +42,8 @@
 	err += HIViewGetFrame (wdgHIView, &localHIRect);
 	
-	printf("PIBaseWdgQuartz::PIBaseWdgQuartz Set Frame (%g %g) [%g %g] err : %d \n",
+	printf("PIBaseWdgQuartz::PIBaseWdgQuartz Set Frame (%g %g) [%g %g] err : %d nom:%s\n",
 											localHIRect.origin.x, localHIRect.origin.y,
 											localHIRect.size.width, localHIRect.size.height,
-											err);
+											err,nom);
 
 	err = InstallEventHandler (GetControlEventTarget (wdgHIView),
@@ -53,5 +55,5 @@
 
 	HIViewRender(wdgHIView);
-
+	FinishCreate();
 	mWGrC = new PIGraphicWin(this);
 }
@@ -117,5 +119,6 @@
 void PIBaseWdgQuartz::Refresh()
 {
-	printf("PIBaseWdgQuartz::Refresh ");
+//	return;
+	printf("---->> PIBaseWdgQuartz::Refresh -%s- context:%lx\n",fName,mWGrC->GetCGContext());
 	EventRef	rEvent;
 	OSStatus err;
@@ -130,5 +133,4 @@
 	HIViewGetFrame(wdgHIView, &hiRect);
 
-	CGContextRestoreGState (mWGrC->GetCGContext());
 	printf(" cg : %lx ox : %g oy : %g width : %g height : %g \n",
 			mWGrC->GetCGContext(), hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);
@@ -142,9 +144,15 @@
 void PIBaseWdgQuartz::eXposeProcess(CGContextRef cg, int x0, int y0, int dx, int dy)
 {
-	printf("PIBaseWdgQuartz::ExposeProcess \n");
-	CGContextSaveGState(cg);
-	mWGrC->SetCGContext(cg);
-	mWGrC->SetCTM(CGContextGetCTM(cg));
+	printf("PIBaseWdgQuartz::ExposeProcess -%s- to x:%d y:%d dx:%d dy:%d\n",fName,x0,y0,dx,dy);
+	if (mWGrC->GetCGContext() == NULL) {
+		mWGrC->SetCGContext(cg);
+		printf("PIBaseWdgQuartz::ExposeProcess CHANGE context to %lx\n",cg);
+		mWGrC->SetCTM(CGContextGetCTM(cg));
+	}
+	printf("PIBaseWdgQuartz::ExposeProcess set CTM to %lx\n",cg);
+	CGContextSaveGState(mWGrC->GetCGContext());
 	Draw(mWGrC, x0, y0, dx, dy);
+//	CGContextRestoreGState (cg);
+	CGContextRestoreGState (mWGrC->GetCGContext());
 
 	return;
@@ -160,13 +168,92 @@
 	
 	counterDraw++;
-	printf(" BaseWdgQuartzEventHandler (%d) : ", counterDraw);
 	PIGetEventName(event);
 
 	PIBaseWdgQuartz* wdg = (PIBaseWdgQuartz*) userData;
+	printf("\n BaseWdgQuartzEventHandler -%s- (%d) : ", wdg->fName,counterDraw);
+	printf("\n");
 
 	CGContextRef cg;
-		
+	WindowRef           window;
+    Rect                bounds;
+	if (!wdg)
+        return status;
+	
     status = GetEventParameter (event, kEventParamCGContextRef, typeCGContextRef, NULL, sizeof (CGContextRef), NULL, &cg);
 
+	switch(GetEventClass(event))
+    {
+/*        case kEventClassTablet:
+        case kEventClassMouse:
+            if (w->handleMouseEvent(event))
+                result = noErr;
+            break;
+        case kEventClassKeyboard:
+            if (w->handleKeyboardEvent(event))
+                result = noErr;
+            break;
+            
+*/        case kEventClassWindow: {
+			
+            switch (GetEventKind(event))
+			{
+				case kEventWindowBoundsChanging:
+					// left the code for live-resizing, but it is not used, because of window-refreshing issues...
+					GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof(Rect), NULL, &bounds );
+					
+//					wdg->adaptResize(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top);
+//					wdg->requestRedraw();
+					status = noErr;
+					break;
+					
+				case kEventWindowBoundsChanged:
+					InvalWindowRect(window, GetWindowPortBounds(window, &bounds));
+					GetWindowBounds(window, kWindowContentRgn, &bounds);
+//					wdg->adaptResize(bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top);
+					status = noErr;
+					break;
+                    
+				case kEventWindowClose:
+//					wdg->requestClose();
+					status = noErr;
+					break;
+					
+				default: 
+					break;
+			}
+		break;	
+		}
+		case kEventClassControl : {			
+			case kEventControlDraw: {
+				// wdg->SetQuartzCGContext(cg);
+				HIViewRef view = wdg->GetHIViewRef();
+				HIRect hiRect;
+				HIViewGetFrame(view, &hiRect);
+				// Pour le moment on rafraichit toute la vue
+				int ox = (int)(hiRect.origin.x);
+				int oy = (int)(hiRect.origin.x);
+				int dx = (int)(hiRect.size.width); 
+				int dy = (int)(hiRect.size.height);
+				printf("-->> PIbWdgquartz::BaseWdgQuartzEventHandler -%s- cg : %lx [%d %d] Frame [%d, %d] \n", wdg->fName,(unsigned long)cg, ox, oy, dx, dy);
+			
+				HIRect      bounds;
+				HIViewGetBounds ((HIViewRef) userData, &bounds);
+				printf("-->> PIbWdgquartz::BaseWdgQuartzEventHandler BOUNDS [%f %f] SIZE [%f, %f] \n",hiRect.origin.x,hiRect.origin.y,hiRect.size.width,hiRect.size.height);
+				//		err = HIViewSetFrame (wdgHIView, &localHIRect);
+				
+				wdg->eXposeProcess(cg, 0 , 0, dx, dy);
+			}
+			break;
+		}
+			break;	
+        default:
+            printf("unknown: %g\n",GetEventClass(event));
+            break;
+    }
+	
+	/////
+	
+	
+	
 	if (status != noErr)
 	{
@@ -175,5 +262,6 @@
 	else
 	{	
-		// wdg->SetQuartzCGContext(cg);
+/*
+ // wdg->SetQuartzCGContext(cg);
 		HIViewRef view = wdg->GetHIViewRef();
 		HIRect hiRect;
@@ -185,5 +273,12 @@
 		int dy = (int)(hiRect.size.height);
 		printf(" BaseWdgQuartzEventHandler cg : %lx [%d %d] Frame [%d, %d] \n", (unsigned long)cg, ox, oy, dx, dy);
+		
+		HIRect      bounds;
+		HIViewGetBounds ((HIViewRef) userData, &bounds);
+		printf(" BaseWdgQuartzEventHandler BOUNDS [%f %f] SIZE [%f, %f] \n",hiRect.origin.x,hiRect.origin.y,hiRect.size.width,hiRect.size.height);
+//		err = HIViewSetFrame (wdgHIView, &localHIRect);
+		
 		wdg->eXposeProcess(cg, 0 , 0, dx, dy);
+*/
 	}
 
Index: /trunk/SophyaPI/PI/Quartz/pibwdgquartz.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pibwdgquartz.h	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/pibwdgquartz.h	(revision 4081)
@@ -36,5 +36,5 @@
 */
 
-static const EventTypeSpec basewdgSpec[] = {{ kEventClassControl, kEventControlDraw}};
+static const EventTypeSpec basewdgSpec[] = {{ kEventClassControl, kEventControlDraw},{kEventWindowBoundsChanged,kEventWindowResizeCompleted}};
 
 
@@ -73,4 +73,5 @@
 //  Appel depuis le PIXtBaseWidget uniquement (ExposeEvt de Xt )
   virtual void       eXposeProcess(CGContextRef cg, int x0, int y0, int dx, int dy);
+	const char *fName;
  
 protected:
Index: /trunk/SophyaPI/PI/Quartz/pigraphquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pigraphquartz.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/pigraphquartz.cpp	(revision 4081)
@@ -150,5 +150,7 @@
 	CGContextSetLineWidth (cgContext, 2);
 	CGContextStrokePath (cgContext);
-	CGContextClosePath (cgContext);
+
+	printf("PIGraphicQuartz::DrawLine Path\n");
+//	CGContextClosePath (cgContext);
 	CGContextFlush(cgContext);
 
@@ -240,5 +242,6 @@
 	CGContextAddLines(cgContext, points, n);
 	
-	CGContextClosePath(cgContext);
+	printf("PIGraphicQuartz::DrawPolygone ContextClosePath\n");
+//	CGContextClosePath(cgContext);
 	CGContextStrokePath(cgContext);
 	CGContextFlush(cgContext);
@@ -265,5 +268,6 @@
 	CGContextAddLines(cgContext, points, n);
 	
-	CGContextClosePath(cgContext);
+	printf("PIGraphicQuartz::DrawFPolygone ContextClosePath context:%lx /n",cgContext);
+//	CGContextClosePath(cgContext);
 	CGContextFillPath(cgContext);
 	CGContextFlush(cgContext);
@@ -290,5 +294,7 @@
 	CGContextAddArc (cgContext, xf, yf, radius, startAngle, endAngle, 0);
 	CGContextStrokePath(cgContext);
-	CGContextClosePath(cgContext);
+	
+	printf("PIGraphicQuartz::DrawArc ContextClosePath context:%lx \n",cgContext);
+//	CGContextClosePath(cgContext);
 	CGContextFlush(cgContext);
 
@@ -312,5 +318,6 @@
 	CGContextMoveToPoint (cgContext, xd, yd);
 	CGContextAddArc (cgContext, xf, yf, radius, startAngle, endAngle, 0);
-	CGContextClosePath(cgContext);
+	printf("PIGraphicQuartz::DrawFArc ContextClosePath\n");
+//	CGContextClosePath(cgContext);
 	CGContextFillPath(cgContext);
 	CGContextFlush(cgContext);
@@ -784,5 +791,6 @@
 	CGContextAddRect(cgContext, cgRect);
 
-	CGContextClosePath (cgContext);
+	printf("PIGraphicQuartz::SetClipRectangle ContextClosePath\n");
+//	CGContextClosePath (cgContext);
 	CGContextClip(cgContext);
 	CGContextFlush(cgContext);	
@@ -890,18 +898,23 @@
 void PIGraphicQuartz::SetCGContext(CGContextRef cg)
 {
-	if (cgContext != NULL)
-	{
-		printf("PIGraphicQuartz::SetCGContext Release CGContext %lx \n", (unsigned long)cgContext);
-		CGContextRelease (cgContext);
-		cgContext = NULL;
+	if (cgContext != NULL) return;
+
+	printf("PIGraphicQuartz::SetCGContext ---try to change %lx to %lx\n", (unsigned long)cgContext, (unsigned long)cg);
+	if (cgContext != cg) {
+		if (cgContext != NULL)
+			{
+				printf("PIGraphicQuartz::SetCGContext Release CGContext %lx \n", (unsigned long)cgContext);
+				CGContextRelease (cgContext);
+				cgContext = NULL;
+			}
+	
+		cgContext = CGContextRetain(cg);
+
 	}
-	
-	cgContext = CGContextRetain(cg);
-
 	HIRect hiRect;
 	HIViewGetFrame(hiViewRef, &hiRect);
 
-	printf("PIGraphicQuartz::SetCGContext Frame ox : %g oy : %g width : %g height : %g \n",
-			hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);
+	printf("PIGraphicQuartz::SetCGContext Frame ox : %g oy : %g width : %g height : %g  cg : %lx \n",
+			hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height, (unsigned long)cg);
 	// SetGCRect(hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);
 	return;
@@ -917,4 +930,5 @@
 	cgAffineTransform.tx = cat.tx;
 	cgAffineTransform.ty = cat.ty;
+	printf("PIGraphicQuartz::SetCTM a:%d b:%d c:%d d:%d tx:%d ty:%d\n",cat.a,cat.b,cat.c,cat.d,cat.tx,cat.ty);
 	return;
 }
@@ -924,5 +938,5 @@
 void PIGraphicQuartz::SetGCRect(float x0, float y0, float dx, float dy)
 {
-	printf("PIGraphicQuartz::SetGCRect %g %g %g %g \n", x0, y0, dx, dy);
+	printf("PIGraphicQuartz::SetGCRect %g %g %g %g CONTEXT:%lx \n", x0, y0, dx, dy,(unsigned) cgContext);
 //	CGAffineTransform cat;
 	CGContextScaleCTM (cgContext, 1., 1.);
Index: /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.cpp	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.cpp	(revision 4081)
@@ -355,2 +355,45 @@
 }
 
+
+PIScrollBarQuartz::PIScrollBarQuartz(PIContainerQuartz *par, const char *nom, PIMessage msg, 
+									 int dir, int sx, int sy, int px, int py)
+: PIScrollBarGen(par, nom, msg, dir, sx, sy, px, py){
+	printf("PIScrollBarQuartz:PIScrollBarQuartz:   NOT IMPLEMENTED\n");
+}
+
+void PIScrollBarQuartz::GetMinMax(int& min, int& max){
+	printf("PIScrollBarQuartz::GetMinMax   NOT IMPLEMENTED\n");
+}
+
+
+int PIScrollBarQuartz::GetValue(){
+	printf("PIScrollBarQuartz::GetValue   NOT IMPLEMENTED\n");
+	return 0;
+}
+
+
+int PIScrollBarQuartz::GetSlSize(){
+	printf("PIScrollBarQuartz::GetSlSize   NOT IMPLEMENTED\n");
+	return 0;
+}
+
+
+void PIScrollBarQuartz::SetMinMax(int, int){
+	printf("PIScrollBarQuartz::SetMinMax   NOT IMPLEMENTED\n");
+}
+
+
+void PIScrollBarQuartz::SetSlSize(int){
+	printf("PIScrollBarQuartz::SetSlSize   NOT IMPLEMENTED\n");
+}
+
+
+void PIScrollBarQuartz::ActivateDrag(bool){
+	printf("PIScrollBarQuartz::ActivateDrag   NOT IMPLEMENTED\n");
+}
+
+
+void PIScrollBarQuartz::SetValue(int){
+	printf("PIScrollBarQuartz::SetValue   NOT IMPLEMENTED\n");
+}
+
Index: /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.h	(revision 4080)
+++ /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.h	(revision 4081)
@@ -120,4 +120,20 @@
 };
 
+class PIScrollBarQuartz : public PIScrollBarGen
+{
+public:
+	PIScrollBarQuartz(PIContainerQuartz *par, const char *nom, PIMessage msg = PIMsg_Click, 
+					  int dir=kSDirUpDown, int sx=10, int sy=100, int px=0, int py=0);
+	void SetMinMax(int, int);
+	void SetSlSize(int);
+	void SetValue(int);
+	void ActivateDrag(bool);
+    void GetMinMax(int&, int&);
+	void GetMinMax(int, int);
+	int GetValue();
+	int GetSlSize();
+
+};
+
 // INTERFACES
 
@@ -129,4 +145,5 @@
 typedef PITextQuartz PIText;
 typedef PIHITextViewQuartz PITextView;
+typedef PIScrollBarQuartz PIScrollBar;
 
 #endif
