Bringing supported IDEs to the newest setup, add device and others.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

fltk.db

@@ -778,6 +778,11 @@ xcBuildFileID:774DAACD58B34BAEED719F2F
 refUUID:5D979C5A-E01A-4608-BF2C-BB7BD45BB106
 xcBuildFileID:3925A2C836A3D9436B2F5D5B
 
+[./targets/libs/982AD0F7-700A-4C40-846E-A23239AB0E2D/sources/CF8C9601-9B96-42CD-AB08-1043D1EDBE13]
+
+refUUID:DA31845E-704F-44AD-B439-BF9517EDC791
+xcBuildFileID:8A73EAA22C66E44953BAA28A
+
 [./targets/libs/982AD0F7-700A-4C40-846E-A23239AB0E2D/fl]
 
 
@@ -2233,6 +2238,12 @@ refUUID:84764B86-38CA-48AC-B49D-0101411A3C5D
 xcProxyID:D90A117B02F23E0E7D156633
 xcDependencyID:8B309F2A831E82D3D8724F0A
 
+[./targets/tests/2EEA01B7-24E9-4BA0-94C0-4DC0121602CB/deps/2C47A462-B472-4D88-B340-DD845D6ED111]
+
+refUUID:7CCA2C18-B430-4165-B850-349B3D2E90C7
+xcProxyID:EB04530E4E61494827A1E540
+xcDependencyID:C7DE7384FE9152E3261E4047
+
 [./targets/tests/2EEA01B7-24E9-4BA0-94C0-4DC0121602CB/libs]
 
 
@@ -3351,6 +3362,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcProxyID:62DAD26201BA846B915C3901
 xcDependencyID:A801D82742F131BE27270ED8
 
+[./targets/tests/A80C35E8-4173-446F-9FE6-EED946E21370/deps/B129808F-E756-4441-95AF-2767914AFA43]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcProxyID:1B7A1E034C20979783BC7559
+xcDependencyID:364457A55C13947E128A41B0
+
 [./targets/tests/A80C35E8-4173-446F-9FE6-EED946E21370/libs]
 
 
@@ -3378,6 +3395,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcBuildFrameworkID:184001B55F948B1C6EDBC8E6
 xcCopyFrameworkID:FC0B602C10D5747249AF8ECE
 
+[./targets/tests/A80C35E8-4173-446F-9FE6-EED946E21370/libs/10D865BC-7FE0-4328-9711-E472CBF17C77]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcBuildFrameworkID:9CCBA0A51ECC3A82845AA9BB
+xcCopyFrameworkID:D6F372A74899376AA24DAAE1
+
 [./targets/tests/A80C35E8-4173-446F-9FE6-EED946E21370/fl]
 
 
@@ -3928,6 +3951,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcProxyID:E87A4E16315A1E3CEE321FC5
 xcDependencyID:B1A79BF37F7ACB556277AC75
 
+[./targets/tests/09D173B1-589B-4C80-975A-98524996FE55/deps/303CEF3E-55BF-4D3D-A4DE-8C21BBFBA8FA]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcProxyID:E5C2F680001A3B238AADBF1E
+xcDependencyID:5419D07D37B077D9993523A2
+
 [./targets/tests/09D173B1-589B-4C80-975A-98524996FE55/libs]
 
 
@@ -3955,6 +3984,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcBuildFrameworkID:1CD20B845413AA38ABB3D177
 xcCopyFrameworkID:1FBAD2CB2A0EECF6C11376E6
 
+[./targets/tests/09D173B1-589B-4C80-975A-98524996FE55/libs/78F7C7E7-B933-4593-BB5C-E6E4C6852C8F]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcBuildFrameworkID:CBCBB0F7273F5E87C5319C59
+xcCopyFrameworkID:1566743BE8AE6803E85BD2E5
+
 [./targets/tests/09D173B1-589B-4C80-975A-98524996FE55/fl]
 
 
@@ -4909,6 +4944,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcProxyID:792B7F03C913620DC60098C0
 xcDependencyID:4142A90541A440E70B01DADF
 
+[./targets/tests/6DC59E0F-57D3-4BD3-9ECE-20E186AE1EEE/deps/3C5AE8EA-A7BD-4CD4-8A10-22B1530E1C51]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcProxyID:E6479FD45685BEEC904CE4EC
+xcDependencyID:6C32ACACC6C8AD0D09F19138
+
 [./targets/tests/6DC59E0F-57D3-4BD3-9ECE-20E186AE1EEE/libs]
 
 
@@ -4936,6 +4977,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcBuildFrameworkID:FBAB3A3E532356CCD5EC149A
 xcCopyFrameworkID:BBF2937010433FC8330848E8
 
+[./targets/tests/6DC59E0F-57D3-4BD3-9ECE-20E186AE1EEE/libs/1A8A2F8F-E21C-494C-BF8A-0C16287231B4]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcBuildFrameworkID:1288B57B5689804060302B8F
+xcCopyFrameworkID:07A67F0F881A23CE04F7A759
+
 [./targets/tests/6DC59E0F-57D3-4BD3-9ECE-20E186AE1EEE/fl]
 
 
@@ -5420,6 +5467,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcProxyID:F19421D320AC9943032F7F3F
 xcDependencyID:C0C52658489C8F9723054519
 
+[./targets/tests/9A44D29B-A937-4BD3-99E6-E8152F12A8A0/deps/9AD9F0C6-E06E-42C4-81B8-5F552DFABF41]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcProxyID:028233435E22144AC6628A7A
+xcDependencyID:20CDEBD45BD260C38AC9AC30
+
 [./targets/tests/9A44D29B-A937-4BD3-99E6-E8152F12A8A0/libs]
 
 
@@ -5447,6 +5500,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcBuildFrameworkID:6B00F072549D0C060CE2A389
 xcCopyFrameworkID:517AA14AE0A60761F032DCA9
 
+[./targets/tests/9A44D29B-A937-4BD3-99E6-E8152F12A8A0/libs/75EC6ED0-EE58-47AD-93F1-845FFF247135]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcBuildFrameworkID:4F33F7B12AA45847FB7F618D
+xcCopyFrameworkID:DD3C7D27FBFEAA913E5E3561
+
 [./targets/tests/9A44D29B-A937-4BD3-99E6-E8152F12A8A0/externals]
 
 
@@ -5755,6 +5814,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcProxyID:42E6CBDD39074578140D47EB
 xcDependencyID:B8DA36BE0E96B412705DCDA6
 
+[./targets/tests/5ACC33B6-2B6E-4089-B7C2-0AF930999ED1/deps/FBB4F4BA-B809-4406-9C81-E9C2FD23B0DB]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcProxyID:1BA35E5363B62D9361E61032
+xcDependencyID:A6698D219A361A5FF2AF94DF
+
 [./targets/tests/5ACC33B6-2B6E-4089-B7C2-0AF930999ED1/libs]
 
 
@@ -5782,6 +5847,12 @@ refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
 xcBuildFrameworkID:5A87668D90E6B34F463BBBF3
 xcCopyFrameworkID:4B6B691C73449E5F093B5AD2
 
+[./targets/tests/5ACC33B6-2B6E-4089-B7C2-0AF930999ED1/libs/F57DA583-E7CD-4AAF-9BD3-B477B399D56F]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcBuildFrameworkID:08A0CF2F8B1715967D0811FE
+xcCopyFrameworkID:77A06648EF3445AFA35A2035
+
 [./targets/tests/5ACC33B6-2B6E-4089-B7C2-0AF930999ED1/fl]
 
 
@@ -5935,6 +6006,101 @@ xcCopyFrameworkID:A125F5E3FB0C0EC279928B97
 [./targets/tests/84764B86-38CA-48AC-B49D-0101411A3C5D/externals]
 
 
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7]
+
+name:device
+xcBuildRuleFlID:E76FE2A3FCDDB29D691D444E
+xcTargetID:8C3A8B7F93BE1F0B5321F04A
+xcBuildCopyFilesID:D63EE380D637CDE3C278F053
+xcProductID:CE1B91A86A673AD693E3D089
+xcBuildFrameworksID:DD4EBB2EBD6FDF5F022EE130
+xcTargetGroupID:376ACF4385A1675763EDD060
+xcBuildConfigurationListID:50B2C680AF98F25C57B9D690
+xcBuildResourcesID:4113FA086EC48B37CF028E2F
+xcBuildSourcesID:6C3738BDB38E7B2E154DC6E1
+xcBuildConfigurationDebugID:4FC9C90F1B418B0E5CCAE037
+xcBuildConfigurationReleaseID:0F9E581BEDF843DB070C8DE4
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/sources]
+
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/sources/CD6EA611-91D0-4C36-B363-0FA53FEBB0CF]
+
+refUUID:A11942CB-1F6A-4199-BF45-B18E28B358EC
+xcBuildFileID:C9603E2EF91824FAFDAB4652
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/deps]
+
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/deps/E18820E3-1D4A-492D-8CBC-A53599618E17]
+
+refUUID:982AD0F7-700A-4C40-846E-A23239AB0E2D
+xcProxyID:693C5B2FB1B9FED6F28B27C5
+xcDependencyID:F8B80A82047A3912AC6A5749
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/deps/9A43057F-618F-4C39-9904-A268C42981AE]
+
+refUUID:FF3EB133-9A23-4254-AAD9-70BAE5BB6205
+xcProxyID:6B467AA9E8F804D517B8E090
+xcDependencyID:0B506464812C55FE06F7F01A
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/deps/03BCDA4E-0DDB-41A1-84E1-C593D88393DA]
+
+refUUID:500E3371-9A3D-4593-B7AA-987553C8BFE1
+xcProxyID:E263D20DD7FDD23C7213FCCC
+xcDependencyID:B79199ED0E3437B00D3F9CEE
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/deps/9FE2DA93-B76B-4765-8708-C0469B0DD1E9]
+
+refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
+xcProxyID:F61B465353BF817B4F1B98D0
+xcDependencyID:C4FE6FD5C8C688D149E744ED
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/deps/F4E8BB9D-175C-46F8-B616-AAAF3B10BD32]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcProxyID:DAC3F418AFCE55E801F51FF5
+xcDependencyID:C4AFAB186040DCD63082D802
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/libs]
+
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/libs/E7C7F719-58B2-431B-95FB-04BEC54619AD]
+
+refUUID:982AD0F7-700A-4C40-846E-A23239AB0E2D
+xcBuildFrameworkID:B220C8BACFB1FF8B576683AE
+xcCopyFrameworkID:ADDAB9A51B3AB1CEAF990B5A
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/libs/B830DD1C-93BA-4ED6-A5D9-AE10C5F52C2B]
+
+refUUID:FF3EB133-9A23-4254-AAD9-70BAE5BB6205
+xcBuildFrameworkID:CAE74E0204978B1EE0CB2685
+xcCopyFrameworkID:CB945D33E3E0BB60BC908A4D
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/libs/D9992009-F74D-4553-804A-F5ACEA71C494]
+
+refUUID:500E3371-9A3D-4593-B7AA-987553C8BFE1
+xcBuildFrameworkID:CD845F2C2B8FBF4F02C2A77B
+xcCopyFrameworkID:6C756EB7FA75EE8310B7A71F
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/libs/192F0215-583A-4D7D-A322-13D48478CF3D]
+
+refUUID:F06A6DCB-D1BD-44D3-9949-D61A5814CF65
+xcBuildFrameworkID:D4DBAC5AA58E3AD65D0810A6
+xcCopyFrameworkID:3E1B4DE7C626C5C0109E2B58
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/libs/1A91D458-077A-4466-AFFA-1C87F5B1BA8C]
+
+refUUID:ED07EBB8-E19B-4240-B570-623DE27898C6
+xcBuildFrameworkID:0E2B483A47D626A47736A239
+xcCopyFrameworkID:12C3AB72180B133BA74F442C
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/fl]
+
+
+[./targets/tests/7CCA2C18-B430-4165-B850-349B3D2E90C7/externals]
+
+
 [./files]
 
 
@@ -7693,6 +7859,16 @@ xcFileID:23F7BCB45F5B0545BD1884A1
 pathAndName:src/Fl_Gl_Device_Plugin.cxx
 xcFileID:5D188953C0E0216E287719DA
 
+[./files/A11942CB-1F6A-4199-BF45-B18E28B358EC]
+
+pathAndName:test/device.cxx
+xcFileID:AE541F73BF89F614E5BCC604
+
+[./files/DA31845E-704F-44AD-B439-BF9517EDC791]
+
+pathAndName:src/Fl_Abstract_Printer.cxx
+xcFileID:5E130C0AC8879054117937D5
+
 [./ide]
 
 

fluid/ide_support.cxx

@@ -344,6 +344,7 @@ int create_new_database(const char *filename)
   
   Fl_Target_Prefs fltk_lib(libs_db.add_with_key("name", "fltk")); {
     fltk_lib.add_source(files_db, "src/Fl.cxx");
+    fltk_lib.add_source(files_db, "src/Fl_Abstract_Printer.cxx");
     fltk_lib.add_source(files_db, "src/Fl_Adjuster.cxx");
     fltk_lib.add_source(files_db, "src/Fl_Bitmap.cxx");
     fltk_lib.add_source(files_db, "src/Fl_Box.cxx");
@@ -653,6 +654,7 @@ int create_new_database(const char *filename)
     fluid_app.add_lib(fltk_images_lib);
     fluid_app.add_lib(fltk_jpeg_lib);
     fluid_app.add_lib(fltk_png_lib);
+    fluid_app.add_lib(fltk_z_lib);
     visualc_only(fluid_app.add_lib(fltk_z_lib));
     xcode_only(fluid_app.add_external_lib(files_db, "icons/fluid.icns"));
   }
@@ -784,6 +786,16 @@ int create_new_database(const char *filename)
     demo_db.depends_on(db);
   }  
   
+  { Fl_Target_Prefs db(tests_db.add_with_key("name", "device"));
+    db.add_source(files_db, "test/device.cxx");
+    db.add_lib(fltk_lib); 
+    db.add_lib(fltk_images_lib); 
+    db.add_lib(fltk_jpeg_lib); 
+    db.add_lib(fltk_png_lib); 
+    db.add_lib(fltk_z_lib);
+    demo_db.depends_on(db);
+  }  
+  
   { Fl_Target_Prefs db(tests_db.add_with_key("name", "doublebuffer"));
     db.add_source(files_db, "test/doublebuffer.cxx");
     db.add_lib(fltk_lib); 
@@ -809,6 +821,7 @@ int create_new_database(const char *filename)
     db.add_lib(fltk_images_lib); 
     db.add_lib(fltk_jpeg_lib); 
     db.add_lib(fltk_png_lib); 
+    db.add_lib(fltk_z_lib);
     demo_db.depends_on(db);
   }  
   
@@ -883,6 +896,7 @@ int create_new_database(const char *filename)
     db.add_lib(fltk_images_lib); 
     db.add_lib(fltk_jpeg_lib); 
     db.add_lib(fltk_png_lib); 
+    db.add_lib(fltk_z_lib);
     demo_db.depends_on(db);
   }  
   
@@ -1007,6 +1021,7 @@ int create_new_database(const char *filename)
     db.add_lib(fltk_images_lib); 
     db.add_lib(fltk_jpeg_lib); 
     db.add_lib(fltk_png_lib); 
+    db.add_lib(fltk_z_lib);
     demo_db.depends_on(db);
   }  
   
@@ -1072,6 +1087,7 @@ int create_new_database(const char *filename)
     db.add_lib(fltk_images_lib); 
     db.add_lib(fltk_jpeg_lib); 
     db.add_lib(fltk_png_lib); 
+    db.add_lib(fltk_z_lib);
     xcode_only(db.add_external_lib(files_db, "/System/Library/Frameworks/CoreAudio.framework"));
     visualc_only(db.add_external_lib(files_db, "winmm.lib"));
     demo_db.depends_on(db);
@@ -1114,6 +1130,7 @@ int create_new_database(const char *filename)
     db.add_lib(fltk_images_lib); 
     db.add_lib(fltk_jpeg_lib); 
     db.add_lib(fltk_png_lib); 
+    db.add_lib(fltk_z_lib);
     demo_db.depends_on(db);
   }  
   

fluid/ide_visualc.cxx

@@ -331,7 +331,7 @@ public:
         fprintf(f, "%s ", pathAndName);
       }
     }
-    fprintf(f, "comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:\"libcd\" /out:\"../../%s/%sd.exe\" /pdbtype:sept /libpath:\"..\\..\\lib\"\r\n", dir, name);
+    fprintf(f, "comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:\"libcd\" /out:\"../../%s/%s.exe\" /pdbtype:sept /libpath:\"..\\..\\lib\"\r\n", dir, name);
     
     fprintf(f, "# SUBTRACT LINK32 /pdb:none /incremental:yes\r\n");
     fprintf(f, "\r\n");

ide/VisualC6/CubeView.dsp

@@ -91,11 +91,11 @@ LINK32=link.exe
 # Name "CubeView - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\test\CubeMain.cxx
+SOURCE=..\..\test\CubeView.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\test\CubeView.cxx
+SOURCE=..\..\test\CubeMain.cxx
 # End Source File
 # Begin Source File
 

ide/VisualC6/Fluid.dsp

@@ -91,34 +91,10 @@ LINK32=link.exe
 # Name "Fluid - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\fluid\about_panel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\fluid\align_widget.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\fluid\alignment_panel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\fluid\code.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\fluid\CodeEditor.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\fluid\factory.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\fluid\file.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\fluid\Fl_Function_Type.cxx
 # End Source File
 # Begin Source File
@@ -143,19 +119,39 @@ SOURCE=..\..\fluid\Fl_Window_Type.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\fluid\fluid.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\fluid\Fluid_Image.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\fluid\function_panel.cxx
+SOURCE=..\..\fluid\about_panel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\fluid\ide_maketools.cxx
+SOURCE=..\..\fluid\align_widget.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\alignment_panel.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\code.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\factory.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\file.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\fluid.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\function_panel.cxx
 # End Source File
 # Begin Source File
 
@@ -185,5 +181,9 @@ SOURCE=..\..\fluid\undo.cxx
 
 SOURCE=..\..\fluid\widget_panel.cxx
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\ide_maketools.cxx
+# End Source File
 # End Target
 # End Project

ide/VisualC6/file_chooser.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "file_chooser - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 

ide/VisualC6/fltk.dsp

@@ -677,5 +677,9 @@ SOURCE=..\..\src\Fl_Printer.cxx
 
 SOURCE=..\..\src\ps_image.cxx
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Abstract_Printer.cxx
+# End Source File
 # End Target
 # End Project

ide/VisualC6/fltkdll.dsp

@@ -685,5 +685,9 @@ SOURCE=..\..\src\Fl_Printer.cxx
 
 SOURCE=..\..\src\ps_image.cxx
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Abstract_Printer.cxx
+# End Source File
 # End Target
 # End Project

ide/VisualC6/help.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "help - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/helpd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/helpd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 

ide/VisualC6/native-filechooser.dsp

@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "native-filechooser - Win32 Debug"
 # Begin Source File
 
-SOURCE="..\..\test\native-filechooser.cxx"
+SOURCE=..\..\test\native-filechooser.cxx
 # End Source File
 # End Target
 # End Project

ide/VisualC6/pixmap_browser.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browser.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "pixmap_browser - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 

ide/VisualC6/sudoku.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "sudoku - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudokud.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudokud.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 

ide/VisualC6/tiled_image.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "tiled_image - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no
 
 !ENDIF 

src/fl_ask.cxx

@@ -67,7 +67,7 @@ static char avoidRecursion = 0;
 
 // sets the global return value (ret_val) and closes the window
 static void button_cb(Fl_Widget *bt, void *val) {
-  ret_val = (int)val;
+  ret_val = (int)(long)val;
   message_form->hide();
 }
 

test/demo.cxx

@@ -92,6 +92,7 @@ const char *default_menu[] = {
   "@e:Block\\nAttack!:blocks\n",
   "@e:Checkers:checkers\n",
   "@e:Sudoku:sudoku\n",
+  "@e:Print\nsupport:device\n",
   "\n",
   "@main:Other\\nTests:@o\n",
   "@o:Color Choosers:color_chooser\n",

test/device.cxx

@@ -172,7 +172,7 @@ protected:
     fl_xyline(x()+5,y()+61,x()+48);
     fl_line_style(FL_DASHDOTDOT);
     fl_xyline(x()+5,y()+64,x()+48);
-    fl_line_style(0,0,"\7\3\7\2");
+    fl_line_style(0,0,(char*)"\7\3\7\2");
     fl_xyline(x()+5,y()+67,x()+48);
 
 
@@ -460,7 +460,7 @@ protected:
 
 
     fl_color(FL_BLUE);
-    fl_line_style(0, 5, "\12\3\4\2\2\1");
+    fl_line_style(0, 5, (char*)"\12\3\4\2\2\1");
     fl_begin_line();
     fl_vertex(10, 10);
     fl_vertex(190, 10);