236 files changed, 183 insertions, 95 deletions

diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index 569f3b178..0d0f4c272 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -49,11 +49,11 @@ class Fl_Graphics_Driver;
 class Fl_Display_Device;
 class Fl_Surface_Device;
 /** \brief Points to the driver that currently receives all graphics requests */
-extern Fl_Graphics_Driver *fl_graphics_driver;
+FL_EXPORT extern Fl_Graphics_Driver *fl_graphics_driver;
 /** \brief Points to the surface that currently receives all graphics requests */
-extern Fl_Surface_Device *fl_surface;
+FL_EXPORT extern Fl_Surface_Device *fl_surface;
 /** \brief Points to the platform's display */
-extern Fl_Display_Device *fl_display_device;
+FL_EXPORT extern Fl_Display_Device *fl_display_device;
 
 /**
  signature of image generation callback function.
diff --git a/ide/unsupported/README.BC b/ide/deprecated/README.BC
index cbd85a63c..cbd85a63c 100644
--- a/ide/unsupported/README.BC
+++ b/ide/deprecated/README.BC
diff --git a/ide/unsupported/README.MS b/ide/deprecated/README.MS
index ef64fac71..ef64fac71 100644
--- a/ide/unsupported/README.MS
+++ b/ide/deprecated/README.MS
diff --git a/ide/unsupported/borland/bc5/config.h b/ide/deprecated/borland/bc5/config.h
index 34d88e0c6..34d88e0c6 100644
--- a/ide/unsupported/borland/bc5/config.h
+++ b/ide/deprecated/borland/bc5/config.h
diff --git a/ide/unsupported/borland/bc5/fltk.ide b/ide/deprecated/borland/bc5/fltk.ide
index 16ece51bc..16ece51bc 100644
--- a/ide/unsupported/borland/bc5/fltk.ide
+++ b/ide/deprecated/borland/bc5/fltk.ide
diff --git a/ide/unsupported/borland/bc5/opengl32.lib b/ide/deprecated/borland/bc5/opengl32.lib
index b427a64f5..b427a64f5 100644
--- a/ide/unsupported/borland/bc5/opengl32.lib
+++ b/ide/deprecated/borland/bc5/opengl32.lib
diff --git a/ide/unsupported/borland/borlandc/README b/ide/deprecated/borland/borlandc/README
index 6196470e2..6196470e2 100644
--- a/ide/unsupported/borland/borlandc/README
+++ b/ide/deprecated/borland/borlandc/README
diff --git a/ide/unsupported/borland/borlandc/arc.bpf b/ide/deprecated/borland/borlandc/arc.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/arc.bpf
+++ b/ide/deprecated/borland/borlandc/arc.bpf
diff --git a/ide/unsupported/borland/borlandc/arc.bpr b/ide/deprecated/borland/borlandc/arc.bpr
index 68842d3f5..68842d3f5 100644
--- a/ide/unsupported/borland/borlandc/arc.bpr
+++ b/ide/deprecated/borland/borlandc/arc.bpr
diff --git a/ide/unsupported/borland/borlandc/arc.res b/ide/deprecated/borland/borlandc/arc.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/arc.res
+++ b/ide/deprecated/borland/borlandc/arc.res
diff --git a/ide/unsupported/borland/borlandc/ask.bpf b/ide/deprecated/borland/borlandc/ask.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/ask.bpf
+++ b/ide/deprecated/borland/borlandc/ask.bpf
diff --git a/ide/unsupported/borland/borlandc/ask.bpr b/ide/deprecated/borland/borlandc/ask.bpr
index f5b7ead4e..f5b7ead4e 100644
--- a/ide/unsupported/borland/borlandc/ask.bpr
+++ b/ide/deprecated/borland/borlandc/ask.bpr
diff --git a/ide/unsupported/borland/borlandc/ask.res b/ide/deprecated/borland/borlandc/ask.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/ask.res
+++ b/ide/deprecated/borland/borlandc/ask.res
diff --git a/ide/unsupported/borland/borlandc/bitmap.bpf b/ide/deprecated/borland/borlandc/bitmap.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/bitmap.bpf
+++ b/ide/deprecated/borland/borlandc/bitmap.bpf
diff --git a/ide/unsupported/borland/borlandc/bitmap.bpr b/ide/deprecated/borland/borlandc/bitmap.bpr
index 219d9c63f..219d9c63f 100644
--- a/ide/unsupported/borland/borlandc/bitmap.bpr
+++ b/ide/deprecated/borland/borlandc/bitmap.bpr
diff --git a/ide/unsupported/borland/borlandc/bitmap.res b/ide/deprecated/borland/borlandc/bitmap.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/bitmap.res
+++ b/ide/deprecated/borland/borlandc/bitmap.res
diff --git a/ide/unsupported/borland/borlandc/boxtype.bpf b/ide/deprecated/borland/borlandc/boxtype.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/boxtype.bpf
+++ b/ide/deprecated/borland/borlandc/boxtype.bpf
diff --git a/ide/unsupported/borland/borlandc/boxtype.bpr b/ide/deprecated/borland/borlandc/boxtype.bpr
index 145219578..145219578 100644
--- a/ide/unsupported/borland/borlandc/boxtype.bpr
+++ b/ide/deprecated/borland/borlandc/boxtype.bpr
diff --git a/ide/unsupported/borland/borlandc/boxtype.res b/ide/deprecated/borland/borlandc/boxtype.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/boxtype.res
+++ b/ide/deprecated/borland/borlandc/boxtype.res
diff --git a/ide/unsupported/borland/borlandc/browser.bpf b/ide/deprecated/borland/borlandc/browser.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/browser.bpf
+++ b/ide/deprecated/borland/borlandc/browser.bpf
diff --git a/ide/unsupported/borland/borlandc/browser.bpr b/ide/deprecated/borland/borlandc/browser.bpr
index 2694c4aa8..2694c4aa8 100644
--- a/ide/unsupported/borland/borlandc/browser.bpr
+++ b/ide/deprecated/borland/borlandc/browser.bpr
diff --git a/ide/unsupported/borland/borlandc/browser.res b/ide/deprecated/borland/borlandc/browser.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/browser.res
+++ b/ide/deprecated/borland/borlandc/browser.res
diff --git a/ide/unsupported/borland/borlandc/button.bpf b/ide/deprecated/borland/borlandc/button.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/button.bpf
+++ b/ide/deprecated/borland/borlandc/button.bpf
diff --git a/ide/unsupported/borland/borlandc/button.bpr b/ide/deprecated/borland/borlandc/button.bpr
index 130c2223d..130c2223d 100644
--- a/ide/unsupported/borland/borlandc/button.bpr
+++ b/ide/deprecated/borland/borlandc/button.bpr
diff --git a/ide/unsupported/borland/borlandc/button.res b/ide/deprecated/borland/borlandc/button.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/button.res
+++ b/ide/deprecated/borland/borlandc/button.res
diff --git a/ide/unsupported/borland/borlandc/buttons.bpf b/ide/deprecated/borland/borlandc/buttons.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/buttons.bpf
+++ b/ide/deprecated/borland/borlandc/buttons.bpf
diff --git a/ide/unsupported/borland/borlandc/buttons.bpr b/ide/deprecated/borland/borlandc/buttons.bpr
index 35dce2ce4..35dce2ce4 100644
--- a/ide/unsupported/borland/borlandc/buttons.bpr
+++ b/ide/deprecated/borland/borlandc/buttons.bpr
diff --git a/ide/unsupported/borland/borlandc/buttons.res b/ide/deprecated/borland/borlandc/buttons.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/buttons.res
+++ b/ide/deprecated/borland/borlandc/buttons.res
diff --git a/ide/unsupported/borland/borlandc/checkers.bpf b/ide/deprecated/borland/borlandc/checkers.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/checkers.bpf
+++ b/ide/deprecated/borland/borlandc/checkers.bpf
diff --git a/ide/unsupported/borland/borlandc/checkers.bpr b/ide/deprecated/borland/borlandc/checkers.bpr
index baa37fe5a..baa37fe5a 100644
--- a/ide/unsupported/borland/borlandc/checkers.bpr
+++ b/ide/deprecated/borland/borlandc/checkers.bpr
diff --git a/ide/unsupported/borland/borlandc/checkers.res b/ide/deprecated/borland/borlandc/checkers.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/checkers.res
+++ b/ide/deprecated/borland/borlandc/checkers.res
diff --git a/ide/unsupported/borland/borlandc/clock.bpf b/ide/deprecated/borland/borlandc/clock.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/clock.bpf
+++ b/ide/deprecated/borland/borlandc/clock.bpf
diff --git a/ide/unsupported/borland/borlandc/clock.bpr b/ide/deprecated/borland/borlandc/clock.bpr
index cc7f28834..cc7f28834 100644
--- a/ide/unsupported/borland/borlandc/clock.bpr
+++ b/ide/deprecated/borland/borlandc/clock.bpr
diff --git a/ide/unsupported/borland/borlandc/clock.res b/ide/deprecated/borland/borlandc/clock.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/clock.res
+++ b/ide/deprecated/borland/borlandc/clock.res
diff --git a/ide/unsupported/borland/borlandc/colbrowser.bpf b/ide/deprecated/borland/borlandc/colbrowser.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/colbrowser.bpf
+++ b/ide/deprecated/borland/borlandc/colbrowser.bpf
diff --git a/ide/unsupported/borland/borlandc/colbrowser.bpr b/ide/deprecated/borland/borlandc/colbrowser.bpr
index c2049b37c..c2049b37c 100644
--- a/ide/unsupported/borland/borlandc/colbrowser.bpr
+++ b/ide/deprecated/borland/borlandc/colbrowser.bpr
diff --git a/ide/unsupported/borland/borlandc/colbrowser.res b/ide/deprecated/borland/borlandc/colbrowser.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/colbrowser.res
+++ b/ide/deprecated/borland/borlandc/colbrowser.res
diff --git a/ide/unsupported/borland/borlandc/color_chooser.bpf b/ide/deprecated/borland/borlandc/color_chooser.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/color_chooser.bpf
+++ b/ide/deprecated/borland/borlandc/color_chooser.bpf
diff --git a/ide/unsupported/borland/borlandc/color_chooser.bpr b/ide/deprecated/borland/borlandc/color_chooser.bpr
index f2f23418d..f2f23418d 100644
--- a/ide/unsupported/borland/borlandc/color_chooser.bpr
+++ b/ide/deprecated/borland/borlandc/color_chooser.bpr
diff --git a/ide/unsupported/borland/borlandc/color_chooser.res b/ide/deprecated/borland/borlandc/color_chooser.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/color_chooser.res
+++ b/ide/deprecated/borland/borlandc/color_chooser.res
diff --git a/ide/unsupported/borland/borlandc/config.h b/ide/deprecated/borland/borlandc/config.h
index f00d2ff64..f00d2ff64 100644
--- a/ide/unsupported/borland/borlandc/config.h
+++ b/ide/deprecated/borland/borlandc/config.h
diff --git a/ide/unsupported/borland/borlandc/cube.bpf b/ide/deprecated/borland/borlandc/cube.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/cube.bpf
+++ b/ide/deprecated/borland/borlandc/cube.bpf
diff --git a/ide/unsupported/borland/borlandc/cube.bpr b/ide/deprecated/borland/borlandc/cube.bpr
index 18232699c..18232699c 100644
--- a/ide/unsupported/borland/borlandc/cube.bpr
+++ b/ide/deprecated/borland/borlandc/cube.bpr
diff --git a/ide/unsupported/borland/borlandc/cube.res b/ide/deprecated/borland/borlandc/cube.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/cube.res
+++ b/ide/deprecated/borland/borlandc/cube.res
diff --git a/ide/unsupported/borland/borlandc/cursor.bpf b/ide/deprecated/borland/borlandc/cursor.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/cursor.bpf
+++ b/ide/deprecated/borland/borlandc/cursor.bpf
diff --git a/ide/unsupported/borland/borlandc/cursor.bpr b/ide/deprecated/borland/borlandc/cursor.bpr
index 772b42c7c..772b42c7c 100644
--- a/ide/unsupported/borland/borlandc/cursor.bpr
+++ b/ide/deprecated/borland/borlandc/cursor.bpr
diff --git a/ide/unsupported/borland/borlandc/cursor.res b/ide/deprecated/borland/borlandc/cursor.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/cursor.res
+++ b/ide/deprecated/borland/borlandc/cursor.res
diff --git a/ide/unsupported/borland/borlandc/curve.bpf b/ide/deprecated/borland/borlandc/curve.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/curve.bpf
+++ b/ide/deprecated/borland/borlandc/curve.bpf
diff --git a/ide/unsupported/borland/borlandc/curve.bpr b/ide/deprecated/borland/borlandc/curve.bpr
index baad23d0b..baad23d0b 100644
--- a/ide/unsupported/borland/borlandc/curve.bpr
+++ b/ide/deprecated/borland/borlandc/curve.bpr
diff --git a/ide/unsupported/borland/borlandc/curve.res b/ide/deprecated/borland/borlandc/curve.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/curve.res
+++ b/ide/deprecated/borland/borlandc/curve.res
diff --git a/ide/unsupported/borland/borlandc/demo.bpf b/ide/deprecated/borland/borlandc/demo.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/demo.bpf
+++ b/ide/deprecated/borland/borlandc/demo.bpf
diff --git a/ide/unsupported/borland/borlandc/demo.bpr b/ide/deprecated/borland/borlandc/demo.bpr
index f5029e4f9..f5029e4f9 100644
--- a/ide/unsupported/borland/borlandc/demo.bpr
+++ b/ide/deprecated/borland/borlandc/demo.bpr
diff --git a/ide/unsupported/borland/borlandc/demo.menu b/ide/deprecated/borland/borlandc/demo.menu
index b5a96d922..b5a96d922 100644
--- a/ide/unsupported/borland/borlandc/demo.menu
+++ b/ide/deprecated/borland/borlandc/demo.menu
diff --git a/ide/unsupported/borland/borlandc/demo.res b/ide/deprecated/borland/borlandc/demo.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/demo.res
+++ b/ide/deprecated/borland/borlandc/demo.res
diff --git a/ide/unsupported/borland/borlandc/doublebuffer.bpf b/ide/deprecated/borland/borlandc/doublebuffer.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/doublebuffer.bpf
+++ b/ide/deprecated/borland/borlandc/doublebuffer.bpf
diff --git a/ide/unsupported/borland/borlandc/doublebuffer.bpr b/ide/deprecated/borland/borlandc/doublebuffer.bpr
index 30b007b75..30b007b75 100644
--- a/ide/unsupported/borland/borlandc/doublebuffer.bpr
+++ b/ide/deprecated/borland/borlandc/doublebuffer.bpr
diff --git a/ide/unsupported/borland/borlandc/doublebuffer.res b/ide/deprecated/borland/borlandc/doublebuffer.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/doublebuffer.res
+++ b/ide/deprecated/borland/borlandc/doublebuffer.res
diff --git a/ide/unsupported/borland/borlandc/editor.bpf b/ide/deprecated/borland/borlandc/editor.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/editor.bpf
+++ b/ide/deprecated/borland/borlandc/editor.bpf
diff --git a/ide/unsupported/borland/borlandc/editor.bpr b/ide/deprecated/borland/borlandc/editor.bpr
index 3fa7a316a..3fa7a316a 100644
--- a/ide/unsupported/borland/borlandc/editor.bpr
+++ b/ide/deprecated/borland/borlandc/editor.bpr
diff --git a/ide/unsupported/borland/borlandc/editor.res b/ide/deprecated/borland/borlandc/editor.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/editor.res
+++ b/ide/deprecated/borland/borlandc/editor.res
diff --git a/ide/unsupported/borland/borlandc/file_chooser.bpf b/ide/deprecated/borland/borlandc/file_chooser.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/file_chooser.bpf
+++ b/ide/deprecated/borland/borlandc/file_chooser.bpf
diff --git a/ide/unsupported/borland/borlandc/file_chooser.bpr b/ide/deprecated/borland/borlandc/file_chooser.bpr
index f051bf896..f051bf896 100644
--- a/ide/unsupported/borland/borlandc/file_chooser.bpr
+++ b/ide/deprecated/borland/borlandc/file_chooser.bpr
diff --git a/ide/unsupported/borland/borlandc/file_chooser.res b/ide/deprecated/borland/borlandc/file_chooser.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/file_chooser.res
+++ b/ide/deprecated/borland/borlandc/file_chooser.res
diff --git a/ide/unsupported/borland/borlandc/fltk.bpf b/ide/deprecated/borland/borlandc/fltk.bpf
index e3c42ce04..e3c42ce04 100644
--- a/ide/unsupported/borland/borlandc/fltk.bpf
+++ b/ide/deprecated/borland/borlandc/fltk.bpf
diff --git a/ide/unsupported/borland/borlandc/fltk.bpg b/ide/deprecated/borland/borlandc/fltk.bpg
index a384f5308..a384f5308 100644
--- a/ide/unsupported/borland/borlandc/fltk.bpg
+++ b/ide/deprecated/borland/borlandc/fltk.bpg
diff --git a/ide/unsupported/borland/borlandc/fltk.bpr b/ide/deprecated/borland/borlandc/fltk.bpr
index 68f88f1d5..68f88f1d5 100644
--- a/ide/unsupported/borland/borlandc/fltk.bpr
+++ b/ide/deprecated/borland/borlandc/fltk.bpr
diff --git a/ide/unsupported/borland/borlandc/fltk.dsk b/ide/deprecated/borland/borlandc/fltk.dsk
index 381e2ef00..381e2ef00 100644
--- a/ide/unsupported/borland/borlandc/fltk.dsk
+++ b/ide/deprecated/borland/borlandc/fltk.dsk
diff --git a/ide/unsupported/borland/borlandc/fltk_app_template.bpf b/ide/deprecated/borland/borlandc/fltk_app_template.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/fltk_app_template.bpf
+++ b/ide/deprecated/borland/borlandc/fltk_app_template.bpf
diff --git a/ide/unsupported/borland/borlandc/fltk_app_template.bpr b/ide/deprecated/borland/borlandc/fltk_app_template.bpr
index 8450f5491..8450f5491 100644
--- a/ide/unsupported/borland/borlandc/fltk_app_template.bpr
+++ b/ide/deprecated/borland/borlandc/fltk_app_template.bpr
diff --git a/ide/unsupported/borland/borlandc/fltk_app_template.res b/ide/deprecated/borland/borlandc/fltk_app_template.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/fltk_app_template.res
+++ b/ide/deprecated/borland/borlandc/fltk_app_template.res
diff --git a/ide/unsupported/borland/borlandc/fltklib.bpf b/ide/deprecated/borland/borlandc/fltklib.bpf
index f5907baa2..f5907baa2 100644
--- a/ide/unsupported/borland/borlandc/fltklib.bpf
+++ b/ide/deprecated/borland/borlandc/fltklib.bpf
diff --git a/ide/unsupported/borland/borlandc/fltklib.bpr b/ide/deprecated/borland/borlandc/fltklib.bpr
index 22e12adb3..22e12adb3 100644
--- a/ide/unsupported/borland/borlandc/fltklib.bpr
+++ b/ide/deprecated/borland/borlandc/fltklib.bpr
diff --git a/ide/unsupported/borland/borlandc/fluid.bpf b/ide/deprecated/borland/borlandc/fluid.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/fluid.bpf
+++ b/ide/deprecated/borland/borlandc/fluid.bpf
diff --git a/ide/unsupported/borland/borlandc/fluid.bpr b/ide/deprecated/borland/borlandc/fluid.bpr
index f97ce6819..f97ce6819 100644
--- a/ide/unsupported/borland/borlandc/fluid.bpr
+++ b/ide/deprecated/borland/borlandc/fluid.bpr
diff --git a/ide/unsupported/borland/borlandc/fluid.res b/ide/deprecated/borland/borlandc/fluid.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/fluid.res
+++ b/ide/deprecated/borland/borlandc/fluid.res
diff --git a/ide/unsupported/borland/borlandc/fonts.bpf b/ide/deprecated/borland/borlandc/fonts.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/fonts.bpf
+++ b/ide/deprecated/borland/borlandc/fonts.bpf
diff --git a/ide/unsupported/borland/borlandc/fonts.bpr b/ide/deprecated/borland/borlandc/fonts.bpr
index 387854823..387854823 100644
--- a/ide/unsupported/borland/borlandc/fonts.bpr
+++ b/ide/deprecated/borland/borlandc/fonts.bpr
diff --git a/ide/unsupported/borland/borlandc/fonts.res b/ide/deprecated/borland/borlandc/fonts.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/fonts.res
+++ b/ide/deprecated/borland/borlandc/fonts.res
diff --git a/ide/unsupported/borland/borlandc/forms.bpf b/ide/deprecated/borland/borlandc/forms.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/forms.bpf
+++ b/ide/deprecated/borland/borlandc/forms.bpf
diff --git a/ide/unsupported/borland/borlandc/forms.bpr b/ide/deprecated/borland/borlandc/forms.bpr
index b4a9554ae..b4a9554ae 100644
--- a/ide/unsupported/borland/borlandc/forms.bpr
+++ b/ide/deprecated/borland/borlandc/forms.bpr
diff --git a/ide/unsupported/borland/borlandc/forms.res b/ide/deprecated/borland/borlandc/forms.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/forms.res
+++ b/ide/deprecated/borland/borlandc/forms.res
diff --git a/ide/unsupported/borland/borlandc/fractals.bpf b/ide/deprecated/borland/borlandc/fractals.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/fractals.bpf
+++ b/ide/deprecated/borland/borlandc/fractals.bpf
diff --git a/ide/unsupported/borland/borlandc/fractals.bpr b/ide/deprecated/borland/borlandc/fractals.bpr
index baed0ad01..baed0ad01 100644
--- a/ide/unsupported/borland/borlandc/fractals.bpr
+++ b/ide/deprecated/borland/borlandc/fractals.bpr
diff --git a/ide/unsupported/borland/borlandc/fractals.res b/ide/deprecated/borland/borlandc/fractals.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/fractals.res
+++ b/ide/deprecated/borland/borlandc/fractals.res
diff --git a/ide/unsupported/borland/borlandc/fullscreen.bpf b/ide/deprecated/borland/borlandc/fullscreen.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/fullscreen.bpf
+++ b/ide/deprecated/borland/borlandc/fullscreen.bpf
diff --git a/ide/unsupported/borland/borlandc/fullscreen.bpr b/ide/deprecated/borland/borlandc/fullscreen.bpr
index 8a07e00ca..8a07e00ca 100644
--- a/ide/unsupported/borland/borlandc/fullscreen.bpr
+++ b/ide/deprecated/borland/borlandc/fullscreen.bpr
diff --git a/ide/unsupported/borland/borlandc/fullscreen.res b/ide/deprecated/borland/borlandc/fullscreen.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/fullscreen.res
+++ b/ide/deprecated/borland/borlandc/fullscreen.res
diff --git a/ide/unsupported/borland/borlandc/hello.bpf b/ide/deprecated/borland/borlandc/hello.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/hello.bpf
+++ b/ide/deprecated/borland/borlandc/hello.bpf
diff --git a/ide/unsupported/borland/borlandc/hello.bpr b/ide/deprecated/borland/borlandc/hello.bpr
index 0a716ab73..0a716ab73 100644
--- a/ide/unsupported/borland/borlandc/hello.bpr
+++ b/ide/deprecated/borland/borlandc/hello.bpr
diff --git a/ide/unsupported/borland/borlandc/hello.res b/ide/deprecated/borland/borlandc/hello.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/hello.res
+++ b/ide/deprecated/borland/borlandc/hello.res
diff --git a/ide/unsupported/borland/borlandc/help.bpf b/ide/deprecated/borland/borlandc/help.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/help.bpf
+++ b/ide/deprecated/borland/borlandc/help.bpf
diff --git a/ide/unsupported/borland/borlandc/help.bpr b/ide/deprecated/borland/borlandc/help.bpr
index a346d02ea..a346d02ea 100644
--- a/ide/unsupported/borland/borlandc/help.bpr
+++ b/ide/deprecated/borland/borlandc/help.bpr
diff --git a/ide/unsupported/borland/borlandc/help.res b/ide/deprecated/borland/borlandc/help.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/help.res
+++ b/ide/deprecated/borland/borlandc/help.res
diff --git a/ide/unsupported/borland/borlandc/iconize.bpf b/ide/deprecated/borland/borlandc/iconize.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/iconize.bpf
+++ b/ide/deprecated/borland/borlandc/iconize.bpf
diff --git a/ide/unsupported/borland/borlandc/iconize.bpr b/ide/deprecated/borland/borlandc/iconize.bpr
index 5af85813d..5af85813d 100644
--- a/ide/unsupported/borland/borlandc/iconize.bpr
+++ b/ide/deprecated/borland/borlandc/iconize.bpr
diff --git a/ide/unsupported/borland/borlandc/iconize.res b/ide/deprecated/borland/borlandc/iconize.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/iconize.res
+++ b/ide/deprecated/borland/borlandc/iconize.res
diff --git a/ide/unsupported/borland/borlandc/image.bpf b/ide/deprecated/borland/borlandc/image.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/image.bpf
+++ b/ide/deprecated/borland/borlandc/image.bpf
diff --git a/ide/unsupported/borland/borlandc/image.bpr b/ide/deprecated/borland/borlandc/image.bpr
index d54cd2bdd..d54cd2bdd 100644
--- a/ide/unsupported/borland/borlandc/image.bpr
+++ b/ide/deprecated/borland/borlandc/image.bpr
diff --git a/ide/unsupported/borland/borlandc/image.res b/ide/deprecated/borland/borlandc/image.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/image.res
+++ b/ide/deprecated/borland/borlandc/image.res
diff --git a/ide/unsupported/borland/borlandc/input.bpf b/ide/deprecated/borland/borlandc/input.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/input.bpf
+++ b/ide/deprecated/borland/borlandc/input.bpf
diff --git a/ide/unsupported/borland/borlandc/input.bpr b/ide/deprecated/borland/borlandc/input.bpr
index 9b80f6fbc..9b80f6fbc 100644
--- a/ide/unsupported/borland/borlandc/input.bpr
+++ b/ide/deprecated/borland/borlandc/input.bpr
diff --git a/ide/unsupported/borland/borlandc/input.res b/ide/deprecated/borland/borlandc/input.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/input.res
+++ b/ide/deprecated/borland/borlandc/input.res
diff --git a/ide/unsupported/borland/borlandc/keyboard.bpf b/ide/deprecated/borland/borlandc/keyboard.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/keyboard.bpf
+++ b/ide/deprecated/borland/borlandc/keyboard.bpf
diff --git a/ide/unsupported/borland/borlandc/keyboard.bpr b/ide/deprecated/borland/borlandc/keyboard.bpr
index 4cdc02179..4cdc02179 100644
--- a/ide/unsupported/borland/borlandc/keyboard.bpr
+++ b/ide/deprecated/borland/borlandc/keyboard.bpr
diff --git a/ide/unsupported/borland/borlandc/keyboard.res b/ide/deprecated/borland/borlandc/keyboard.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/keyboard.res
+++ b/ide/deprecated/borland/borlandc/keyboard.res
diff --git a/ide/unsupported/borland/borlandc/label.bpf b/ide/deprecated/borland/borlandc/label.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/label.bpf
+++ b/ide/deprecated/borland/borlandc/label.bpf
diff --git a/ide/unsupported/borland/borlandc/label.bpr b/ide/deprecated/borland/borlandc/label.bpr
index 23d6afcff..23d6afcff 100644
--- a/ide/unsupported/borland/borlandc/label.bpr
+++ b/ide/deprecated/borland/borlandc/label.bpr
diff --git a/ide/unsupported/borland/borlandc/label.res b/ide/deprecated/borland/borlandc/label.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/label.res
+++ b/ide/deprecated/borland/borlandc/label.res
diff --git a/ide/unsupported/borland/borlandc/line_style.bpf b/ide/deprecated/borland/borlandc/line_style.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/line_style.bpf
+++ b/ide/deprecated/borland/borlandc/line_style.bpf
diff --git a/ide/unsupported/borland/borlandc/line_style.bpr b/ide/deprecated/borland/borlandc/line_style.bpr
index c35a43192..c35a43192 100644
--- a/ide/unsupported/borland/borlandc/line_style.bpr
+++ b/ide/deprecated/borland/borlandc/line_style.bpr
diff --git a/ide/unsupported/borland/borlandc/line_style.res b/ide/deprecated/borland/borlandc/line_style.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/line_style.res
+++ b/ide/deprecated/borland/borlandc/line_style.res
diff --git a/ide/unsupported/borland/borlandc/menubar.bpf b/ide/deprecated/borland/borlandc/menubar.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/menubar.bpf
+++ b/ide/deprecated/borland/borlandc/menubar.bpf
diff --git a/ide/unsupported/borland/borlandc/menubar.bpr b/ide/deprecated/borland/borlandc/menubar.bpr
index 112a2babc..112a2babc 100644
--- a/ide/unsupported/borland/borlandc/menubar.bpr
+++ b/ide/deprecated/borland/borlandc/menubar.bpr
diff --git a/ide/unsupported/borland/borlandc/menubar.res b/ide/deprecated/borland/borlandc/menubar.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/menubar.res
+++ b/ide/deprecated/borland/borlandc/menubar.res
diff --git a/ide/unsupported/borland/borlandc/message.bpf b/ide/deprecated/borland/borlandc/message.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/message.bpf
+++ b/ide/deprecated/borland/borlandc/message.bpf
diff --git a/ide/unsupported/borland/borlandc/message.bpr b/ide/deprecated/borland/borlandc/message.bpr
index e58c2b243..e58c2b243 100644
--- a/ide/unsupported/borland/borlandc/message.bpr
+++ b/ide/deprecated/borland/borlandc/message.bpr
diff --git a/ide/unsupported/borland/borlandc/message.res b/ide/deprecated/borland/borlandc/message.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/message.res
+++ b/ide/deprecated/borland/borlandc/message.res
diff --git a/ide/unsupported/borland/borlandc/minimum.bpf b/ide/deprecated/borland/borlandc/minimum.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/minimum.bpf
+++ b/ide/deprecated/borland/borlandc/minimum.bpf
diff --git a/ide/unsupported/borland/borlandc/minimum.bpr b/ide/deprecated/borland/borlandc/minimum.bpr
index 398ae0f75..398ae0f75 100644
--- a/ide/unsupported/borland/borlandc/minimum.bpr
+++ b/ide/deprecated/borland/borlandc/minimum.bpr
diff --git a/ide/unsupported/borland/borlandc/minimum.res b/ide/deprecated/borland/borlandc/minimum.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/minimum.res
+++ b/ide/deprecated/borland/borlandc/minimum.res
diff --git a/ide/unsupported/borland/borlandc/navigation.bpf b/ide/deprecated/borland/borlandc/navigation.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/navigation.bpf
+++ b/ide/deprecated/borland/borlandc/navigation.bpf
diff --git a/ide/unsupported/borland/borlandc/navigation.bpr b/ide/deprecated/borland/borlandc/navigation.bpr
index 8dfebd424..8dfebd424 100644
--- a/ide/unsupported/borland/borlandc/navigation.bpr
+++ b/ide/deprecated/borland/borlandc/navigation.bpr
diff --git a/ide/unsupported/borland/borlandc/navigation.res b/ide/deprecated/borland/borlandc/navigation.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/navigation.res
+++ b/ide/deprecated/borland/borlandc/navigation.res
diff --git a/ide/unsupported/borland/borlandc/output.bpf b/ide/deprecated/borland/borlandc/output.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/output.bpf
+++ b/ide/deprecated/borland/borlandc/output.bpf
diff --git a/ide/unsupported/borland/borlandc/output.bpr b/ide/deprecated/borland/borlandc/output.bpr
index fdde26681..fdde26681 100644
--- a/ide/unsupported/borland/borlandc/output.bpr
+++ b/ide/deprecated/borland/borlandc/output.bpr
diff --git a/ide/unsupported/borland/borlandc/output.res b/ide/deprecated/borland/borlandc/output.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/output.res
+++ b/ide/deprecated/borland/borlandc/output.res
diff --git a/ide/unsupported/borland/borlandc/overlay.bpf b/ide/deprecated/borland/borlandc/overlay.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/overlay.bpf
+++ b/ide/deprecated/borland/borlandc/overlay.bpf
diff --git a/ide/unsupported/borland/borlandc/overlay.bpr b/ide/deprecated/borland/borlandc/overlay.bpr
index 26b11f5c3..26b11f5c3 100644
--- a/ide/unsupported/borland/borlandc/overlay.bpr
+++ b/ide/deprecated/borland/borlandc/overlay.bpr
diff --git a/ide/unsupported/borland/borlandc/overlay.res b/ide/deprecated/borland/borlandc/overlay.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/overlay.res
+++ b/ide/deprecated/borland/borlandc/overlay.res
diff --git a/ide/unsupported/borland/borlandc/pack.bpf b/ide/deprecated/borland/borlandc/pack.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/pack.bpf
+++ b/ide/deprecated/borland/borlandc/pack.bpf
diff --git a/ide/unsupported/borland/borlandc/pack.bpr b/ide/deprecated/borland/borlandc/pack.bpr
index 15163fc7f..15163fc7f 100644
--- a/ide/unsupported/borland/borlandc/pack.bpr
+++ b/ide/deprecated/borland/borlandc/pack.bpr
diff --git a/ide/unsupported/borland/borlandc/pack.res b/ide/deprecated/borland/borlandc/pack.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/pack.res
+++ b/ide/deprecated/borland/borlandc/pack.res
diff --git a/ide/unsupported/borland/borlandc/pixmap.bpf b/ide/deprecated/borland/borlandc/pixmap.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/pixmap.bpf
+++ b/ide/deprecated/borland/borlandc/pixmap.bpf
diff --git a/ide/unsupported/borland/borlandc/pixmap.bpr b/ide/deprecated/borland/borlandc/pixmap.bpr
index 3ca32b171..3ca32b171 100644
--- a/ide/unsupported/borland/borlandc/pixmap.bpr
+++ b/ide/deprecated/borland/borlandc/pixmap.bpr
diff --git a/ide/unsupported/borland/borlandc/pixmap.res b/ide/deprecated/borland/borlandc/pixmap.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/pixmap.res
+++ b/ide/deprecated/borland/borlandc/pixmap.res
diff --git a/ide/unsupported/borland/borlandc/pixmap_browser.bpf b/ide/deprecated/borland/borlandc/pixmap_browser.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/pixmap_browser.bpf
+++ b/ide/deprecated/borland/borlandc/pixmap_browser.bpf
diff --git a/ide/unsupported/borland/borlandc/pixmap_browser.bpr b/ide/deprecated/borland/borlandc/pixmap_browser.bpr
index 60657dffe..60657dffe 100644
--- a/ide/unsupported/borland/borlandc/pixmap_browser.bpr
+++ b/ide/deprecated/borland/borlandc/pixmap_browser.bpr
diff --git a/ide/unsupported/borland/borlandc/pixmap_browser.res b/ide/deprecated/borland/borlandc/pixmap_browser.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/pixmap_browser.res
+++ b/ide/deprecated/borland/borlandc/pixmap_browser.res
diff --git a/ide/unsupported/borland/borlandc/resizebox.bpf b/ide/deprecated/borland/borlandc/resizebox.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/resizebox.bpf
+++ b/ide/deprecated/borland/borlandc/resizebox.bpf
diff --git a/ide/unsupported/borland/borlandc/resizebox.bpr b/ide/deprecated/borland/borlandc/resizebox.bpr
index 78f000422..78f000422 100644
--- a/ide/unsupported/borland/borlandc/resizebox.bpr
+++ b/ide/deprecated/borland/borlandc/resizebox.bpr
diff --git a/ide/unsupported/borland/borlandc/resizebox.res b/ide/deprecated/borland/borlandc/resizebox.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/resizebox.res
+++ b/ide/deprecated/borland/borlandc/resizebox.res
diff --git a/ide/unsupported/borland/borlandc/scroll.bpf b/ide/deprecated/borland/borlandc/scroll.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/scroll.bpf
+++ b/ide/deprecated/borland/borlandc/scroll.bpf
diff --git a/ide/unsupported/borland/borlandc/scroll.bpr b/ide/deprecated/borland/borlandc/scroll.bpr
index 628c05381..628c05381 100644
--- a/ide/unsupported/borland/borlandc/scroll.bpr
+++ b/ide/deprecated/borland/borlandc/scroll.bpr
diff --git a/ide/unsupported/borland/borlandc/scroll.res b/ide/deprecated/borland/borlandc/scroll.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/scroll.res
+++ b/ide/deprecated/borland/borlandc/scroll.res
diff --git a/ide/unsupported/borland/borlandc/shape.bpf b/ide/deprecated/borland/borlandc/shape.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/shape.bpf
+++ b/ide/deprecated/borland/borlandc/shape.bpf
diff --git a/ide/unsupported/borland/borlandc/shape.bpr b/ide/deprecated/borland/borlandc/shape.bpr
index a469b9c88..a469b9c88 100644
--- a/ide/unsupported/borland/borlandc/shape.bpr
+++ b/ide/deprecated/borland/borlandc/shape.bpr
diff --git a/ide/unsupported/borland/borlandc/shape.res b/ide/deprecated/borland/borlandc/shape.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/shape.res
+++ b/ide/deprecated/borland/borlandc/shape.res
diff --git a/ide/unsupported/borland/borlandc/subwindow.bpf b/ide/deprecated/borland/borlandc/subwindow.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/subwindow.bpf
+++ b/ide/deprecated/borland/borlandc/subwindow.bpf
diff --git a/ide/unsupported/borland/borlandc/subwindow.bpr b/ide/deprecated/borland/borlandc/subwindow.bpr
index fbb8b2698..fbb8b2698 100644
--- a/ide/unsupported/borland/borlandc/subwindow.bpr
+++ b/ide/deprecated/borland/borlandc/subwindow.bpr
diff --git a/ide/unsupported/borland/borlandc/subwindow.res b/ide/deprecated/borland/borlandc/subwindow.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/subwindow.res
+++ b/ide/deprecated/borland/borlandc/subwindow.res
diff --git a/ide/unsupported/borland/borlandc/symbols.bpf b/ide/deprecated/borland/borlandc/symbols.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/symbols.bpf
+++ b/ide/deprecated/borland/borlandc/symbols.bpf
diff --git a/ide/unsupported/borland/borlandc/symbols.bpr b/ide/deprecated/borland/borlandc/symbols.bpr
index f3826d1a8..f3826d1a8 100644
--- a/ide/unsupported/borland/borlandc/symbols.bpr
+++ b/ide/deprecated/borland/borlandc/symbols.bpr
diff --git a/ide/unsupported/borland/borlandc/symbols.res b/ide/deprecated/borland/borlandc/symbols.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/symbols.res
+++ b/ide/deprecated/borland/borlandc/symbols.res
diff --git a/ide/unsupported/borland/borlandc/tile.bpf b/ide/deprecated/borland/borlandc/tile.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/tile.bpf
+++ b/ide/deprecated/borland/borlandc/tile.bpf
diff --git a/ide/unsupported/borland/borlandc/tile.bpr b/ide/deprecated/borland/borlandc/tile.bpr
index f1988d923..f1988d923 100644
--- a/ide/unsupported/borland/borlandc/tile.bpr
+++ b/ide/deprecated/borland/borlandc/tile.bpr
diff --git a/ide/unsupported/borland/borlandc/tile.res b/ide/deprecated/borland/borlandc/tile.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/tile.res
+++ b/ide/deprecated/borland/borlandc/tile.res
diff --git a/ide/unsupported/borland/borlandc/tiled_image.bpf b/ide/deprecated/borland/borlandc/tiled_image.bpf
index 5da88241f..5da88241f 100644
--- a/ide/unsupported/borland/borlandc/tiled_image.bpf
+++ b/ide/deprecated/borland/borlandc/tiled_image.bpf
diff --git a/ide/unsupported/borland/borlandc/tiled_image.bpr b/ide/deprecated/borland/borlandc/tiled_image.bpr
index 22f355ea8..22f355ea8 100644
--- a/ide/unsupported/borland/borlandc/tiled_image.bpr
+++ b/ide/deprecated/borland/borlandc/tiled_image.bpr
diff --git a/ide/unsupported/borland/borlandc/tiled_image.res b/ide/deprecated/borland/borlandc/tiled_image.res
index e468bf918..e468bf918 100644
--- a/ide/unsupported/borland/borlandc/tiled_image.res
+++ b/ide/deprecated/borland/borlandc/tiled_image.res
diff --git a/ide/unsupported/ms/vcnet/CubeView.vcproj b/ide/deprecated/ms/vcnet/CubeView.vcproj
index 20305580c..20305580c 100644
--- a/ide/unsupported/ms/vcnet/CubeView.vcproj
+++ b/ide/deprecated/ms/vcnet/CubeView.vcproj
diff --git a/ide/unsupported/ms/vcnet/adjuster.vcproj b/ide/deprecated/ms/vcnet/adjuster.vcproj
index 4b279a591..4b279a591 100644
--- a/ide/unsupported/ms/vcnet/adjuster.vcproj
+++ b/ide/deprecated/ms/vcnet/adjuster.vcproj
diff --git a/ide/unsupported/ms/vcnet/arc.vcproj b/ide/deprecated/ms/vcnet/arc.vcproj
index ce8793725..ce8793725 100644
--- a/ide/unsupported/ms/vcnet/arc.vcproj
+++ b/ide/deprecated/ms/vcnet/arc.vcproj
diff --git a/ide/unsupported/ms/vcnet/ask.vcproj b/ide/deprecated/ms/vcnet/ask.vcproj
index a073960ff..a073960ff 100644
--- a/ide/unsupported/ms/vcnet/ask.vcproj
+++ b/ide/deprecated/ms/vcnet/ask.vcproj
diff --git a/ide/unsupported/ms/vcnet/bitmap.vcproj b/ide/deprecated/ms/vcnet/bitmap.vcproj
index b32841f1a..b32841f1a 100644
--- a/ide/unsupported/ms/vcnet/bitmap.vcproj
+++ b/ide/deprecated/ms/vcnet/bitmap.vcproj
diff --git a/ide/unsupported/ms/vcnet/blocks.vcproj b/ide/deprecated/ms/vcnet/blocks.vcproj
index aa7895bc8..aa7895bc8 100644
--- a/ide/unsupported/ms/vcnet/blocks.vcproj
+++ b/ide/deprecated/ms/vcnet/blocks.vcproj
diff --git a/ide/unsupported/ms/vcnet/boxtype.vcproj b/ide/deprecated/ms/vcnet/boxtype.vcproj
index fca741bf6..fca741bf6 100644
--- a/ide/unsupported/ms/vcnet/boxtype.vcproj
+++ b/ide/deprecated/ms/vcnet/boxtype.vcproj
diff --git a/ide/unsupported/ms/vcnet/browser.vcproj b/ide/deprecated/ms/vcnet/browser.vcproj
index 6b36c8c18..6b36c8c18 100644
--- a/ide/unsupported/ms/vcnet/browser.vcproj
+++ b/ide/deprecated/ms/vcnet/browser.vcproj
diff --git a/ide/unsupported/ms/vcnet/button.vcproj b/ide/deprecated/ms/vcnet/button.vcproj
index 417d8cc25..417d8cc25 100644
--- a/ide/unsupported/ms/vcnet/button.vcproj
+++ b/ide/deprecated/ms/vcnet/button.vcproj
diff --git a/ide/unsupported/ms/vcnet/buttons.vcproj b/ide/deprecated/ms/vcnet/buttons.vcproj
index 45a5e846f..45a5e846f 100644
--- a/ide/unsupported/ms/vcnet/buttons.vcproj
+++ b/ide/deprecated/ms/vcnet/buttons.vcproj
diff --git a/ide/unsupported/ms/vcnet/checkers.vcproj b/ide/deprecated/ms/vcnet/checkers.vcproj
index 16966cade..16966cade 100644
--- a/ide/unsupported/ms/vcnet/checkers.vcproj
+++ b/ide/deprecated/ms/vcnet/checkers.vcproj
diff --git a/ide/unsupported/ms/vcnet/clock.vcproj b/ide/deprecated/ms/vcnet/clock.vcproj
index 0ba958e78..0ba958e78 100644
--- a/ide/unsupported/ms/vcnet/clock.vcproj
+++ b/ide/deprecated/ms/vcnet/clock.vcproj
diff --git a/ide/unsupported/ms/vcnet/colbrowser.vcproj b/ide/deprecated/ms/vcnet/colbrowser.vcproj
index b28cf97c6..b28cf97c6 100644
--- a/ide/unsupported/ms/vcnet/colbrowser.vcproj
+++ b/ide/deprecated/ms/vcnet/colbrowser.vcproj
diff --git a/ide/unsupported/ms/vcnet/color_chooser.vcproj b/ide/deprecated/ms/vcnet/color_chooser.vcproj
index f91bd553d..f91bd553d 100644
--- a/ide/unsupported/ms/vcnet/color_chooser.vcproj
+++ b/ide/deprecated/ms/vcnet/color_chooser.vcproj
diff --git a/ide/unsupported/ms/vcnet/config.h b/ide/deprecated/ms/vcnet/config.h
index c60c4152f..c60c4152f 100644
--- a/ide/unsupported/ms/vcnet/config.h
+++ b/ide/deprecated/ms/vcnet/config.h
diff --git a/ide/unsupported/ms/vcnet/cube.vcproj b/ide/deprecated/ms/vcnet/cube.vcproj
index 55cc73f0f..55cc73f0f 100644
--- a/ide/unsupported/ms/vcnet/cube.vcproj
+++ b/ide/deprecated/ms/vcnet/cube.vcproj
diff --git a/ide/unsupported/ms/vcnet/cursor.vcproj b/ide/deprecated/ms/vcnet/cursor.vcproj
index b5e23f7e7..b5e23f7e7 100644
--- a/ide/unsupported/ms/vcnet/cursor.vcproj
+++ b/ide/deprecated/ms/vcnet/cursor.vcproj
diff --git a/ide/unsupported/ms/vcnet/curve.vcproj b/ide/deprecated/ms/vcnet/curve.vcproj
index b5cd44d60..b5cd44d60 100644
--- a/ide/unsupported/ms/vcnet/curve.vcproj
+++ b/ide/deprecated/ms/vcnet/curve.vcproj
diff --git a/ide/unsupported/ms/vcnet/demo.vcproj b/ide/deprecated/ms/vcnet/demo.vcproj
index 26f6191ca..26f6191ca 100644
--- a/ide/unsupported/ms/vcnet/demo.vcproj
+++ b/ide/deprecated/ms/vcnet/demo.vcproj
diff --git a/ide/unsupported/ms/vcnet/doublebuffer.vcproj b/ide/deprecated/ms/vcnet/doublebuffer.vcproj
index 06d566b6b..06d566b6b 100644
--- a/ide/unsupported/ms/vcnet/doublebuffer.vcproj
+++ b/ide/deprecated/ms/vcnet/doublebuffer.vcproj
diff --git a/ide/unsupported/ms/vcnet/editor.vcproj b/ide/deprecated/ms/vcnet/editor.vcproj
index 4bc07457f..4bc07457f 100644
--- a/ide/unsupported/ms/vcnet/editor.vcproj
+++ b/ide/deprecated/ms/vcnet/editor.vcproj
diff --git a/ide/unsupported/ms/vcnet/fast_slow.vcproj b/ide/deprecated/ms/vcnet/fast_slow.vcproj
index 8ad3671e5..8ad3671e5 100644
--- a/ide/unsupported/ms/vcnet/fast_slow.vcproj
+++ b/ide/deprecated/ms/vcnet/fast_slow.vcproj
diff --git a/ide/unsupported/ms/vcnet/file_chooser.vcproj b/ide/deprecated/ms/vcnet/file_chooser.vcproj
index 0d6775bcb..0d6775bcb 100644
--- a/ide/unsupported/ms/vcnet/file_chooser.vcproj
+++ b/ide/deprecated/ms/vcnet/file_chooser.vcproj
diff --git a/ide/unsupported/ms/vcnet/fltk.lib.vcproj b/ide/deprecated/ms/vcnet/fltk.lib.vcproj
index 6f6d56e9d..6f6d56e9d 100644
--- a/ide/unsupported/ms/vcnet/fltk.lib.vcproj
+++ b/ide/deprecated/ms/vcnet/fltk.lib.vcproj
diff --git a/ide/unsupported/ms/vcnet/fltk.sln b/ide/deprecated/ms/vcnet/fltk.sln
index fcb5c621e..fcb5c621e 100644
--- a/ide/unsupported/ms/vcnet/fltk.sln
+++ b/ide/deprecated/ms/vcnet/fltk.sln
diff --git a/ide/unsupported/ms/vcnet/fltkdll.vcproj b/ide/deprecated/ms/vcnet/fltkdll.vcproj
index 1d774e968..1d774e968 100644
--- a/ide/unsupported/ms/vcnet/fltkdll.vcproj
+++ b/ide/deprecated/ms/vcnet/fltkdll.vcproj
diff --git a/ide/unsupported/ms/vcnet/fltkforms.vcproj b/ide/deprecated/ms/vcnet/fltkforms.vcproj
index bf9695f97..bf9695f97 100644
--- a/ide/unsupported/ms/vcnet/fltkforms.vcproj
+++ b/ide/deprecated/ms/vcnet/fltkforms.vcproj
diff --git a/ide/unsupported/ms/vcnet/fltkgl.vcproj b/ide/deprecated/ms/vcnet/fltkgl.vcproj
index 03eac2426..03eac2426 100644
--- a/ide/unsupported/ms/vcnet/fltkgl.vcproj
+++ b/ide/deprecated/ms/vcnet/fltkgl.vcproj
diff --git a/ide/unsupported/ms/vcnet/fltkimages.vcproj b/ide/deprecated/ms/vcnet/fltkimages.vcproj
index e906d8a8d..e906d8a8d 100644
--- a/ide/unsupported/ms/vcnet/fltkimages.vcproj
+++ b/ide/deprecated/ms/vcnet/fltkimages.vcproj
diff --git a/ide/unsupported/ms/vcnet/fluid.vcproj b/ide/deprecated/ms/vcnet/fluid.vcproj
index 61bce1bf4..61bce1bf4 100644
--- a/ide/unsupported/ms/vcnet/fluid.vcproj
+++ b/ide/deprecated/ms/vcnet/fluid.vcproj
diff --git a/ide/unsupported/ms/vcnet/fonts.vcproj b/ide/deprecated/ms/vcnet/fonts.vcproj
index b0adb9f39..b0adb9f39 100644
--- a/ide/unsupported/ms/vcnet/fonts.vcproj
+++ b/ide/deprecated/ms/vcnet/fonts.vcproj
diff --git a/ide/unsupported/ms/vcnet/forms.vcproj b/ide/deprecated/ms/vcnet/forms.vcproj
index c6a59bc21..c6a59bc21 100644
--- a/ide/unsupported/ms/vcnet/forms.vcproj
+++ b/ide/deprecated/ms/vcnet/forms.vcproj
diff --git a/ide/unsupported/ms/vcnet/fractals.vcproj b/ide/deprecated/ms/vcnet/fractals.vcproj
index 5c6569710..5c6569710 100644
--- a/ide/unsupported/ms/vcnet/fractals.vcproj
+++ b/ide/deprecated/ms/vcnet/fractals.vcproj
diff --git a/ide/unsupported/ms/vcnet/fullscreen.vcproj b/ide/deprecated/ms/vcnet/fullscreen.vcproj
index f9d581004..f9d581004 100644
--- a/ide/unsupported/ms/vcnet/fullscreen.vcproj
+++ b/ide/deprecated/ms/vcnet/fullscreen.vcproj
diff --git a/ide/unsupported/ms/vcnet/gl_overlay.vcproj b/ide/deprecated/ms/vcnet/gl_overlay.vcproj
index 52f9aad3f..52f9aad3f 100644
--- a/ide/unsupported/ms/vcnet/gl_overlay.vcproj
+++ b/ide/deprecated/ms/vcnet/gl_overlay.vcproj
diff --git a/ide/unsupported/ms/vcnet/glpuzzle.vcproj b/ide/deprecated/ms/vcnet/glpuzzle.vcproj
index dd012d419..dd012d419 100644
--- a/ide/unsupported/ms/vcnet/glpuzzle.vcproj
+++ b/ide/deprecated/ms/vcnet/glpuzzle.vcproj
diff --git a/ide/unsupported/ms/vcnet/hello.vcproj b/ide/deprecated/ms/vcnet/hello.vcproj
index cdea2c54a..cdea2c54a 100644
--- a/ide/unsupported/ms/vcnet/hello.vcproj
+++ b/ide/deprecated/ms/vcnet/hello.vcproj
diff --git a/ide/unsupported/ms/vcnet/help.vcproj b/ide/deprecated/ms/vcnet/help.vcproj
index 94c600889..94c600889 100644
--- a/ide/unsupported/ms/vcnet/help.vcproj
+++ b/ide/deprecated/ms/vcnet/help.vcproj
diff --git a/ide/unsupported/ms/vcnet/iconize.vcproj b/ide/deprecated/ms/vcnet/iconize.vcproj
index 9798a9166..9798a9166 100644
--- a/ide/unsupported/ms/vcnet/iconize.vcproj
+++ b/ide/deprecated/ms/vcnet/iconize.vcproj
diff --git a/ide/unsupported/ms/vcnet/image.vcproj b/ide/deprecated/ms/vcnet/image.vcproj
index d12d47518..d12d47518 100644
--- a/ide/unsupported/ms/vcnet/image.vcproj
+++ b/ide/deprecated/ms/vcnet/image.vcproj
diff --git a/ide/unsupported/ms/vcnet/inactive.vcproj b/ide/deprecated/ms/vcnet/inactive.vcproj
index d14d2a52f..d14d2a52f 100644
--- a/ide/unsupported/ms/vcnet/inactive.vcproj
+++ b/ide/deprecated/ms/vcnet/inactive.vcproj
diff --git a/ide/unsupported/ms/vcnet/input.vcproj b/ide/deprecated/ms/vcnet/input.vcproj
index 7e2698214..7e2698214 100644
--- a/ide/unsupported/ms/vcnet/input.vcproj
+++ b/ide/deprecated/ms/vcnet/input.vcproj
diff --git a/ide/unsupported/ms/vcnet/input_choice.vcproj b/ide/deprecated/ms/vcnet/input_choice.vcproj
index c0d48fb2b..c0d48fb2b 100644
--- a/ide/unsupported/ms/vcnet/input_choice.vcproj
+++ b/ide/deprecated/ms/vcnet/input_choice.vcproj
diff --git a/ide/unsupported/ms/vcnet/jpeg.vcproj b/ide/deprecated/ms/vcnet/jpeg.vcproj
index 1b349b71c..1b349b71c 100644
--- a/ide/unsupported/ms/vcnet/jpeg.vcproj
+++ b/ide/deprecated/ms/vcnet/jpeg.vcproj
diff --git a/ide/unsupported/ms/vcnet/keyboard.vcproj b/ide/deprecated/ms/vcnet/keyboard.vcproj
index 1de0be6fd..1de0be6fd 100644
--- a/ide/unsupported/ms/vcnet/keyboard.vcproj
+++ b/ide/deprecated/ms/vcnet/keyboard.vcproj
diff --git a/ide/unsupported/ms/vcnet/label.vcproj b/ide/deprecated/ms/vcnet/label.vcproj
index 2a73f7110..2a73f7110 100644
--- a/ide/unsupported/ms/vcnet/label.vcproj
+++ b/ide/deprecated/ms/vcnet/label.vcproj
diff --git a/ide/unsupported/ms/vcnet/libpng.vcproj b/ide/deprecated/ms/vcnet/libpng.vcproj
index fc54e9419..fc54e9419 100644
--- a/ide/unsupported/ms/vcnet/libpng.vcproj
+++ b/ide/deprecated/ms/vcnet/libpng.vcproj
diff --git a/ide/unsupported/ms/vcnet/line_style.vcproj b/ide/deprecated/ms/vcnet/line_style.vcproj
index 589499d78..589499d78 100644
--- a/ide/unsupported/ms/vcnet/line_style.vcproj
+++ b/ide/deprecated/ms/vcnet/line_style.vcproj
diff --git a/ide/unsupported/ms/vcnet/mandelbrot.vcproj b/ide/deprecated/ms/vcnet/mandelbrot.vcproj
index d9eed950c..d9eed950c 100644
--- a/ide/unsupported/ms/vcnet/mandelbrot.vcproj
+++ b/ide/deprecated/ms/vcnet/mandelbrot.vcproj
diff --git a/ide/unsupported/ms/vcnet/menubar.vcproj b/ide/deprecated/ms/vcnet/menubar.vcproj
index 74f0abbe1..74f0abbe1 100644
--- a/ide/unsupported/ms/vcnet/menubar.vcproj
+++ b/ide/deprecated/ms/vcnet/menubar.vcproj
diff --git a/ide/unsupported/ms/vcnet/message.vcproj b/ide/deprecated/ms/vcnet/message.vcproj
index d45a02e43..d45a02e43 100644
--- a/ide/unsupported/ms/vcnet/message.vcproj
+++ b/ide/deprecated/ms/vcnet/message.vcproj
diff --git a/ide/unsupported/ms/vcnet/minimum.vcproj b/ide/deprecated/ms/vcnet/minimum.vcproj
index 8669ce171..8669ce171 100644
--- a/ide/unsupported/ms/vcnet/minimum.vcproj
+++ b/ide/deprecated/ms/vcnet/minimum.vcproj
diff --git a/ide/unsupported/ms/vcnet/navigation.vcproj b/ide/deprecated/ms/vcnet/navigation.vcproj
index 3020b8b3a..3020b8b3a 100644
--- a/ide/unsupported/ms/vcnet/navigation.vcproj
+++ b/ide/deprecated/ms/vcnet/navigation.vcproj
diff --git a/ide/unsupported/ms/vcnet/output.vcproj b/ide/deprecated/ms/vcnet/output.vcproj
index 880b9ad02..880b9ad02 100644
--- a/ide/unsupported/ms/vcnet/output.vcproj
+++ b/ide/deprecated/ms/vcnet/output.vcproj
diff --git a/ide/unsupported/ms/vcnet/overlay.vcproj b/ide/deprecated/ms/vcnet/overlay.vcproj
index b10f20a33..b10f20a33 100644
--- a/ide/unsupported/ms/vcnet/overlay.vcproj
+++ b/ide/deprecated/ms/vcnet/overlay.vcproj
diff --git a/ide/unsupported/ms/vcnet/pack.vcproj b/ide/deprecated/ms/vcnet/pack.vcproj
index 8508b60f8..8508b60f8 100644
--- a/ide/unsupported/ms/vcnet/pack.vcproj
+++ b/ide/deprecated/ms/vcnet/pack.vcproj
diff --git a/ide/unsupported/ms/vcnet/pixmap.vcproj b/ide/deprecated/ms/vcnet/pixmap.vcproj
index 66673bfb7..66673bfb7 100644
--- a/ide/unsupported/ms/vcnet/pixmap.vcproj
+++ b/ide/deprecated/ms/vcnet/pixmap.vcproj
diff --git a/ide/unsupported/ms/vcnet/pixmap_browser.vcproj b/ide/deprecated/ms/vcnet/pixmap_browser.vcproj
index e2980a310..e2980a310 100644
--- a/ide/unsupported/ms/vcnet/pixmap_browser.vcproj
+++ b/ide/deprecated/ms/vcnet/pixmap_browser.vcproj
diff --git a/ide/unsupported/ms/vcnet/preferences.vcproj b/ide/deprecated/ms/vcnet/preferences.vcproj
index 67accd8be..67accd8be 100644
--- a/ide/unsupported/ms/vcnet/preferences.vcproj
+++ b/ide/deprecated/ms/vcnet/preferences.vcproj
diff --git a/ide/unsupported/ms/vcnet/radio.vcproj b/ide/deprecated/ms/vcnet/radio.vcproj
index cff4e3d03..cff4e3d03 100644
--- a/ide/unsupported/ms/vcnet/radio.vcproj
+++ b/ide/deprecated/ms/vcnet/radio.vcproj
diff --git a/ide/unsupported/ms/vcnet/resize.vcproj b/ide/deprecated/ms/vcnet/resize.vcproj
index 7ea818e88..7ea818e88 100644
--- a/ide/unsupported/ms/vcnet/resize.vcproj
+++ b/ide/deprecated/ms/vcnet/resize.vcproj
diff --git a/ide/unsupported/ms/vcnet/resizebox.vcproj b/ide/deprecated/ms/vcnet/resizebox.vcproj
index dfd132d61..dfd132d61 100644
--- a/ide/unsupported/ms/vcnet/resizebox.vcproj
+++ b/ide/deprecated/ms/vcnet/resizebox.vcproj
diff --git a/ide/unsupported/ms/vcnet/scroll.vcproj b/ide/deprecated/ms/vcnet/scroll.vcproj
index 15f92ec6d..15f92ec6d 100644
--- a/ide/unsupported/ms/vcnet/scroll.vcproj
+++ b/ide/deprecated/ms/vcnet/scroll.vcproj
diff --git a/ide/unsupported/ms/vcnet/shape.vcproj b/ide/deprecated/ms/vcnet/shape.vcproj
index 2e60f9bc5..2e60f9bc5 100644
--- a/ide/unsupported/ms/vcnet/shape.vcproj
+++ b/ide/deprecated/ms/vcnet/shape.vcproj
diff --git a/ide/unsupported/ms/vcnet/subwindow.vcproj b/ide/deprecated/ms/vcnet/subwindow.vcproj
index 2aacb4d4b..2aacb4d4b 100644
--- a/ide/unsupported/ms/vcnet/subwindow.vcproj
+++ b/ide/deprecated/ms/vcnet/subwindow.vcproj
diff --git a/ide/unsupported/ms/vcnet/sudoku.vcproj b/ide/deprecated/ms/vcnet/sudoku.vcproj
index ff648cd26..ff648cd26 100644
--- a/ide/unsupported/ms/vcnet/sudoku.vcproj
+++ b/ide/deprecated/ms/vcnet/sudoku.vcproj
diff --git a/ide/unsupported/ms/vcnet/symbols.vcproj b/ide/deprecated/ms/vcnet/symbols.vcproj
index 8830e1b14..8830e1b14 100644
--- a/ide/unsupported/ms/vcnet/symbols.vcproj
+++ b/ide/deprecated/ms/vcnet/symbols.vcproj
diff --git a/ide/unsupported/ms/vcnet/tabs.vcproj b/ide/deprecated/ms/vcnet/tabs.vcproj
index bb20d7901..bb20d7901 100644
--- a/ide/unsupported/ms/vcnet/tabs.vcproj
+++ b/ide/deprecated/ms/vcnet/tabs.vcproj
diff --git a/ide/unsupported/ms/vcnet/threads.vcproj b/ide/deprecated/ms/vcnet/threads.vcproj
index c4e7ae5bb..c4e7ae5bb 100644
--- a/ide/unsupported/ms/vcnet/threads.vcproj
+++ b/ide/deprecated/ms/vcnet/threads.vcproj
diff --git a/ide/unsupported/ms/vcnet/tile.vcproj b/ide/deprecated/ms/vcnet/tile.vcproj
index 5e125236e..5e125236e 100644
--- a/ide/unsupported/ms/vcnet/tile.vcproj
+++ b/ide/deprecated/ms/vcnet/tile.vcproj
diff --git a/ide/unsupported/ms/vcnet/tiled_image.vcproj b/ide/deprecated/ms/vcnet/tiled_image.vcproj
index 0840c0abc..0840c0abc 100644
--- a/ide/unsupported/ms/vcnet/tiled_image.vcproj
+++ b/ide/deprecated/ms/vcnet/tiled_image.vcproj
diff --git a/ide/unsupported/ms/vcnet/valuators.vcproj b/ide/deprecated/ms/vcnet/valuators.vcproj
index 4d1fd811c..4d1fd811c 100644
--- a/ide/unsupported/ms/vcnet/valuators.vcproj
+++ b/ide/deprecated/ms/vcnet/valuators.vcproj
diff --git a/ide/unsupported/ms/vcnet/zlib.vcproj b/ide/deprecated/ms/vcnet/zlib.vcproj
index 13bfe290b..13bfe290b 100644
--- a/ide/unsupported/ms/vcnet/zlib.vcproj
+++ b/ide/deprecated/ms/vcnet/zlib.vcproj
diff --git a/ide/vc2005/editor.vcproj b/ide/vc2005/editor.vcproj
index 50732394a..85a8de2eb 100644
--- a/ide/vc2005/editor.vcproj
+++ b/ide/vc2005/editor.vcproj
@@ -15,8 +15,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

+			OutputDirectory="..\..\test"

+			IntermediateDirectory=".\Release\editor"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

@@ -49,7 +49,7 @@
 				InlineFunctionExpansion="2"

 				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories=".,../.."

-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Release/editor.pch"

@@ -72,7 +72,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib"

+				AdditionalDependencies="fltk.lib comctl32.lib"

 				OutputFile="../../test/editor.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -110,8 +110,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\editor_"

-			IntermediateDirectory=".\editor_"

+			OutputDirectory="..\..\test"

+			IntermediateDirectory=".\Debug\editor"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="0"

@@ -142,7 +142,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".,../.."

-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\editor_/editor.pch"

@@ -166,7 +166,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib"

+				AdditionalDependencies="fltkd.lib comctl32.lib"

 				OutputFile="../../test/editord.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -261,7 +261,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib cairo.lib"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

 				OutputFile="../../test/editord.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -334,7 +334,7 @@
 				InlineFunctionExpansion="2"

 				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories=".,../.."

-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Release/editor.pch"

@@ -357,7 +357,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib cairo.lib"

+				AdditionalDependencies="cairo.lib fltk.lib comctl32.lib"

 				OutputFile="../../test/editor.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

diff --git a/ide/vc2005/fltk.lib.vcproj b/ide/vc2005/fltk.lib.vcproj
index 40b5607d2..9289ba0d5 100644
--- a/ide/vc2005/fltk.lib.vcproj
+++ b/ide/vc2005/fltk.lib.vcproj
@@ -567,6 +567,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\FL\Fl_Paged_Device.H"

+				>

+			</File>

+			<File

 				RelativePath="..\..\FL\Fl_Pixmap.H"

 				>

 			</File>

@@ -591,10 +595,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\FL\Fl_PSfile_Device.H"

-				>

-			</File>

-			<File

 				RelativePath="..\..\FL\Fl_Radio_Button.H"

 				>

 			</File>

@@ -4308,6 +4308,52 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\..\src\Fl_Paged_Device.cxx"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+		</File>

+		<File

 			RelativePath="..\..\src\Fl_Pixmap.cxx"

 			>

 			<FileConfiguration

diff --git a/ide/vc2005/fltk.sln b/ide/vc2005/fltk.sln
index c13cb71f4..0a8a26dfe 100644
--- a/ide/vc2005/fltk.sln
+++ b/ide/vc2005/fltk.sln
@@ -1,10 +1,80 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CubeView", "CubeView.vcproj", "{E30BB28D-DFA0-479C-B670-8CD872224B38}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo.vcproj", "{09427220-8C9C-498A-8D50-1638D3FB87E5}"

 	ProjectSection(ProjectDependencies) = postProject

-		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}

+		{2C3FB329-620B-41A0-8845-A063C9EA8807} = {2C3FB329-620B-41A0-8845-A063C9EA8807}

+		{33331FB8-2AF9-4D15-BEE3-5F69658A6F1F} = {33331FB8-2AF9-4D15-BEE3-5F69658A6F1F}

+		{6E8E1663-B88D-4454-ADF2-279666A93306} = {6E8E1663-B88D-4454-ADF2-279666A93306}

 		{F7974A9C-C255-4385-96BC-E24EE0816F7C} = {F7974A9C-C255-4385-96BC-E24EE0816F7C}

+		{2D92C98B-F186-4BF0-A9D4-51D42C93F6E8} = {2D92C98B-F186-4BF0-A9D4-51D42C93F6E8}

+		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A} = {1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}

+		{50651D04-C8F7-4C2B-B412-0848573BDF88} = {50651D04-C8F7-4C2B-B412-0848573BDF88}

+		{8D8D210D-F628-48BB-9127-D8003DF22018} = {8D8D210D-F628-48BB-9127-D8003DF22018}

+		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF} = {7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}

+		{AE750416-51BA-485C-BD76-EF11B4536EE8} = {AE750416-51BA-485C-BD76-EF11B4536EE8}

+		{DB6BAA16-C589-448F-9AB5-5969016549EB} = {DB6BAA16-C589-448F-9AB5-5969016549EB}

+		{78079B1F-152B-4E83-87CB-364586AB3AAC} = {78079B1F-152B-4E83-87CB-364586AB3AAC}

+		{D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681}

+		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9} = {67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}

+		{D0BC7525-99E7-4247-B860-1B3CF2FF8165} = {D0BC7525-99E7-4247-B860-1B3CF2FF8165}

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9} = {ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}

+		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9} = {ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}

+		{2352F92C-8663-4637-B919-D76F0A9EC05E} = {2352F92C-8663-4637-B919-D76F0A9EC05E}

+		{28D24031-1A17-497A-B926-59CF78076DED} = {28D24031-1A17-497A-B926-59CF78076DED}

+		{37C32832-DCE4-4BAA-9306-826064B30CCB} = {37C32832-DCE4-4BAA-9306-826064B30CCB}

+		{2E03AF33-56A1-4366-B016-184CD96F3B56} = {2E03AF33-56A1-4366-B016-184CD96F3B56}

+		{0363AC35-F325-4C24-9DB9-E83337D55787} = {0363AC35-F325-4C24-9DB9-E83337D55787}

+		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D} = {DF2A883A-7356-4603-9CB1-E8F1E6B1549D}

+		{65B5BB3F-EE54-4604-B49B-7676AED83AAB} = {65B5BB3F-EE54-4604-B49B-7676AED83AAB}

+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} = {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}

+		{46771042-C840-4314-BA3C-C5BC2FBD7CBB} = {46771042-C840-4314-BA3C-C5BC2FBD7CBB}

+		{23F17042-704E-4198-8017-A8584E884CF7} = {23F17042-704E-4198-8017-A8584E884CF7}

+		{C17BAB42-F00B-4F71-9DF6-A921511C89EE} = {C17BAB42-F00B-4F71-9DF6-A921511C89EE}

+		{3B0BF144-5D75-4D4A-BF75-7347186C808F} = {3B0BF144-5D75-4D4A-BF75-7347186C808F}

+		{6927F349-29DF-4D60-BC8F-5A3F5E133735} = {6927F349-29DF-4D60-BC8F-5A3F5E133735}

+		{0973844B-3E5F-4C38-95FF-E8935243D287} = {0973844B-3E5F-4C38-95FF-E8935243D287}

+		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE} = {E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}

+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377}

+		{B1749154-F87B-489D-B4B0-ABD5ED20A96F} = {B1749154-F87B-489D-B4B0-ABD5ED20A96F}

+		{45797F58-624B-4FA0-A7A3-5956114D8215} = {45797F58-624B-4FA0-A7A3-5956114D8215}

+		{289C605C-94CC-437F-836B-2FE41528EEEC} = {289C605C-94CC-437F-836B-2FE41528EEEC}

+		{97541B63-87AA-4ACE-BBF5-175F8D1389EC} = {97541B63-87AA-4ACE-BBF5-175F8D1389EC}

+		{EDDBF169-77C1-496E-9EFE-E500107E6E97} = {EDDBF169-77C1-496E-9EFE-E500107E6E97}

+		{45236F71-7031-40BC-ADCD-0535A64C04B0} = {45236F71-7031-40BC-ADCD-0535A64C04B0}

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1} = {AF932F77-1804-4DA4-A6DC-950795D6AFC1}

+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}

+		{BFE8CC78-6B58-4305-A096-796A3088BB26} = {BFE8CC78-6B58-4305-A096-796A3088BB26}

+		{C3E7B77C-EED2-4046-9A30-9446C6F096A0} = {C3E7B77C-EED2-4046-9A30-9446C6F096A0}

+		{4DFA9F84-0457-4FE4-8008-283270610487} = {4DFA9F84-0457-4FE4-8008-283270610487}

+		{58A83386-65E6-4F22-8712-8B6B7E62913D} = {58A83386-65E6-4F22-8712-8B6B7E62913D}

+		{92EEF887-8305-4D00-86B7-D3F98CC7AD87} = {92EEF887-8305-4D00-86B7-D3F98CC7AD87}

+		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B} = {3322F289-B025-4DB1-A7D1-FBA3840F8A0B}

+		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1} = {CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}

+		{E30BB28D-DFA0-479C-B670-8CD872224B38} = {E30BB28D-DFA0-479C-B670-8CD872224B38}

+		{3E822491-B134-43B0-A40E-9348FFAB527F} = {3E822491-B134-43B0-A40E-9348FFAB527F}

+		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE} = {B5271094-DE51-4E60-B4FA-D8F0BDB969FE}

+		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2} = {1CA77C94-5785-4B38-B91A-1EAFBD885BC2}

+		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27} = {39ADA7A1-A2C1-4F0B-8B92-04E335570C27}

+		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15} = {27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}

+		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B} = {51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}

+		{E212D4B4-63D9-4D8D-84DB-45C8BC191462} = {E212D4B4-63D9-4D8D-84DB-45C8BC191462}

+		{F0B8F4BD-955D-43CB-980C-805364D04A25} = {F0B8F4BD-955D-43CB-980C-805364D04A25}

+		{2D29D6C9-B4A6-444C-A311-106A9C8A986F} = {2D29D6C9-B4A6-444C-A311-106A9C8A986F}

+		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3} = {CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}

+		{7A2467D2-B03A-4964-A289-EF233EB39F69} = {7A2467D2-B03A-4964-A289-EF233EB39F69}

+		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603} = {AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}

+		{D04E36D7-1C68-43E6-BE30-A7793CE3C799} = {D04E36D7-1C68-43E6-BE30-A7793CE3C799}

+		{9F3F86DA-3CC5-481F-8201-166933B5C8FF} = {9F3F86DA-3CC5-481F-8201-166933B5C8FF}

+		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE} = {1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}

+		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D} = {8B25CCE0-0988-4999-AE65-5A5EE31BB44D}

+		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3} = {F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}

+		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E} = {AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}

+		{122160ED-446E-4B15-8CB4-A2058DC7269A} = {122160ED-446E-4B15-8CB4-A2058DC7269A}

+		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6} = {0D1DB0EE-E997-4550-85D4-BDE209B75AD6}

+		{0BDAEBF1-7A8D-434B-A543-4663464E972D} = {0BDAEBF1-7A8D-434B-A543-4663464E972D}

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

+		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75} = {BDACB9FC-6769-4A2D-A636-36CC25E3AC75}

+		{2147B9FD-7D65-4854-9770-D7B8767DB9AE} = {2147B9FD-7D65-4854-9770-D7B8767DB9AE}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adjuster", "adjuster.vcproj", "{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}"

@@ -74,91 +144,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cube", "cube.vcproj", "{097
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cursor", "cursor.vcproj", "{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CubeView", "CubeView.vcproj", "{E30BB28D-DFA0-479C-B670-8CD872224B38}"

 	ProjectSection(ProjectDependencies) = postProject

+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}

+		{F7974A9C-C255-4385-96BC-E24EE0816F7C} = {F7974A9C-C255-4385-96BC-E24EE0816F7C}

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curve", "curve.vcproj", "{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cursor", "cursor.vcproj", "{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}"

 	ProjectSection(ProjectDependencies) = postProject

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo.vcproj", "{09427220-8C9C-498A-8D50-1638D3FB87E5}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curve", "curve.vcproj", "{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}"

 	ProjectSection(ProjectDependencies) = postProject

-		{2C3FB329-620B-41A0-8845-A063C9EA8807} = {2C3FB329-620B-41A0-8845-A063C9EA8807}

-		{33331FB8-2AF9-4D15-BEE3-5F69658A6F1F} = {33331FB8-2AF9-4D15-BEE3-5F69658A6F1F}

-		{6E8E1663-B88D-4454-ADF2-279666A93306} = {6E8E1663-B88D-4454-ADF2-279666A93306}

-		{F7974A9C-C255-4385-96BC-E24EE0816F7C} = {F7974A9C-C255-4385-96BC-E24EE0816F7C}

-		{2D92C98B-F186-4BF0-A9D4-51D42C93F6E8} = {2D92C98B-F186-4BF0-A9D4-51D42C93F6E8}

-		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A} = {1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}

-		{50651D04-C8F7-4C2B-B412-0848573BDF88} = {50651D04-C8F7-4C2B-B412-0848573BDF88}

-		{8D8D210D-F628-48BB-9127-D8003DF22018} = {8D8D210D-F628-48BB-9127-D8003DF22018}

-		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF} = {7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}

-		{AE750416-51BA-485C-BD76-EF11B4536EE8} = {AE750416-51BA-485C-BD76-EF11B4536EE8}

-		{DB6BAA16-C589-448F-9AB5-5969016549EB} = {DB6BAA16-C589-448F-9AB5-5969016549EB}

-		{78079B1F-152B-4E83-87CB-364586AB3AAC} = {78079B1F-152B-4E83-87CB-364586AB3AAC}

-		{D640A221-F95A-40FF-AC0E-0E8B615C7681} = {D640A221-F95A-40FF-AC0E-0E8B615C7681}

-		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9} = {67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}

-		{D0BC7525-99E7-4247-B860-1B3CF2FF8165} = {D0BC7525-99E7-4247-B860-1B3CF2FF8165}

-		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9} = {ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}

-		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9} = {ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}

-		{2352F92C-8663-4637-B919-D76F0A9EC05E} = {2352F92C-8663-4637-B919-D76F0A9EC05E}

-		{28D24031-1A17-497A-B926-59CF78076DED} = {28D24031-1A17-497A-B926-59CF78076DED}

-		{37C32832-DCE4-4BAA-9306-826064B30CCB} = {37C32832-DCE4-4BAA-9306-826064B30CCB}

-		{2E03AF33-56A1-4366-B016-184CD96F3B56} = {2E03AF33-56A1-4366-B016-184CD96F3B56}

-		{0363AC35-F325-4C24-9DB9-E83337D55787} = {0363AC35-F325-4C24-9DB9-E83337D55787}

-		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D} = {DF2A883A-7356-4603-9CB1-E8F1E6B1549D}

-		{65B5BB3F-EE54-4604-B49B-7676AED83AAB} = {65B5BB3F-EE54-4604-B49B-7676AED83AAB}

-		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF} = {E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}

-		{46771042-C840-4314-BA3C-C5BC2FBD7CBB} = {46771042-C840-4314-BA3C-C5BC2FBD7CBB}

-		{23F17042-704E-4198-8017-A8584E884CF7} = {23F17042-704E-4198-8017-A8584E884CF7}

-		{C17BAB42-F00B-4F71-9DF6-A921511C89EE} = {C17BAB42-F00B-4F71-9DF6-A921511C89EE}

-		{3B0BF144-5D75-4D4A-BF75-7347186C808F} = {3B0BF144-5D75-4D4A-BF75-7347186C808F}

-		{6927F349-29DF-4D60-BC8F-5A3F5E133735} = {6927F349-29DF-4D60-BC8F-5A3F5E133735}

-		{0973844B-3E5F-4C38-95FF-E8935243D287} = {0973844B-3E5F-4C38-95FF-E8935243D287}

-		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE} = {E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}

-		{08B82852-90B3-4767-A5D2-F0A4FCCB2377} = {08B82852-90B3-4767-A5D2-F0A4FCCB2377}

-		{B1749154-F87B-489D-B4B0-ABD5ED20A96F} = {B1749154-F87B-489D-B4B0-ABD5ED20A96F}

-		{45797F58-624B-4FA0-A7A3-5956114D8215} = {45797F58-624B-4FA0-A7A3-5956114D8215}

-		{289C605C-94CC-437F-836B-2FE41528EEEC} = {289C605C-94CC-437F-836B-2FE41528EEEC}

-		{97541B63-87AA-4ACE-BBF5-175F8D1389EC} = {97541B63-87AA-4ACE-BBF5-175F8D1389EC}

-		{EDDBF169-77C1-496E-9EFE-E500107E6E97} = {EDDBF169-77C1-496E-9EFE-E500107E6E97}

-		{45236F71-7031-40BC-ADCD-0535A64C04B0} = {45236F71-7031-40BC-ADCD-0535A64C04B0}

-		{AF932F77-1804-4DA4-A6DC-950795D6AFC1} = {AF932F77-1804-4DA4-A6DC-950795D6AFC1}

-		{8AED3078-8CD8-40C9-A8FF-46080024F1EB} = {8AED3078-8CD8-40C9-A8FF-46080024F1EB}

-		{BFE8CC78-6B58-4305-A096-796A3088BB26} = {BFE8CC78-6B58-4305-A096-796A3088BB26}

-		{C3E7B77C-EED2-4046-9A30-9446C6F096A0} = {C3E7B77C-EED2-4046-9A30-9446C6F096A0}

-		{4DFA9F84-0457-4FE4-8008-283270610487} = {4DFA9F84-0457-4FE4-8008-283270610487}

-		{58A83386-65E6-4F22-8712-8B6B7E62913D} = {58A83386-65E6-4F22-8712-8B6B7E62913D}

-		{92EEF887-8305-4D00-86B7-D3F98CC7AD87} = {92EEF887-8305-4D00-86B7-D3F98CC7AD87}

-		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B} = {3322F289-B025-4DB1-A7D1-FBA3840F8A0B}

-		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1} = {CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}

-		{E30BB28D-DFA0-479C-B670-8CD872224B38} = {E30BB28D-DFA0-479C-B670-8CD872224B38}

-		{3E822491-B134-43B0-A40E-9348FFAB527F} = {3E822491-B134-43B0-A40E-9348FFAB527F}

-		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE} = {B5271094-DE51-4E60-B4FA-D8F0BDB969FE}

-		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2} = {1CA77C94-5785-4B38-B91A-1EAFBD885BC2}

-		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27} = {39ADA7A1-A2C1-4F0B-8B92-04E335570C27}

-		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15} = {27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}

-		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B} = {51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}

-		{E212D4B4-63D9-4D8D-84DB-45C8BC191462} = {E212D4B4-63D9-4D8D-84DB-45C8BC191462}

-		{F0B8F4BD-955D-43CB-980C-805364D04A25} = {F0B8F4BD-955D-43CB-980C-805364D04A25}

-		{2D29D6C9-B4A6-444C-A311-106A9C8A986F} = {2D29D6C9-B4A6-444C-A311-106A9C8A986F}

-		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3} = {CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}

-		{7A2467D2-B03A-4964-A289-EF233EB39F69} = {7A2467D2-B03A-4964-A289-EF233EB39F69}

-		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603} = {AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}

-		{D04E36D7-1C68-43E6-BE30-A7793CE3C799} = {D04E36D7-1C68-43E6-BE30-A7793CE3C799}

-		{9F3F86DA-3CC5-481F-8201-166933B5C8FF} = {9F3F86DA-3CC5-481F-8201-166933B5C8FF}

-		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE} = {1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}

-		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D} = {8B25CCE0-0988-4999-AE65-5A5EE31BB44D}

-		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3} = {F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}

-		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E} = {AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}

-		{122160ED-446E-4B15-8CB4-A2058DC7269A} = {122160ED-446E-4B15-8CB4-A2058DC7269A}

-		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6} = {0D1DB0EE-E997-4550-85D4-BDE209B75AD6}

-		{0BDAEBF1-7A8D-434B-A543-4663464E972D} = {0BDAEBF1-7A8D-434B-A543-4663464E972D}

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

-		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75} = {BDACB9FC-6769-4A2D-A636-36CC25E3AC75}

-		{2147B9FD-7D65-4854-9770-D7B8767DB9AE} = {2147B9FD-7D65-4854-9770-D7B8767DB9AE}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublebuffer", "doublebuffer.vcproj", "{EDDBF169-77C1-496E-9EFE-E500107E6E97}"

diff --git a/ide/vc2005/fltkdll.vcproj b/ide/vc2005/fltkdll.vcproj
index 647336ec1..62f2e9fbc 100644
--- a/ide/vc2005/fltkdll.vcproj
+++ b/ide/vc2005/fltkdll.vcproj
@@ -3989,6 +3989,48 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\..\src\Fl_Paged_Device.cxx"

+			>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

 			RelativePath="..\..\src\Fl_Pixmap.cxx"

 			>

 			<FileConfiguration