[Library] r8991 - in branches/branch-3.0: . fluid ide/VisualC2008 ide/VisualC2010 ide/VisualC6 ide/Xcode4/plists include include/fltk3 include/fltk3jpeg include/fltk3png include/fltk3zlib src src/core src/core/xutf8 src/core/xutf8/headers src/core/xutf8/lcUniConv src/core/xutf8/utils src/jpeg src/png src/zlib test

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[Library] r8991 - in branches/branch-3.0: . fluid ide/VisualC2008 ide/VisualC2010 ide/VisualC6 ide/Xcode4/plists include include/fltk3 include/fltk3jpeg include/fltk3png include/fltk3zlib src src/core src/core/xutf8 src/core/xutf8/headers src/core/xutf8/lcUniConv src/core/xutf8/utils src/jpeg src/png src/zlib test fltk-dev Aug 22, 2011 top right image
 
Author: matt
Date: 2011-08-22 08:21:44 -0700 (Mon, 22 Aug 2011)
New Revision: 8991
Log:
FLTK3: THE BIG FILE SHUFFLE

=== THIS RELEASE BUILDS ONLY USING THE AUTOCONF/MAKEFILE SYSTEM - IF AT ALL! ===

Ok, so here is the big file shuffle, part 1: 

 - all "simple" libraries are now included (jpeg, png, zlib become fltk3jpeg etc.) 
   rationale: Fluid (and all the tests) have no external dependencies, even 
   when built on a system with jpeg libraries, but run on a system without
 - all library names start with "fltk3" 
   rationale: avoid naming conflicts with fltk1 and fltk2
 - all "_" characters were removed from library names
   rationale: those seem to be unsupported in OS X framework names and cause warnings
 - all headers are now in a directory named include/ 
   rationale: clean up the top level directory
 - all headers are in a subdirectory strictly named after their library (jpeg/ -> fltk3jpeg/)
   and all sources are in a directory named after their library, minus the "fltk3" (jpeg/ -> src/jpeg/)
   rationale: allow auto-genration of build environments for further additional
   libraries in FLTK3, for example fltk3cairo, etc. . 
 

Still to do:

 - Fluid will become Fluid3
   rationale: avoid naming conflicts with fltk 1 and 2
 - fltk gl headers go into include/fltk3gl/, fltk images headers in include/fltk3images
   rationale: additional libraries always have their headers named in the same naming system
 - add 'all.h' and '`libname`.h' to all include directories
   rationale: this will make work with the libraries easier by allowing #include <fltk3/all.h>
   which includes everything available. It helps debugging header files, and it will be consistent
   among libraries (#include <fltk3gl/all.h>). It also accelerates compilation when using
   precompiled headers. And last-not-least, the alternative syntax #include <ftk3/fltk3.h> 
   is standard for OS X frameworks.
 - rename Fl_... .cxx files into their FLTK3 name counterpart
   rationale: avoid confusion with FLTK 1 class naming

I hope you guys are not completely shocked by this commit and will stick with me.
Nothing really changed or moved further than one directory away.

 - Matthias




Added:
   branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj
   branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj
   branches/branch-3.0/ide/VisualC6/fltk3.dsp
   branches/branch-3.0/ide/VisualC6/fltk3gl.dsp
   branches/branch-3.0/ide/VisualC6/fltk3images.dsp
   branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp
   branches/branch-3.0/ide/VisualC6/fltk3png.dsp
   branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp
   branches/branch-3.0/ide/Xcode4/plists/fltk3-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk3gl-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk3images-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk3jpeg-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk3png-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk3zlib-Info.plist
   branches/branch-3.0/include/
   branches/branch-3.0/include/FL/
   branches/branch-3.0/include/GL/
   branches/branch-3.0/include/fltk/
   branches/branch-3.0/include/fltk3/
   branches/branch-3.0/include/fltk3/Browser_.h
   branches/branch-3.0/include/fltk3/Button.h
   branches/branch-3.0/include/fltk3/Chart.h
   branches/branch-3.0/include/fltk3/Counter.h
   branches/branch-3.0/include/fltk3/HelpView.h
   branches/branch-3.0/include/fltk3/Input_.h
   branches/branch-3.0/include/fltk3/MenuItem.h
   branches/branch-3.0/include/fltk3/Menu_.h
   branches/branch-3.0/include/fltk3/Style.h
   branches/branch-3.0/include/fltk3/SysMenuBar.h
   branches/branch-3.0/include/fltk3/TextDisplay.h
   branches/branch-3.0/include/fltk3/TextEditor.h
   branches/branch-3.0/include/fltk3/Tree.h
   branches/branch-3.0/include/fltk3/ValueInput.h
   branches/branch-3.0/include/fltk3/ValueOutput.h
   branches/branch-3.0/include/fltk3/ValueSlider.h
   branches/branch-3.0/include/fltk3/Widget.h
   branches/branch-3.0/include/fltk3/osx.h
   branches/branch-3.0/include/fltk3/run.h
   branches/branch-3.0/include/fltk3gl/
   branches/branch-3.0/include/fltk3jpeg/
   branches/branch-3.0/include/fltk3jpeg/jconfig.h
   branches/branch-3.0/include/fltk3jpeg/jdct.h
   branches/branch-3.0/include/fltk3jpeg/jerror.h
   branches/branch-3.0/include/fltk3jpeg/jinclude.h
   branches/branch-3.0/include/fltk3jpeg/jmemsys.h
   branches/branch-3.0/include/fltk3jpeg/jmorecfg.h
   branches/branch-3.0/include/fltk3jpeg/jpegint.h
   branches/branch-3.0/include/fltk3jpeg/jpeglib.h
   branches/branch-3.0/include/fltk3jpeg/jversion.h
   branches/branch-3.0/include/fltk3png/
   branches/branch-3.0/include/fltk3png/png.h
   branches/branch-3.0/include/fltk3png/pngconf.h
   branches/branch-3.0/include/fltk3png/pngdebug.h
   branches/branch-3.0/include/fltk3png/pnginfo.h
   branches/branch-3.0/include/fltk3png/pnglibconf.h
   branches/branch-3.0/include/fltk3png/pngpriv.h
   branches/branch-3.0/include/fltk3png/pngstruct.h
   branches/branch-3.0/include/fltk3zlib/
   branches/branch-3.0/include/fltk3zlib/crc32.h
   branches/branch-3.0/include/fltk3zlib/deflate.h
   branches/branch-3.0/include/fltk3zlib/gzguts.h
   branches/branch-3.0/include/fltk3zlib/inffast.h
   branches/branch-3.0/include/fltk3zlib/inffixed.h
   branches/branch-3.0/include/fltk3zlib/inflate.h
   branches/branch-3.0/include/fltk3zlib/inftrees.h
   branches/branch-3.0/include/fltk3zlib/trees.h
   branches/branch-3.0/include/fltk3zlib/zconf.h
   branches/branch-3.0/include/fltk3zlib/zlib.h
   branches/branch-3.0/include/fltk3zlib/zutil.h
   branches/branch-3.0/src/core/
   branches/branch-3.0/src/core/Fl.cxx
   branches/branch-3.0/src/core/Fl_Adjuster.cxx
   branches/branch-3.0/src/core/Fl_BMP_Image.cxx
   branches/branch-3.0/src/core/Fl_Bitmap.cxx
   branches/branch-3.0/src/core/Fl_Box.cxx
   branches/branch-3.0/src/core/Fl_Browser.cxx
   branches/branch-3.0/src/core/Fl_Browser_.cxx
   branches/branch-3.0/src/core/Fl_Browser_load.cxx
   branches/branch-3.0/src/core/Fl_Button.cxx
   branches/branch-3.0/src/core/Fl_Chart.cxx
   branches/branch-3.0/src/core/Fl_Check_Browser.cxx
   branches/branch-3.0/src/core/Fl_Check_Button.cxx
   branches/branch-3.0/src/core/Fl_Choice.cxx
   branches/branch-3.0/src/core/Fl_Clock.cxx
   branches/branch-3.0/src/core/Fl_Color_Chooser.cxx
   branches/branch-3.0/src/core/Fl_Counter.cxx
   branches/branch-3.0/src/core/Fl_Device.cxx
   branches/branch-3.0/src/core/Fl_Dial.cxx
   branches/branch-3.0/src/core/Fl_Double_Window.cxx
   branches/branch-3.0/src/core/Fl_File_Browser.cxx
   branches/branch-3.0/src/core/Fl_File_Chooser.cxx
   branches/branch-3.0/src/core/Fl_File_Chooser.fl
   branches/branch-3.0/src/core/Fl_File_Chooser2.cxx
   branches/branch-3.0/src/core/Fl_File_Icon.cxx
   branches/branch-3.0/src/core/Fl_File_Icon2.cxx
   branches/branch-3.0/src/core/Fl_File_Input.cxx
   branches/branch-3.0/src/core/Fl_Font.H
   branches/branch-3.0/src/core/Fl_GDI_Printer.cxx
   branches/branch-3.0/src/core/Fl_GIF_Image.cxx
   branches/branch-3.0/src/core/Fl_Gl_Choice.H
   branches/branch-3.0/src/core/Fl_Gl_Choice.cxx
   branches/branch-3.0/src/core/Fl_Gl_Device_Plugin.cxx
   branches/branch-3.0/src/core/Fl_Gl_Overlay.cxx
   branches/branch-3.0/src/core/Fl_Gl_Window.cxx
   branches/branch-3.0/src/core/Fl_Group.cxx
   branches/branch-3.0/src/core/Fl_Help_Dialog.cxx
   branches/branch-3.0/src/core/Fl_Help_Dialog.fl
   branches/branch-3.0/src/core/Fl_Help_Dialog_Dox.cxx
   branches/branch-3.0/src/core/Fl_Help_View.cxx
   branches/branch-3.0/src/core/Fl_Image.cxx
   branches/branch-3.0/src/core/Fl_Input.cxx
   branches/branch-3.0/src/core/Fl_Input_.cxx
   branches/branch-3.0/src/core/Fl_JPEG_Image.cxx
   branches/branch-3.0/src/core/Fl_Light_Button.cxx
   branches/branch-3.0/src/core/Fl_Menu.cxx
   branches/branch-3.0/src/core/Fl_Menu_.cxx
   branches/branch-3.0/src/core/Fl_Menu_Bar.cxx
   branches/branch-3.0/src/core/Fl_Menu_Button.cxx
   branches/branch-3.0/src/core/Fl_Menu_Window.cxx
   branches/branch-3.0/src/core/Fl_Menu_add.cxx
   branches/branch-3.0/src/core/Fl_Menu_global.cxx
   branches/branch-3.0/src/core/Fl_Multi_Label.cxx
   branches/branch-3.0/src/core/Fl_Native_File_Chooser.cxx
   branches/branch-3.0/src/core/Fl_Native_File_Chooser_FLTK.cxx
   branches/branch-3.0/src/core/Fl_Native_File_Chooser_MAC.mm
   branches/branch-3.0/src/core/Fl_Native_File_Chooser_WIN32.cxx
   branches/branch-3.0/src/core/Fl_Native_File_Chooser_common.cxx
   branches/branch-3.0/src/core/Fl_Overlay_Window.cxx
   branches/branch-3.0/src/core/Fl_PNG_Image.cxx
   branches/branch-3.0/src/core/Fl_PNM_Image.cxx
   branches/branch-3.0/src/core/Fl_Pack.cxx
   branches/branch-3.0/src/core/Fl_Paged_Device.cxx
   branches/branch-3.0/src/core/Fl_Pixmap.cxx
   branches/branch-3.0/src/core/Fl_Positioner.cxx
   branches/branch-3.0/src/core/Fl_PostScript.cxx
   branches/branch-3.0/src/core/Fl_Preferences.cxx
   branches/branch-3.0/src/core/Fl_Printer.cxx
   branches/branch-3.0/src/core/Fl_Progress.cxx
   branches/branch-3.0/src/core/Fl_Quartz_Printer.mm
   branches/branch-3.0/src/core/Fl_Repeat_Button.cxx
   branches/branch-3.0/src/core/Fl_Return_Button.cxx
   branches/branch-3.0/src/core/Fl_Roller.cxx
   branches/branch-3.0/src/core/Fl_Round_Button.cxx
   branches/branch-3.0/src/core/Fl_Scroll.cxx
   branches/branch-3.0/src/core/Fl_Scrollbar.cxx
   branches/branch-3.0/src/core/Fl_Shared_Image.cxx
   branches/branch-3.0/src/core/Fl_Single_Window.cxx
   branches/branch-3.0/src/core/Fl_Slider.cxx
   branches/branch-3.0/src/core/Fl_Sys_Menu_Bar.cxx
   branches/branch-3.0/src/core/Fl_Table.cxx
   branches/branch-3.0/src/core/Fl_Table_Row.cxx
   branches/branch-3.0/src/core/Fl_Tabs.cxx
   branches/branch-3.0/src/core/Fl_Text_Buffer.cxx
   branches/branch-3.0/src/core/Fl_Text_Display.cxx
   branches/branch-3.0/src/core/Fl_Text_Editor.cxx
   branches/branch-3.0/src/core/Fl_Tile.cxx
   branches/branch-3.0/src/core/Fl_Tiled_Image.cxx
   branches/branch-3.0/src/core/Fl_Tooltip.cxx
   branches/branch-3.0/src/core/Fl_Tree.cxx
   branches/branch-3.0/src/core/Fl_Tree_Item.cxx
   branches/branch-3.0/src/core/Fl_Tree_Item_Array.cxx
   branches/branch-3.0/src/core/Fl_Tree_Prefs.cxx
   branches/branch-3.0/src/core/Fl_Valuator.cxx
   branches/branch-3.0/src/core/Fl_Value_Input.cxx
   branches/branch-3.0/src/core/Fl_Value_Output.cxx
   branches/branch-3.0/src/core/Fl_Value_Slider.cxx
   branches/branch-3.0/src/core/Fl_Widget.cxx
   branches/branch-3.0/src/core/Fl_Window.cxx
   branches/branch-3.0/src/core/Fl_Window_fullscreen.cxx
   branches/branch-3.0/src/core/Fl_Window_hotspot.cxx
   branches/branch-3.0/src/core/Fl_Window_iconize.cxx
   branches/branch-3.0/src/core/Fl_Wizard.cxx
   branches/branch-3.0/src/core/Fl_XBM_Image.cxx
   branches/branch-3.0/src/core/Fl_XColor.H
   branches/branch-3.0/src/core/Fl_XPM_Image.cxx
   branches/branch-3.0/src/core/Fl_abort.cxx
   branches/branch-3.0/src/core/Fl_add_idle.cxx
   branches/branch-3.0/src/core/Fl_arg.cxx
   branches/branch-3.0/src/core/Fl_cocoa.mm
   branches/branch-3.0/src/core/Fl_compose.cxx
   branches/branch-3.0/src/core/Fl_display.cxx
   branches/branch-3.0/src/core/Fl_get_key.cxx
   branches/branch-3.0/src/core/Fl_get_key_mac.cxx
   branches/branch-3.0/src/core/Fl_get_key_win32.cxx
   branches/branch-3.0/src/core/Fl_get_system_colors.cxx
   branches/branch-3.0/src/core/Fl_grab.cxx
   branches/branch-3.0/src/core/Fl_lock.cxx
   branches/branch-3.0/src/core/Fl_mac.cxx
   branches/branch-3.0/src/core/Fl_own_colormap.cxx
   branches/branch-3.0/src/core/Fl_visual.cxx
   branches/branch-3.0/src/core/Fl_win32.cxx
   branches/branch-3.0/src/core/Fl_x.cxx
   branches/branch-3.0/src/core/Style.cxx
   branches/branch-3.0/src/core/aimm.h
   branches/branch-3.0/src/core/allfiles.xbm
   branches/branch-3.0/src/core/cgdebug.h
   branches/branch-3.0/src/core/cmap.cxx
   branches/branch-3.0/src/core/d1.xbm
   branches/branch-3.0/src/core/d1_mask.xbm
   branches/branch-3.0/src/core/dump_compose.c
   branches/branch-3.0/src/core/ew.xbm
   branches/branch-3.0/src/core/ew_mask.xbm
   branches/branch-3.0/src/core/fastarrow.h
   branches/branch-3.0/src/core/filename_absolute.cxx
   branches/branch-3.0/src/core/filename_expand.cxx
   branches/branch-3.0/src/core/filename_ext.cxx
   branches/branch-3.0/src/core/filename_isdir.cxx
   branches/branch-3.0/src/core/filename_list.cxx
   branches/branch-3.0/src/core/filename_match.cxx
   branches/branch-3.0/src/core/filename_setext.cxx
   branches/branch-3.0/src/core/fl_arc.cxx
   branches/branch-3.0/src/core/fl_arci.cxx
   branches/branch-3.0/src/core/fl_ask.cxx
   branches/branch-3.0/src/core/fl_boxtype.cxx
   branches/branch-3.0/src/core/fl_call_main.cxx
   branches/branch-3.0/src/core/fl_cmap.h
   branches/branch-3.0/src/core/fl_color.cxx
   branches/branch-3.0/src/core/fl_color_mac.cxx
   branches/branch-3.0/src/core/fl_color_win32.cxx
   branches/branch-3.0/src/core/fl_cursor.cxx
   branches/branch-3.0/src/core/fl_curve.cxx
   branches/branch-3.0/src/core/fl_diamond_box.cxx
   branches/branch-3.0/src/core/fl_dnd.cxx
   branches/branch-3.0/src/core/fl_dnd_win32.cxx
   branches/branch-3.0/src/core/fl_dnd_x.cxx
   branches/branch-3.0/src/core/fl_draw.cxx
   branches/branch-3.0/src/core/fl_draw_image.cxx
   branches/branch-3.0/src/core/fl_draw_image_mac.cxx
   branches/branch-3.0/src/core/fl_draw_image_win32.cxx
   branches/branch-3.0/src/core/fl_draw_pixmap.cxx
   branches/branch-3.0/src/core/fl_encoding_latin1.cxx
   branches/branch-3.0/src/core/fl_encoding_mac_roman.cxx
   branches/branch-3.0/src/core/fl_engraved_label.cxx
   branches/branch-3.0/src/core/fl_file_dir.cxx
   branches/branch-3.0/src/core/fl_font.cxx
   branches/branch-3.0/src/core/fl_font_mac.cxx
   branches/branch-3.0/src/core/fl_font_win32.cxx
   branches/branch-3.0/src/core/fl_font_x.cxx
   branches/branch-3.0/src/core/fl_font_xft.cxx
   branches/branch-3.0/src/core/fl_gtk.cxx
   branches/branch-3.0/src/core/fl_images_core.cxx
   branches/branch-3.0/src/core/fl_labeltype.cxx
   branches/branch-3.0/src/core/fl_line_style.cxx
   branches/branch-3.0/src/core/fl_open_uri.cxx
   branches/branch-3.0/src/core/fl_oval_box.cxx
   branches/branch-3.0/src/core/fl_overlay.cxx
   branches/branch-3.0/src/core/fl_overlay_visual.cxx
   branches/branch-3.0/src/core/fl_plastic.cxx
   branches/branch-3.0/src/core/fl_read_image.cxx
   branches/branch-3.0/src/core/fl_read_image_mac.cxx
   branches/branch-3.0/src/core/fl_read_image_win32.cxx
   branches/branch-3.0/src/core/fl_rect.cxx
   branches/branch-3.0/src/core/fl_round_box.cxx
   branches/branch-3.0/src/core/fl_rounded_box.cxx
   branches/branch-3.0/src/core/fl_scroll_area.cxx
   branches/branch-3.0/src/core/fl_set_font.cxx
   branches/branch-3.0/src/core/fl_set_fonts.cxx
   branches/branch-3.0/src/core/fl_set_fonts_mac.cxx
   branches/branch-3.0/src/core/fl_set_fonts_win32.cxx
   branches/branch-3.0/src/core/fl_set_fonts_x.cxx
   branches/branch-3.0/src/core/fl_set_fonts_xft.cxx
   branches/branch-3.0/src/core/fl_shadow_box.cxx
   branches/branch-3.0/src/core/fl_shortcut.cxx
   branches/branch-3.0/src/core/fl_show_colormap.cxx
   branches/branch-3.0/src/core/fl_symbols.cxx
   branches/branch-3.0/src/core/fl_utf.cxx
   branches/branch-3.0/src/core/fl_utf8.cxx
   branches/branch-3.0/src/core/fl_vertex.cxx
   branches/branch-3.0/src/core/flstring.c
   branches/branch-3.0/src/core/flstring.h
   branches/branch-3.0/src/core/forms_bitmap.cxx
   branches/branch-3.0/src/core/forms_compatability.cxx
   branches/branch-3.0/src/core/forms_fselect.cxx
   branches/branch-3.0/src/core/forms_pixmap.cxx
   branches/branch-3.0/src/core/forms_timer.cxx
   branches/branch-3.0/src/core/freeglut_geometry.cxx
   branches/branch-3.0/src/core/freeglut_stroke_mono_roman.cxx
   branches/branch-3.0/src/core/freeglut_stroke_roman.cxx
   branches/branch-3.0/src/core/freeglut_teapot.cxx
   branches/branch-3.0/src/core/freeglut_teapot_data.h
   branches/branch-3.0/src/core/gl_draw.cxx
   branches/branch-3.0/src/core/gl_start.cxx
   branches/branch-3.0/src/core/glut_compatability.cxx
   branches/branch-3.0/src/core/glut_font.cxx
   branches/branch-3.0/src/core/mediumarrow.h
   branches/branch-3.0/src/core/new.xbm
   branches/branch-3.0/src/core/ns.xbm
   branches/branch-3.0/src/core/ns_mask.xbm
   branches/branch-3.0/src/core/numericsort.cxx
   branches/branch-3.0/src/core/print_panel.cxx
   branches/branch-3.0/src/core/print_panel.h
   branches/branch-3.0/src/core/ps_image.cxx
   branches/branch-3.0/src/core/scandir.cxx
   branches/branch-3.0/src/core/scandir_win32.cxx
   branches/branch-3.0/src/core/screen_xywh.cxx
   branches/branch-3.0/src/core/slowarrow.h
   branches/branch-3.0/src/core/tile.xpm
   branches/branch-3.0/src/core/up.xbm
   branches/branch-3.0/src/core/vsnprintf.c
   branches/branch-3.0/src/core/xutf8/
   branches/branch-3.0/src/core/xutf8/COPYING
   branches/branch-3.0/src/core/xutf8/MAPPINGS/
   branches/branch-3.0/src/core/xutf8/README
   branches/branch-3.0/src/core/xutf8/Ximint.h
   branches/branch-3.0/src/core/xutf8/Xlibint.h
   branches/branch-3.0/src/core/xutf8/case.c
   branches/branch-3.0/src/core/xutf8/fl_wcwidth.c
   branches/branch-3.0/src/core/xutf8/headers/
   branches/branch-3.0/src/core/xutf8/headers/case.h
   branches/branch-3.0/src/core/xutf8/headers/case_tbl.txt
   branches/branch-3.0/src/core/xutf8/headers/dingbats_.h
   branches/branch-3.0/src/core/xutf8/headers/spacing.h
   branches/branch-3.0/src/core/xutf8/headers/spacing_tbl.txt
   branches/branch-3.0/src/core/xutf8/headers/symbol_.h
   branches/branch-3.0/src/core/xutf8/headers/tbl.txt
   branches/branch-3.0/src/core/xutf8/imKStoUCS.c
   branches/branch-3.0/src/core/xutf8/is_right2left.c
   branches/branch-3.0/src/core/xutf8/is_spacing.c
   branches/branch-3.0/src/core/xutf8/keysym2Ucs.c
   branches/branch-3.0/src/core/xutf8/lcUniConv/
   branches/branch-3.0/src/core/xutf8/lcUniConv/8bit_tab_to_h.c
   branches/branch-3.0/src/core/xutf8/lcUniConv/COPYRIGHT
   branches/branch-3.0/src/core/xutf8/lcUniConv/README
   branches/branch-3.0/src/core/xutf8/lcUniConv/armscii_8.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/ascii.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/big5.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/big5_emacs.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/cjk_tab_to_h.c
   branches/branch-3.0/src/core/xutf8/lcUniConv/cp1133.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/cp1251.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/cp1255.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/cp1256.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/cp936ext.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/gb2312.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/gbk_tab_to_h.c
   branches/branch-3.0/src/core/xutf8/lcUniConv/georgian_academy.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/georgian_ps.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_1.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_10.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_11.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_13.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_14.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_15.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_16.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_2.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_3.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_4.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_5.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_6.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_7.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_8.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_9.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/iso8859_9e.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/jisx0201.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/jisx0208.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/jisx0212.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/koi8_c.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/koi8_r.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/koi8_u.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/ksc5601.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/mulelao.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/tatar_cyr.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/tcvn.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/tis620.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/ucs2be.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/utf8.h
   branches/branch-3.0/src/core/xutf8/lcUniConv/viscii.h
   branches/branch-3.0/src/core/xutf8/mk_wcwidth.c
   branches/branch-3.0/src/core/xutf8/stamp-h
   branches/branch-3.0/src/core/xutf8/stamp-h.in
   branches/branch-3.0/src/core/xutf8/test.c
   branches/branch-3.0/src/core/xutf8/test2.c
   branches/branch-3.0/src/core/xutf8/ucs2fontmap.c
   branches/branch-3.0/src/core/xutf8/ucs2fontmap.c.mini
   branches/branch-3.0/src/core/xutf8/utf8Input.c
   branches/branch-3.0/src/core/xutf8/utf8Utils.c
   branches/branch-3.0/src/core/xutf8/utf8Wrap.c
   branches/branch-3.0/src/core/xutf8/utils/
   branches/branch-3.0/src/core/xutf8/utils/INSTALL
   branches/branch-3.0/src/core/xutf8/utils/Makefile
   branches/branch-3.0/src/core/xutf8/utils/README
   branches/branch-3.0/src/core/xutf8/utils/case.sh
   branches/branch-3.0/src/core/xutf8/utils/conv_gen.c
   branches/branch-3.0/src/core/xutf8/utils/convert_map.c
   branches/branch-3.0/src/core/xutf8/utils/create_table.c
   branches/branch-3.0/src/core/xutf8/utils/euc_tw.c
   branches/branch-3.0/src/core/xutf8/utils/non_spacing.sh
   branches/branch-3.0/src/core/xutf8/utils/tbl_gen.sh
   branches/branch-3.0/src/jpeg/
   branches/branch-3.0/src/png/
   branches/branch-3.0/src/zlib/
Removed:
   branches/branch-3.0/FL/
   branches/branch-3.0/GL/
   branches/branch-3.0/fltk/
   branches/branch-3.0/fltk3/
   branches/branch-3.0/ide/VisualC2008/fltk.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk_gl.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk_images.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk_jpeg.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk_png.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk_zlib.vcproj
   branches/branch-3.0/ide/VisualC2010/fltk.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk_gl.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk_images.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk_jpeg.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk_png.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk_zlib.vcxproj
   branches/branch-3.0/ide/VisualC6/fltk.dsp
   branches/branch-3.0/ide/VisualC6/fltk_gl.dsp
   branches/branch-3.0/ide/VisualC6/fltk_images.dsp
   branches/branch-3.0/ide/VisualC6/fltk_jpeg.dsp
   branches/branch-3.0/ide/VisualC6/fltk_png.dsp
   branches/branch-3.0/ide/VisualC6/fltk_zlib.dsp
   branches/branch-3.0/ide/Xcode4/plists/fltk-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk_forms-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk_gl-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk_images-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk_jpeg-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk_png-Info.plist
   branches/branch-3.0/ide/Xcode4/plists/fltk_zlib-Info.plist
   branches/branch-3.0/include/fltk3/Browser_.h
   branches/branch-3.0/include/fltk3/Button.h
   branches/branch-3.0/include/fltk3/Chart.h
   branches/branch-3.0/include/fltk3/Counter.h
   branches/branch-3.0/include/fltk3/HelpView.h
   branches/branch-3.0/include/fltk3/Input_.h
   branches/branch-3.0/include/fltk3/MenuItem.h
   branches/branch-3.0/include/fltk3/Menu_.h
   branches/branch-3.0/include/fltk3/SysMenuBar.h
   branches/branch-3.0/include/fltk3/TextDisplay.h
   branches/branch-3.0/include/fltk3/TextEditor.h
   branches/branch-3.0/include/fltk3/Tree.h
   branches/branch-3.0/include/fltk3/ValueInput.h
   branches/branch-3.0/include/fltk3/ValueOutput.h
   branches/branch-3.0/include/fltk3/ValueSlider.h
   branches/branch-3.0/include/fltk3/Widget.h
   branches/branch-3.0/include/fltk3/osx.h
   branches/branch-3.0/include/fltk3/run.h
   branches/branch-3.0/jpeg/
   branches/branch-3.0/png/
   branches/branch-3.0/src/Fl.cxx
   branches/branch-3.0/src/Fl_Adjuster.cxx
   branches/branch-3.0/src/Fl_BMP_Image.cxx
   branches/branch-3.0/src/Fl_Bitmap.cxx
   branches/branch-3.0/src/Fl_Box.cxx
   branches/branch-3.0/src/Fl_Browser.cxx
   branches/branch-3.0/src/Fl_Browser_.cxx
   branches/branch-3.0/src/Fl_Browser_load.cxx
   branches/branch-3.0/src/Fl_Button.cxx
   branches/branch-3.0/src/Fl_Chart.cxx
   branches/branch-3.0/src/Fl_Check_Browser.cxx
   branches/branch-3.0/src/Fl_Check_Button.cxx
   branches/branch-3.0/src/Fl_Choice.cxx
   branches/branch-3.0/src/Fl_Clock.cxx
   branches/branch-3.0/src/Fl_Color_Chooser.cxx
   branches/branch-3.0/src/Fl_Counter.cxx
   branches/branch-3.0/src/Fl_Device.cxx
   branches/branch-3.0/src/Fl_Dial.cxx
   branches/branch-3.0/src/Fl_Double_Window.cxx
   branches/branch-3.0/src/Fl_File_Browser.cxx
   branches/branch-3.0/src/Fl_File_Chooser.cxx
   branches/branch-3.0/src/Fl_File_Chooser.fl
   branches/branch-3.0/src/Fl_File_Chooser2.cxx
   branches/branch-3.0/src/Fl_File_Icon.cxx
   branches/branch-3.0/src/Fl_File_Icon2.cxx
   branches/branch-3.0/src/Fl_File_Input.cxx
   branches/branch-3.0/src/Fl_Font.H
   branches/branch-3.0/src/Fl_GDI_Printer.cxx
   branches/branch-3.0/src/Fl_GIF_Image.cxx
   branches/branch-3.0/src/Fl_Gl_Choice.H
   branches/branch-3.0/src/Fl_Gl_Choice.cxx
   branches/branch-3.0/src/Fl_Gl_Device_Plugin.cxx
   branches/branch-3.0/src/Fl_Gl_Overlay.cxx
   branches/branch-3.0/src/Fl_Gl_Window.cxx
   branches/branch-3.0/src/Fl_Group.cxx
   branches/branch-3.0/src/Fl_Help_Dialog.cxx
   branches/branch-3.0/src/Fl_Help_Dialog.fl
   branches/branch-3.0/src/Fl_Help_Dialog_Dox.cxx
   branches/branch-3.0/src/Fl_Help_View.cxx
   branches/branch-3.0/src/Fl_Image.cxx
   branches/branch-3.0/src/Fl_Input.cxx
   branches/branch-3.0/src/Fl_Input_.cxx
   branches/branch-3.0/src/Fl_JPEG_Image.cxx
   branches/branch-3.0/src/Fl_Light_Button.cxx
   branches/branch-3.0/src/Fl_Menu.cxx
   branches/branch-3.0/src/Fl_Menu_.cxx
   branches/branch-3.0/src/Fl_Menu_Bar.cxx
   branches/branch-3.0/src/Fl_Menu_Button.cxx
   branches/branch-3.0/src/Fl_Menu_Window.cxx
   branches/branch-3.0/src/Fl_Menu_add.cxx
   branches/branch-3.0/src/Fl_Menu_global.cxx
   branches/branch-3.0/src/Fl_Multi_Label.cxx
   branches/branch-3.0/src/Fl_Native_File_Chooser.cxx
   branches/branch-3.0/src/Fl_Native_File_Chooser_FLTK.cxx
   branches/branch-3.0/src/Fl_Native_File_Chooser_MAC.mm
   branches/branch-3.0/src/Fl_Native_File_Chooser_WIN32.cxx
   branches/branch-3.0/src/Fl_Native_File_Chooser_common.cxx
   branches/branch-3.0/src/Fl_Overlay_Window.cxx
   branches/branch-3.0/src/Fl_PNG_Image.cxx
   branches/branch-3.0/src/Fl_PNM_Image.cxx
   branches/branch-3.0/src/Fl_Pack.cxx
   branches/branch-3.0/src/Fl_Paged_Device.cxx
   branches/branch-3.0/src/Fl_Pixmap.cxx
   branches/branch-3.0/src/Fl_Positioner.cxx
   branches/branch-3.0/src/Fl_PostScript.cxx
   branches/branch-3.0/src/Fl_Preferences.cxx
   branches/branch-3.0/src/Fl_Printer.cxx
   branches/branch-3.0/src/Fl_Progress.cxx
   branches/branch-3.0/src/Fl_Quartz_Printer.mm
   branches/branch-3.0/src/Fl_Repeat_Button.cxx
   branches/branch-3.0/src/Fl_Return_Button.cxx
   branches/branch-3.0/src/Fl_Roller.cxx
   branches/branch-3.0/src/Fl_Round_Button.cxx
   branches/branch-3.0/src/Fl_Scroll.cxx
   branches/branch-3.0/src/Fl_Scrollbar.cxx
   branches/branch-3.0/src/Fl_Shared_Image.cxx
   branches/branch-3.0/src/Fl_Single_Window.cxx
   branches/branch-3.0/src/Fl_Slider.cxx
   branches/branch-3.0/src/Fl_Sys_Menu_Bar.cxx
   branches/branch-3.0/src/Fl_Table.cxx
   branches/branch-3.0/src/Fl_Table_Row.cxx
   branches/branch-3.0/src/Fl_Tabs.cxx
   branches/branch-3.0/src/Fl_Text_Buffer.cxx
   branches/branch-3.0/src/Fl_Text_Display.cxx
   branches/branch-3.0/src/Fl_Text_Editor.cxx
   branches/branch-3.0/src/Fl_Tile.cxx
   branches/branch-3.0/src/Fl_Tiled_Image.cxx
   branches/branch-3.0/src/Fl_Tooltip.cxx
   branches/branch-3.0/src/Fl_Tree.cxx
   branches/branch-3.0/src/Fl_Tree_Item.cxx
   branches/branch-3.0/src/Fl_Tree_Item_Array.cxx
   branches/branch-3.0/src/Fl_Tree_Prefs.cxx
   branches/branch-3.0/src/Fl_Valuator.cxx
   branches/branch-3.0/src/Fl_Value_Input.cxx
   branches/branch-3.0/src/Fl_Value_Output.cxx
   branches/branch-3.0/src/Fl_Value_Slider.cxx
   branches/branch-3.0/src/Fl_Widget.cxx
   branches/branch-3.0/src/Fl_Window.cxx
   branches/branch-3.0/src/Fl_Window_fullscreen.cxx
   branches/branch-3.0/src/Fl_Window_hotspot.cxx
   branches/branch-3.0/src/Fl_Window_iconize.cxx
   branches/branch-3.0/src/Fl_Wizard.cxx
   branches/branch-3.0/src/Fl_XBM_Image.cxx
   branches/branch-3.0/src/Fl_XColor.H
   branches/branch-3.0/src/Fl_XPM_Image.cxx
   branches/branch-3.0/src/Fl_abort.cxx
   branches/branch-3.0/src/Fl_add_idle.cxx
   branches/branch-3.0/src/Fl_arg.cxx
   branches/branch-3.0/src/Fl_cocoa.mm
   branches/branch-3.0/src/Fl_compose.cxx
   branches/branch-3.0/src/Fl_display.cxx
   branches/branch-3.0/src/Fl_get_key.cxx
   branches/branch-3.0/src/Fl_get_key_mac.cxx
   branches/branch-3.0/src/Fl_get_key_win32.cxx
   branches/branch-3.0/src/Fl_get_system_colors.cxx
   branches/branch-3.0/src/Fl_grab.cxx
   branches/branch-3.0/src/Fl_lock.cxx
   branches/branch-3.0/src/Fl_mac.cxx
   branches/branch-3.0/src/Fl_own_colormap.cxx
   branches/branch-3.0/src/Fl_visual.cxx
   branches/branch-3.0/src/Fl_win32.cxx
   branches/branch-3.0/src/Fl_x.cxx
   branches/branch-3.0/src/Style.cxx
   branches/branch-3.0/src/aimm.h
   branches/branch-3.0/src/allfiles.xbm
   branches/branch-3.0/src/cgdebug.h
   branches/branch-3.0/src/cmap.cxx
   branches/branch-3.0/src/d1.xbm
   branches/branch-3.0/src/d1_mask.xbm
   branches/branch-3.0/src/dump_compose.c
   branches/branch-3.0/src/ew.xbm
   branches/branch-3.0/src/ew_mask.xbm
   branches/branch-3.0/src/fastarrow.h
   branches/branch-3.0/src/filename_absolute.cxx
   branches/branch-3.0/src/filename_expand.cxx
   branches/branch-3.0/src/filename_ext.cxx
   branches/branch-3.0/src/filename_isdir.cxx
   branches/branch-3.0/src/filename_list.cxx
   branches/branch-3.0/src/filename_match.cxx
   branches/branch-3.0/src/filename_setext.cxx
   branches/branch-3.0/src/fl_arc.cxx
   branches/branch-3.0/src/fl_arci.cxx
   branches/branch-3.0/src/fl_ask.cxx
   branches/branch-3.0/src/fl_boxtype.cxx
   branches/branch-3.0/src/fl_call_main.cxx
   branches/branch-3.0/src/fl_cmap.h
   branches/branch-3.0/src/fl_color.cxx
   branches/branch-3.0/src/fl_color_mac.cxx
   branches/branch-3.0/src/fl_color_win32.cxx
   branches/branch-3.0/src/fl_cursor.cxx
   branches/branch-3.0/src/fl_curve.cxx
   branches/branch-3.0/src/fl_diamond_box.cxx
   branches/branch-3.0/src/fl_dnd.cxx
   branches/branch-3.0/src/fl_dnd_win32.cxx
   branches/branch-3.0/src/fl_dnd_x.cxx
   branches/branch-3.0/src/fl_draw.cxx
   branches/branch-3.0/src/fl_draw_image.cxx
   branches/branch-3.0/src/fl_draw_image_mac.cxx
   branches/branch-3.0/src/fl_draw_image_win32.cxx
   branches/branch-3.0/src/fl_draw_pixmap.cxx
   branches/branch-3.0/src/fl_encoding_latin1.cxx
   branches/branch-3.0/src/fl_encoding_mac_roman.cxx
   branches/branch-3.0/src/fl_engraved_label.cxx
   branches/branch-3.0/src/fl_file_dir.cxx
   branches/branch-3.0/src/fl_font.cxx
   branches/branch-3.0/src/fl_font_mac.cxx
   branches/branch-3.0/src/fl_font_win32.cxx
   branches/branch-3.0/src/fl_font_x.cxx
   branches/branch-3.0/src/fl_font_xft.cxx
   branches/branch-3.0/src/fl_gtk.cxx
   branches/branch-3.0/src/fl_images_core.cxx
   branches/branch-3.0/src/fl_labeltype.cxx
   branches/branch-3.0/src/fl_line_style.cxx
   branches/branch-3.0/src/fl_open_uri.cxx
   branches/branch-3.0/src/fl_oval_box.cxx
   branches/branch-3.0/src/fl_overlay.cxx
   branches/branch-3.0/src/fl_overlay_visual.cxx
   branches/branch-3.0/src/fl_plastic.cxx
   branches/branch-3.0/src/fl_read_image.cxx
   branches/branch-3.0/src/fl_read_image_mac.cxx
   branches/branch-3.0/src/fl_read_image_win32.cxx
   branches/branch-3.0/src/fl_rect.cxx
   branches/branch-3.0/src/fl_round_box.cxx
   branches/branch-3.0/src/fl_rounded_box.cxx
   branches/branch-3.0/src/fl_scroll_area.cxx
   branches/branch-3.0/src/fl_set_font.cxx
   branches/branch-3.0/src/fl_set_fonts.cxx
   branches/branch-3.0/src/fl_set_fonts_mac.cxx
   branches/branch-3.0/src/fl_set_fonts_win32.cxx
   branches/branch-3.0/src/fl_set_fonts_x.cxx
   branches/branch-3.0/src/fl_set_fonts_xft.cxx
   branches/branch-3.0/src/fl_shadow_box.cxx
   branches/branch-3.0/src/fl_shortcut.cxx
   branches/branch-3.0/src/fl_show_colormap.cxx
   branches/branch-3.0/src/fl_symbols.cxx
   branches/branch-3.0/src/fl_utf.cxx
   branches/branch-3.0/src/fl_utf8.cxx
   branches/branch-3.0/src/fl_vertex.cxx
   branches/branch-3.0/src/flstring.c
   branches/branch-3.0/src/flstring.h
   branches/branch-3.0/src/forms_bitmap.cxx
   branches/branch-3.0/src/forms_compatability.cxx
   branches/branch-3.0/src/forms_fselect.cxx
   branches/branch-3.0/src/forms_pixmap.cxx
   branches/branch-3.0/src/forms_timer.cxx
   branches/branch-3.0/src/freeglut_geometry.cxx
   branches/branch-3.0/src/freeglut_stroke_mono_roman.cxx
   branches/branch-3.0/src/freeglut_stroke_roman.cxx
   branches/branch-3.0/src/freeglut_teapot.cxx
   branches/branch-3.0/src/freeglut_teapot_data.h
   branches/branch-3.0/src/gl_draw.cxx
   branches/branch-3.0/src/gl_start.cxx
   branches/branch-3.0/src/glut_compatability.cxx
   branches/branch-3.0/src/glut_font.cxx
   branches/branch-3.0/src/jpeg/jconfig.h
   branches/branch-3.0/src/jpeg/jdct.h
   branches/branch-3.0/src/jpeg/jerror.h
   branches/branch-3.0/src/jpeg/jinclude.h
   branches/branch-3.0/src/jpeg/jmemsys.h
   branches/branch-3.0/src/jpeg/jmorecfg.h
   branches/branch-3.0/src/jpeg/jpegint.h
   branches/branch-3.0/src/jpeg/jpeglib.h
   branches/branch-3.0/src/jpeg/jversion.h
   branches/branch-3.0/src/mediumarrow.h
   branches/branch-3.0/src/new.xbm
   branches/branch-3.0/src/ns.xbm
   branches/branch-3.0/src/ns_mask.xbm
   branches/branch-3.0/src/numericsort.cxx
   branches/branch-3.0/src/png/png.h
   branches/branch-3.0/src/png/pngconf.h
   branches/branch-3.0/src/png/pngdebug.h
   branches/branch-3.0/src/png/pnginfo.h
   branches/branch-3.0/src/png/pnglibconf.h
   branches/branch-3.0/src/png/pngpriv.h
   branches/branch-3.0/src/png/pngstruct.h
   branches/branch-3.0/src/print_panel.cxx
   branches/branch-3.0/src/print_panel.h
   branches/branch-3.0/src/ps_image.cxx
   branches/branch-3.0/src/scandir.cxx
   branches/branch-3.0/src/scandir_win32.cxx
   branches/branch-3.0/src/screen_xywh.cxx
   branches/branch-3.0/src/slowarrow.h
   branches/branch-3.0/src/tile.xpm
   branches/branch-3.0/src/up.xbm
   branches/branch-3.0/src/vsnprintf.c
   branches/branch-3.0/src/xutf8/
   branches/branch-3.0/src/zlib/crc32.h
   branches/branch-3.0/src/zlib/deflate.h
   branches/branch-3.0/src/zlib/gzguts.h
   branches/branch-3.0/src/zlib/inffast.h
   branches/branch-3.0/src/zlib/inffixed.h
   branches/branch-3.0/src/zlib/inflate.h
   branches/branch-3.0/src/zlib/inftrees.h
   branches/branch-3.0/src/zlib/trees.h
   branches/branch-3.0/src/zlib/zconf.h
   branches/branch-3.0/src/zlib/zlib.h
   branches/branch-3.0/src/zlib/zutil.h
   branches/branch-3.0/zlib/
Modified:
   branches/branch-3.0/configure.in
   branches/branch-3.0/fltk.flw
   branches/branch-3.0/fluid/Fl_Function_Type.cxx
   branches/branch-3.0/fluid/Fl_Group_Type.cxx
   branches/branch-3.0/fluid/Fl_Menu_Type.cxx
   branches/branch-3.0/fluid/Fl_Type.cxx
   branches/branch-3.0/fluid/Fl_Widget_Type.cxx
   branches/branch-3.0/fluid/Fl_Window_Type.cxx
   branches/branch-3.0/fluid/Fluid_Image.cxx
   branches/branch-3.0/fluid/Makefile
   branches/branch-3.0/fluid/code.cxx
   branches/branch-3.0/fluid/factory.cxx
   branches/branch-3.0/fluid/file.cxx
   branches/branch-3.0/fluid/fluid.cxx
   branches/branch-3.0/fluid/makedepend
   branches/branch-3.0/fluid/template_panel.cxx
   branches/branch-3.0/fluid/undo.cxx
   branches/branch-3.0/makeinclude.in
   branches/branch-3.0/src/Makefile
   branches/branch-3.0/src/makedepend
   branches/branch-3.0/test/Makefile
   branches/branch-3.0/test/makedepend
   branches/branch-3.0/test/menubar.cxx

Modified: branches/branch-3.0/configure.in
===================================================================
--- branches/branch-3.0/configure.in	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/configure.in	2011-08-22 15:21:44 UTC (rev 8991)
@@ -31,7 +31,7 @@
 AC_PREREQ(2.50)
 
 dnl Required file in package...
-AC_INIT(src/Fl.cxx)
+AC_INIT(src/core/Fl.cxx)
 
 dnl So --with-archflags option is used during "checking size of long"
 if test `uname` = Darwin; then
@@ -116,49 +116,49 @@
 esac
 
 dnl Define the libraries and link options we will need.
-LINK_FLTK="../lib/libfltk.a"
-LINK_FLTK_GL="../lib/libfltk_gl.a"
-LINK_FLTK_IMAGES="../lib/libfltk_images.a"
-LINK_FLTK_PNG="../lib/libfltk_png.a"
-LINK_FLTK_JPEG="../lib/libfltk_jpeg.a"
-LINK_FLTK_ZLIB="../lib/libfltk_zlib.a"
+LINK_FLTK3="../lib/libfltk3.a"
+LINK_FLTK3GL="../lib/libfltk3gl.a"
+LINK_FLTK3IMAGES="../lib/libfltk3images.a"
+LINK_FLTK3PNG="../lib/libfltk3png.a"
+LINK_FLTK3JPEG="../lib/libfltk3jpeg.a"
+LINK_FLTK3ZLIB="../lib/libfltk3zlib.a"
 GLDEMOS="gldemos"
 
 LIBEXT=".a"
-FLTK_LIBNAME="../lib/libfltk.a"
-FLTK_GL_LIBNAME="../lib/libfltk_gl.a"
-FLTK_IMAGES_LIBNAME="../lib/libfltk_images.a"
-FLTK_PNG_LIBNAME="../lib/libfltk_png.a"
-FLTK_JPEG_LIBNAME="../lib/libfltk_jpeg.a"
-FLTK_ZLIB_LIBNAME="../lib/libfltk_zlib.a"
+FLTK3_LIBNAME="../lib/libfltk3.a"
+FLTK3GL_LIBNAME="../lib/libfltk3gl.a"
+FLTK3IMAGES_LIBNAME="../lib/libfltk3images.a"
+FLTK3PNG_LIBNAME="../lib/libfltk3png.a"
+FLTK3JPEG_LIBNAME="../lib/libfltk3jpeg.a"
+FLTK3ZLIB_LIBNAME="../lib/libfltk3zlib.a"
 
-FLTK_LIBBASENAME="libfltk.a"
-FLTK_GL_LIBBASENAME="libfltk_gl.a"
-FLTK_IMAGES_LIBBASENAME="libfltk_images.a"
-FLTK_PNG_LIBBASENAME="libfltk_png.a"
-FLTK_JPEG_LIBBASENAME="libfltk_jpeg.a"
-FLTK_ZLIB_LIBBASENAME="libfltk_zlib.a"
+FLTK3_LIBBASENAME="libfltk3.a"
+FLTK3GL_LIBBASENAME="libfltk3gl.a"
+FLTK3IMAGES_LIBBASENAME="libfltk3images.a"
+FLTK3PNG_LIBBASENAME="libfltk3png.a"
+FLTK3JPEG_LIBBASENAME="libfltk3jpeg.a"
+FLTK3ZLIB_LIBBASENAME="libfltk3zlib.a"
 
 AC_SUBST(GLDEMOS)
 AC_SUBST(LIBEXT)
-AC_SUBST(FLTK_LIBNAME)
-AC_SUBST(LINK_FLTK)
-AC_SUBST(FLTK_LIBBASENAME)
-AC_SUBST(FLTK_GL_LIBNAME)
-AC_SUBST(LINK_FLTK_GL)
-AC_SUBST(FLTK_GL_LIBBASENAME)
-AC_SUBST(FLTK_IMAGES_LIBNAME)
-AC_SUBST(LINK_FLTK_IMAGES)
-AC_SUBST(FLTK_IMAGES_LIBBASENAME)
-AC_SUBST(FLTK_PNG_LIBNAME)
-AC_SUBST(LINK_FLTK_PNG)
-AC_SUBST(FLTK_PNG_LIBBASENAME)
-AC_SUBST(FLTK_JPEG_LIBNAME)
-AC_SUBST(LINK_FLTK_JPEG)
-AC_SUBST(FLTK_JPEG_LIBBASENAME)
-AC_SUBST(FLTK_ZLIB_LIBNAME)
-AC_SUBST(LINK_FLTK_ZLIB)
-AC_SUBST(FLTK_ZLIB_LIBBASENAME)
+AC_SUBST(FLTK3_LIBNAME)
+AC_SUBST(LINK_FLTK3)
+AC_SUBST(FLTK3_LIBBASENAME)
+AC_SUBST(FLTK3GL_LIBNAME)
+AC_SUBST(LINK_FLTK3GL)
+AC_SUBST(FLTK3GL_LIBBASENAME)
+AC_SUBST(FLTK3IMAGES_LIBNAME)
+AC_SUBST(LINK_FLTK3IMAGES)
+AC_SUBST(FLTK3IMAGES_LIBBASENAME)
+AC_SUBST(FLTK3PNG_LIBNAME)
+AC_SUBST(LINK_FLTK3PNG)
+AC_SUBST(FLTK3PNG_LIBBASENAME)
+AC_SUBST(FLTK3JPEG_LIBNAME)
+AC_SUBST(LINK_FLTK3JPEG)
+AC_SUBST(FLTK3JPEG_LIBBASENAME)
+AC_SUBST(FLTK3ZLIB_LIBNAME)
+AC_SUBST(LINK_FLTK3ZLIB)
+AC_SUBST(FLTK3ZLIB_LIBBASENAME)
 
 dnl Handle compile-time options...
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]])
@@ -184,109 +184,109 @@
 
     case $uname in
         Darwin*)
-            FLTK_DSONAME="libfltk.$FL_API_VERSION.dylib"
-            FLTK_GL_DSONAME="libfltk_gl.$FL_API_VERSION.dylib"
-            FLTK_IMAGES_DSONAME="libfltk_images.$FL_API_VERSION.dylib"
-            FLTK_PNG_DSONAME="libfltk_png.$FL_API_VERSION.dylib"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.$FL_API_VERSION.dylib"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.$FL_API_VERSION.dylib"
+            FLTK3_DSONAME="libfltk3.$FL_API_VERSION.dylib"
+            FLTK3GL_DSONAME="libfltk3gl.$FL_API_VERSION.dylib"
+            FLTK3IMAGES_DSONAME="libfltk3images.$FL_API_VERSION.dylib"
+            FLTK3PNG_DSONAME="libfltk3png.$FL_API_VERSION.dylib"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.$FL_API_VERSION.dylib"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.$FL_API_VERSION.dylib"
             DSOCOMMAND="\$(CXX) \$(ARCHFLAGS) \$(DSOFLAGS) -dynamiclib -lc -o"
             ;;
 
         SunOS* | UNIX_S*)
-            FLTK_DSONAME="libfltk.so.$FL_API_VERSION"
-            FLTK_GL_DSONAME="libfltk_gl.so.$FL_API_VERSION"
-            FLTK_IMAGES_DSONAME="libfltk_images.so.$FL_API_VERSION"
-            FLTK_PNG_DSONAME="libfltk_png.so.$FL_API_VERSION"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.so.$FL_API_VERSION"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.so.$FL_API_VERSION"
+            FLTK3_DSONAME="libfltk3.so.$FL_API_VERSION"
+            FLTK3GL_DSONAME="libfltk3gl.so.$FL_API_VERSION"
+            FLTK3IMAGES_DSONAME="libfltk3images.so.$FL_API_VERSION"
+            FLTK3PNG_DSONAME="libfltk3png.so.$FL_API_VERSION"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.so.$FL_API_VERSION"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.so.$FL_API_VERSION"
             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o"
             if test "x$libdir" != "x/usr/lib"; then
                     DSOLINK="-R$libdir"
             fi
             ;;
         HP-UX*)
-            FLTK_DSONAME="libfltk.sl.$FL_API_VERSION"
-            FLTK_GL_DSONAME="libfltk_gl.sl.$FL_API_VERSION"
-            FLTK_IMAGES_DSONAME="libfltk_images.sl.$FL_API_VERSION"
-            FLTK_PNG_DSONAME="libfltk_png.sl.$FL_API_VERSION"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.sl.$FL_API_VERSION"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.sl.$FL_API_VERSION"
+            FLTK3_DSONAME="libfltk3.sl.$FL_API_VERSION"
+            FLTK3GL_DSONAME="libfltk3gl.sl.$FL_API_VERSION"
+            FLTK3IMAGES_DSONAME="libfltk3images.sl.$FL_API_VERSION"
+            FLTK3PNG_DSONAME="libfltk3png.sl.$FL_API_VERSION"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.sl.$FL_API_VERSION"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.sl.$FL_API_VERSION"
             DSOCOMMAND="ld \$(DSOFLAGS) -b -z +h \$@ $DEBUGFLAG -o"
             if test "x$libdir" != "x/usr/lib"; then
                     DSOLINK="-Wl,-rpath,$libdir"
             fi
             ;;
         IRIX*)
-            FLTK_DSONAME="libfltk.so.$FL_API_VERSION"
-            FLTK_GL_DSONAME="libfltk_gl.so.$FL_API_VERSION"
-            FLTK_IMAGES_DSONAME="libfltk_images.so.$FL_API_VERSION"
-            FLTK_PNG_DSONAME="libfltk_png.so.$FL_API_VERSION"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.so.$FL_API_VERSION"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.so.$FL_API_VERSION"
+            FLTK3_DSONAME="libfltk3.so.$FL_API_VERSION"
+            FLTK3GL_DSONAME="libfltk3gl.so.$FL_API_VERSION"
+            FLTK3IMAGES_DSONAME="libfltk3images.so.$FL_API_VERSION"
+            FLTK3PNG_DSONAME="libfltk3png.so.$FL_API_VERSION"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.so.$FL_API_VERSION"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.so.$FL_API_VERSION"
             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
             if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then
                     DSOLINK="-Wl,-rpath,$libdir"
             fi
             ;;
         OSF1*)
-            FLTK_DSONAME="libfltk.so.$FL_API_VERSION"
-            FLTK_GL_DSONAME="libfltk_gl.so.$FL_API_VERSION"
-            FLTK_IMAGES_DSONAME="libfltk_images.so.$FL_API_VERSION"
-            FLTK_PNG_DSONAME="libfltk_png.so.$FL_API_VERSION"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.so.$FL_API_VERSION"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.so.$FL_API_VERSION"
+            FLTK3_DSONAME="libfltk3.so.$FL_API_VERSION"
+            FLTK3GL_DSONAME="libfltk3gl.so.$FL_API_VERSION"
+            FLTK3IMAGES_DSONAME="libfltk3images.so.$FL_API_VERSION"
+            FLTK3PNG_DSONAME="libfltk3png.so.$FL_API_VERSION"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.so.$FL_API_VERSION"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.so.$FL_API_VERSION"
             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
             if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32"; then
                     DSOLINK="-Wl,-rpath,$libdir"
             fi
             ;;
         Linux* | *BSD*)
-            FLTK_DSONAME="libfltk.so.$FL_API_VERSION"
-            FLTK_GL_DSONAME="libfltk_gl.so.$FL_API_VERSION"
-            FLTK_IMAGES_DSONAME="libfltk_images.so.$FL_API_VERSION"
-            FLTK_PNG_DSONAME="libfltk_png.so.$FL_API_VERSION"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.so.$FL_API_VERSION"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.so.$FL_API_VERSION"
+            FLTK3_DSONAME="libfltk3.so.$FL_API_VERSION"
+            FLTK3GL_DSONAME="libfltk3gl.so.$FL_API_VERSION"
+            FLTK3IMAGES_DSONAME="libfltk3images.so.$FL_API_VERSION"
+            FLTK3PNG_DSONAME="libfltk3png.so.$FL_API_VERSION"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.so.$FL_API_VERSION"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.so.$FL_API_VERSION"
             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
             if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
                     DSOLINK="-Wl,-rpath,$libdir"
             fi
             ;;
         AIX*)
-            FLTK_DSONAME="libfltk_s.a"
-            FLTK_GL_DSONAME="libfltk_gl_s.a"
-            FLTK_IMAGES_DSONAME="libfltk_images_s.a"
-            FLTK_PNG_DSONAME="libfltk_png_s.a"
-            FLTK_JPEG_DSONAME="libfltk_jpeg_s.a"
-            FLTK_ZLIB_DSONAME="libfltk_zlib_s.a"
+            FLTK3_DSONAME="libfltk3_s.a"
+            FLTK3GL_DSONAME="libfltk3gl_s.a"
+            FLTK3IMAGES_DSONAME="libfltk3images_s.a"
+            FLTK3PNG_DSONAME="libfltk3png_s.a"
+            FLTK3JPEG_DSONAME="libfltk3jpeg_s.a"
+            FLTK3ZLIB_DSONAME="libfltk3zlib_s.a"
             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-bexpall,-bM:SRE,-bnoentry -o"
             SHAREDSUFFIX="_s"
             ;;
         CYGWIN* | MINGW*)
             PICFLAG=0
             if test x$enable_cygwin != xyes; then
-                FLTK_DSONAME="mgwfltknox-$FL_API_VERSION.dll"
-                FLTK_GL_DSONAME="mgwfltk_glnox-$FL_API_VERSION.dll"
-                FLTK_IMAGES_DSONAME="mgwfltk_imagesnox-$FL_API_VERSION.dll"
-                FLTK_PNG_DSONAME="mgwfltk_pngnox-$FL_API_VERSION.dll"
-                FLTK_JPEG_DSONAME="mgwfltk_jpegnox-$FL_API_VERSION.dll"
-                FLTK_ZLIB_DSONAME="mgwfltk_zlibnox-$FL_API_VERSION.dll"
+                FLTK3_DSONAME="mgwfltk3nox-$FL_API_VERSION.dll"
+                FLTK3GL_DSONAME="mgwfltk3glnox-$FL_API_VERSION.dll"
+                FLTK3IMAGES_DSONAME="mgwfltk3imagesnox-$FL_API_VERSION.dll"
+                FLTK3PNG_DSONAME="mgwfltk3pngnox-$FL_API_VERSION.dll"
+                FLTK3JPEG_DSONAME="mgwfltk3jpegnox-$FL_API_VERSION.dll"
+                FLTK3ZLIB_DSONAME="mgwfltk3zlibnox-$FL_API_VERSION.dll"
             else
                 if test x$enable_x11 = xyes; then
-                    FLTK_DSONAME="cygfltk-$FL_API_VERSION.dll"
-                    FLTK_GL_DSONAME="cygfltk_gl-$FL_API_VERSION.dll"
-                    FLTK_IMAGES_DSONAME="cygfltk_images-$FL_API_VERSION.dll"
-                    FLTK_PNG_DSONAME="cygfltk_png-$FL_API_VERSION.dll"
-                    FLTK_JPEG_DSONAME="cygfltk_jpeg-$FL_API_VERSION.dll"
-                    FLTK_ZLIB_DSONAME="cygfltk_zlib-$FL_API_VERSION.dll"
+                    FLTK3_DSONAME="cygfltk3-$FL_API_VERSION.dll"
+                    FLTK3GL_DSONAME="cygfltk3gl-$FL_API_VERSION.dll"
+                    FLTK3IMAGES_DSONAME="cygfltk3images-$FL_API_VERSION.dll"
+                    FLTK3PNG_DSONAME="cygfltk3png-$FL_API_VERSION.dll"
+                    FLTK3JPEG_DSONAME="cygfltk3jpeg-$FL_API_VERSION.dll"
+                    FLTK3ZLIB_DSONAME="cygfltk3zlib-$FL_API_VERSION.dll"
                 else
-                    FLTK_DSONAME="cygfltknox-$FL_API_VERSION.dll"
-                    FLTK_GL_DSONAME="cygfltk_glnox-$FL_API_VERSION.dll"
-                    FLTK_IMAGES_DSONAME="cygfltk_imagesnox-$FL_API_VERSION.dll"
-                    FLTK_PNG_DSONAME="cygfltk_pngnox-$FL_API_VERSION.dll"
-                    FLTK_JPEG_DSONAME="cygfltk_jpegnox-$FL_API_VERSION.dll"
-                    FLTK_ZLIB_DSONAME="cygfltk_zlibnox-$FL_API_VERSION.dll"
+                    FLTK3_DSONAME="cygfltk3nox-$FL_API_VERSION.dll"
+                    FLTK3GL_DSONAME="cygfltk3glnox-$FL_API_VERSION.dll"
+                    FLTK3IMAGES_DSONAME="cygfltk3imagesnox-$FL_API_VERSION.dll"
+                    FLTK3PNG_DSONAME="cygfltk3pngnox-$FL_API_VERSION.dll"
+                    FLTK3JPEG_DSONAME="cygfltk3jpegnox-$FL_API_VERSION.dll"
+                    FLTK3ZLIB_DSONAME="cygfltk3zlibnox-$FL_API_VERSION.dll"
                 fi
             fi
             #-----------------------------------------------------------
@@ -301,12 +301,12 @@
             ;;
         *)
             AC_MSG_WARN(Shared libraries may not be supported.  Trying -shared option with compiler.)
-            FLTK_DSONAME="libfltk.so.$FL_API_VERSION"
-            FLTK_GL_DSONAME="libfltk_gl.so.$FL_API_VERSION"
-            FLTK_IMAGES_DSONAME="libfltk_images.so.$FL_API_VERSION"
-            FLTK_PNG_DSONAME="libfltk_png.so.$FL_API_VERSION"
-            FLTK_JPEG_DSONAME="libfltk_jpeg.so.$FL_API_VERSION"
-            FLTK_ZLIB_DSONAME="libfltk_zlib.so.$FL_API_VERSION"
+            FLTK3_DSONAME="libfltk3.so.$FL_API_VERSION"
+            FLTK3GL_DSONAME="libfltk3gl.so.$FL_API_VERSION"
+            FLTK3IMAGES_DSONAME="libfltk3images.so.$FL_API_VERSION"
+            FLTK3PNG_DSONAME="libfltk3png.so.$FL_API_VERSION"
+            FLTK3JPEG_DSONAME="libfltk3jpeg.so.$FL_API_VERSION"
+            FLTK3ZLIB_DSONAME="libfltk3zlib.so.$FL_API_VERSION"
             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
             ;;
     esac
@@ -315,12 +315,12 @@
 else
     DSOCOMMAND="echo"
     DSOLINK=""
-    FLTK_DSONAME=""
-    FLTK_GL_DSONAME=""
-    FLTK_IMAGES_DSONAME=""
-    FLTK_PNG_DSONAME=""
-    FLTK_JPEG_DSONAME=""
-    FLTK_ZLIB_DSONAME=""
+    FLTK3_DSONAME=""
+    FLTK3GL_DSONAME=""
+    FLTK3IMAGES_DSONAME=""
+    FLTK3PNG_DSONAME=""
+    FLTK3JPEG_DSONAME=""
+    FLTK3ZLIB_DSONAME=""
     PICFLAG=0
     SHAREDSUFFIX=""
     FLUID="fluid"
@@ -330,12 +330,12 @@
 AC_SUBST(DSOCOMMAND)
 AC_SUBST(DSOFLAGS)
 AC_SUBST(DSOLINK)
-AC_SUBST(FLTK_DSONAME)
-AC_SUBST(FLTK_GL_DSONAME)
-AC_SUBST(FLTK_IMAGES_DSONAME)
-AC_SUBST(FLTK_PNG_DSONAME)
-AC_SUBST(FLTK_JPEG_DSONAME)
-AC_SUBST(FLTK_ZLIB_DSONAME)
+AC_SUBST(FLTK3_DSONAME)
+AC_SUBST(FLTK3GL_DSONAME)
+AC_SUBST(FLTK3IMAGES_DSONAME)
+AC_SUBST(FLTK3PNG_DSONAME)
+AC_SUBST(FLTK3JPEG_DSONAME)
+AC_SUBST(FLTK3ZLIB_DSONAME)
 AC_SUBST(SHAREDSUFFIX)
 AC_SUBST(LINKSHARED)
 AC_SUBST(FLUID)
@@ -610,7 +610,7 @@
 # Handle the JPEG lib linking mode (use fltk local or system lib)
 # If --enable-(resp. --disable-)localjpeg parameter is not set by user
 # Then we check the JPEG lib usability, with result in sysjpeglib_ok variable
-AC_ARG_ENABLE(localjpeg, [  --enable-localjpeg      use local JPEG library, default=auto])
+AC_ARG_ENABLE(localjpeg, [  --enable-localjpeg      use local JPEG library, default=yes])
 # Check for System lib use if automatic mode or --disable-localjpeg is requested
 sysjpeglib_ok=no
 sysjpeginc_ok=no
@@ -624,10 +624,10 @@
 fi
 # Now set the jpeg lib and include flags according to the requested mode and availability 
 if test x$enable_localjpeg = xyes -o x$sysjpeglib_ok = xno; then
-    JPEGINC="-I../jpeg"
+    JPEGINC="-I../include/fltk3jpeg"
     JPEG="jpeg"
-    IMAGELIBS="-lfltk_jpeg $IMAGELIBS"
-    STATICIMAGELIBS="\$libdir/libfltk_jpeg.a $STATICIMAGELIBS"
+    IMAGELIBS="-lfltk3jpeg $IMAGELIBS"
+    STATICIMAGELIBS="\$libdir/libfltk3jpeg.a $STATICIMAGELIBS"
     AC_DEFINE(HAVE_LIBJPEG)
     #ac_cv_lib_jpeg_jpeg_CreateCompress=no # from ima: should not be necessary
     # Finally, warn user if system lib was requested but not found
@@ -645,7 +645,7 @@
 # Handle the ZLIB lib linking mode (use fltk local or system lib)
 # If --enable-(resp. --disable-)localzlib parameter is not set by user
 # Then we check the ZLIB lib usability, with result in syszlib_ok variable
-AC_ARG_ENABLE(localzlib, [  --enable-localzlib      use local ZLIB library, default=auto])
+AC_ARG_ENABLE(localzlib, [  --enable-localzlib      use local ZLIB library, default=yes])
 # Check for System lib use if automatic mode or --disable-localzlib is requested
 syszlib_ok=no
 syszinc_ok=no
@@ -659,11 +659,11 @@
 fi
 # Now set the Z lib and include flags according to the requested mode and availability 
 if test x$enable_localzlib = xyes -o x$syszlib_ok = xno ; then
-    ZLIBINC="-I../zlib"
+    ZLIBINC="-I../include/fltk3zlib"
     ZLIB="zlib"
-    LIBS="-lfltk_zlib $LIBS"
-    IMAGELIBS="-lfltk_zlib $IMAGELIBS"
-    STATICIMAGELIBS="\$libdir/libfltk_zlib.a $STATICIMAGELIBS"
+    LIBS="-lfltk3zlib $LIBS"
+    IMAGELIBS="-lfltk3zlib $IMAGELIBS"
+    STATICIMAGELIBS="\$libdir/libfltk3zlib.a $STATICIMAGELIBS"
     AC_DEFINE(HAVE_LIBZ)
     ac_cv_lib_z_gzgets=no # fc: is still necessary ?
     # Finally, warn user if system lib was requested but not found
@@ -682,7 +682,7 @@
 # Handle the PNG lib linking mode (use fltk local or system lib)
 # If --enable-(resp. --disable-)localpng parameter is not set by user
 # Then we check the png lib usability with result in syspng_lib variable
-AC_ARG_ENABLE(localpng, [  --enable-localpng       use local PNG library, default=auto])
+AC_ARG_ENABLE(localpng, [  --enable-localpng       use local PNG library, default=yes])
 
 # Now check if system lib is usable, we check Lib AND include availability with inc variant,
 # but only, if the builtin lib is not requested
@@ -703,10 +703,10 @@
 
 # The following is executed if the lib was not found usable or if local lib is required explicitly
 if test x$enable_localpng = xyes -o x$syspnglib_ok = xno ; then
-    PNGINC="-I../png"
+    PNGINC="-I../include/fltk3png"
     PNG="png"
-    IMAGELIBS="-lfltk_png $IMAGELIBS"
-    STATICIMAGELIBS="\$libdir/libfltk_png.a $STATICIMAGELIBS"
+    IMAGELIBS="-lfltk3png $IMAGELIBS"
+    STATICIMAGELIBS="\$libdir/libfltk3png.a $STATICIMAGELIBS"
     AC_DEFINE(HAVE_LIBPNG)
     AC_DEFINE(HAVE_PNG_H)
     AC_DEFINE(HAVE_PNG_GET_VALID)
@@ -1371,7 +1371,7 @@
 
 dnl Write all of the files...
 AC_CONFIG_HEADER(config.h:configh.in)
-AC_OUTPUT(makeinclude fltk.list fltk-config fltk.spec FL/Makefile)
+AC_OUTPUT(makeinclude fltk.list fltk-config fltk.spec include/fltk3/Makefile)
 
 dnl Make sure the fltk-config script is executable...
 chmod +x fltk-config

Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fltk.flw	2011-08-22 15:21:44 UTC (rev 8991)
@@ -2,7 +2,7 @@
 version 3.0000 
 header_name {.h} 
 code_name {.cxx}
-workspace FLTK {open
+workspace FLTK {open selected
   uuid_Xcode4_Root {2204C862-3EAB-44CD-B0A8-6DF16FFDC8F4}
   uuid_Xcode4_ProductsGroup {A3B55F76-F5F9-4F9E-8A45-2778583213A1}
   uuid_Xcode4_Group {341D2CD3-06FB-47E4-B35C-D1F9B51C7293}
@@ -12,6 +12,7 @@
   uuid_Xcode4_ReleaseBuildConfiguration {C5259E66-FBF8-43A2-B30F-8D59BBE3CF16}
   uuid_VC2008_Workspace {D21EA206-7BBC-4F5B-8518-A798E56EE0FC}
   uuid_VC2010_Workspace {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
+  build_env 1
 } {
   folder Applications {open
     uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
@@ -279,31 +280,31 @@
       folder Dependencies {open
         uuid_Xcode4_Group {A6C2C5AC-C608-489D-8C74-B63CCDEB081B}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {B8FB366B-209C-4E6D-A6BF-961C45B9CABE}
           uuid_Xcode4_BuildFileInCopyFiles {D820C6D4-CC75-4FB7-8331-FBC1DA96464D}
           uuid_Xcode4_ContainerItemProxy {110949FF-BCC8-4DBF-BB4F-48C3FAE496EC}
           uuid_Xcode4_TargetDependency {D1864C87-7336-4379-A998-0C7EEA5BF89E}
         }
-        target_dependency fltk_images {
+        target_dependency fltk3images {
           uuid_Xcode4_BuildFileInFrameworks {4866D037-C9C8-4C6A-9B7A-96EE5292144C}
           uuid_Xcode4_BuildFileInCopyFiles {2F540F9D-650D-4FF6-BF0D-64890E338D2B}
           uuid_Xcode4_ContainerItemProxy {2CE56FE8-16AA-4473-95FB-AC67835EBAC1}
           uuid_Xcode4_TargetDependency {0858623D-80DB-46C4-B90D-DFBA4C7A2109}
         }
-        target_dependency fltk_png {
+        target_dependency fltk3png {
           uuid_Xcode4_BuildFileInFrameworks {3E5B5872-AF7E-4A07-99EB-AB98C0EAAA85}
           uuid_Xcode4_BuildFileInCopyFiles {F552DCC4-71E4-404E-A678-E6B4C6F1988A}
           uuid_Xcode4_ContainerItemProxy {3143C159-1BDC-4FD1-9796-7B5D0DC00309}
           uuid_Xcode4_TargetDependency {785B1845-DCDD-4315-9D7A-B42AD474CA8B}
         }
-        target_dependency fltk_jpeg {
+        target_dependency fltk3jpeg {
           uuid_Xcode4_BuildFileInFrameworks {6138F435-ED9E-4A53-9DE7-63A95EC0C6BD}
           uuid_Xcode4_BuildFileInCopyFiles {CC663664-AAA4-45BB-9B3C-73F8CB778028}
           uuid_Xcode4_ContainerItemProxy {5BF281B9-FC98-4EBE-A3DF-9BCDBC8F9203}
           uuid_Xcode4_TargetDependency {1B574128-6173-4A14-BDDA-1D6595B5BE71}
         }
-        target_dependency fltk_zlib {
+        target_dependency fltk3zlib {
           uuid_Xcode4_BuildFileInFrameworks {97A7C9B9-2334-4593-AF2E-C78E02AEBDDF}
           uuid_Xcode4_BuildFileInCopyFiles {0D2A2AC9-1CDD-4408-8DFB-1D4E1B01BBEF}
           uuid_Xcode4_ContainerItemProxy {529024F4-EDEF-44C3-99C0-01650CE6F845}
@@ -315,7 +316,7 @@
   folder Libraries {open
     uuid_Xcode4_Group {AFD010B3-DA64-4C5E-9682-891530BD3B73}
   } {
-    lib_target fltk {open
+    lib_target fltk3 {open
       uuid_Xcode4_BuildConfigurationList {F8A317C2-0F96-4681-8A97-DA6FDEF118E2}
       uuid_Xcode4_DebugBuildConfiguration {034870F2-FE15-4D23-AD0D-62ED38449392}
       uuid_Xcode4_ReleaseBuildConfiguration {D584B52C-FED3-4E71-A47E-A60BA05375B9}
@@ -333,7 +334,7 @@
       target_path lib
       makefile_path src
     } {
-      folder Headers {open selected
+      folder Headers {open
         uuid_Xcode4_Group {C2F00625-E401-4002-85F6-FA183D17629D}
       } {
         file_ref {Adjuster.h} {
@@ -342,7 +343,7 @@
           uuid_Xcode4_BuildFileInHeaders {757ECB76-8063-4DF1-93FD-E1FD4B8A4A42}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Adjuster.h}
+          filename_and_path {include/fltk3/Adjuster.h}
         }
         file_ref {ask.h} {
           uuid_Xcode4_BuildFile {AEDF2A15-B44B-4BD8-B754-2E54A44DB5B5}
@@ -350,7 +351,7 @@
           uuid_Xcode4_BuildFileInHeaders {CC311448-C3B8-44D6-B35A-7A9B0D5614AF}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ask.h}
+          filename_and_path {include/fltk3/ask.h}
         }
         file_ref {Bitmap.h} {
           uuid_Xcode4_BuildFile {D83BCD17-0F87-4FB5-8986-C0F3F65C02EB}
@@ -358,7 +359,7 @@
           uuid_Xcode4_BuildFileInHeaders {72A9364B-67F2-460A-921A-4CC4D9A43B9E}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Bitmap.h}
+          filename_and_path {include/fltk3/Bitmap.h}
         }
         file_ref {BMPImage.h} {
           uuid_Xcode4_BuildFile {B02F1ACA-8C63-4C41-A0FA-429D42B66E10}
@@ -366,7 +367,7 @@
           uuid_Xcode4_BuildFileInHeaders {26C1F556-804D-49CA-B330-7472D37CCAA4}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/BMPImage.h}
+          filename_and_path {include/fltk3/BMPImage.h}
         }
         file_ref {Box.h} {
           uuid_Xcode4_BuildFile {A443E7E1-065D-4CA8-9E14-C567C120B62E}
@@ -374,7 +375,7 @@
           uuid_Xcode4_BuildFileInHeaders {35DE2AD5-BDB0-4B90-80D1-C157A6545D86}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Box.h}
+          filename_and_path {include/fltk3/Box.h}
         }
         file_ref {Browser_.h} {
           uuid_Xcode4_BuildFile {28FD6277-A75E-45F4-8AC0-D32D4A90E8B8}
@@ -382,7 +383,7 @@
           uuid_Xcode4_BuildFileInHeaders {42605FAF-D17F-4638-8932-E98BA405E61E}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Browser_.h}
+          filename_and_path {include/fltk3/Browser_.h}
         }
         file_ref {Browser.h} {
           uuid_Xcode4_BuildFile {1BC27473-D70A-460D-B8FF-9467FE0B8189}
@@ -390,7 +391,7 @@
           uuid_Xcode4_BuildFileInHeaders {7713D959-C2A9-4A48-A151-F0B850DE9A22}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Browser.h}
+          filename_and_path {include/fltk3/Browser.h}
         }
         file_ref {Button.h} {
           uuid_Xcode4_BuildFile {56A922CB-2D4C-47E2-9F32-E53F75395679}
@@ -398,7 +399,7 @@
           uuid_Xcode4_BuildFileInHeaders {A086301E-F42A-4C98-B69A-207AD822CDA5}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Button.h}
+          filename_and_path {include/fltk3/Button.h}
         }
         file_ref {Cairo.h} {
           uuid_Xcode4_BuildFile {E0086A45-7DE4-4B92-AE3C-61476A5C58AC}
@@ -406,7 +407,7 @@
           uuid_Xcode4_BuildFileInHeaders {F1922355-C0E4-42FF-B6CF-C64D7EF0794A}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Cairo.h}
+          filename_and_path {include/fltk3/Cairo.h}
         }
         file_ref {CairoWindow.h} {
           uuid_Xcode4_BuildFile {3437BED3-6247-4AF8-BEF3-E0DD0C4CA738}
@@ -414,7 +415,7 @@
           uuid_Xcode4_BuildFileInHeaders {4B4514C2-2A07-4E5A-A5D5-BE4A39AC00FD}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/CairoWindow.h}
+          filename_and_path {include/fltk3/CairoWindow.h}
         }
         file_ref {Chart.h} {
           uuid_Xcode4_BuildFile {2D4F6D8F-847F-4179-94C7-C62F62E6E2E1}
@@ -422,7 +423,7 @@
           uuid_Xcode4_BuildFileInHeaders {D048A520-EDE9-4F43-93E6-03307AEB63AB}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Chart.h}
+          filename_and_path {include/fltk3/Chart.h}
         }
         file_ref {CheckBrowser.h} {
           uuid_Xcode4_BuildFile {3A59B91F-DC0C-4E99-87E8-DDD3192A85D5}
@@ -430,7 +431,7 @@
           uuid_Xcode4_BuildFileInHeaders {25AADC4E-F29E-413C-AF2D-7FE87A10E45C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/CheckBrowser.h}
+          filename_and_path {include/fltk3/CheckBrowser.h}
         }
         file_ref {CheckButton.h} {
           uuid_Xcode4_BuildFile {E3F8FE30-AB1B-4F85-8FC4-DC80874A922F}
@@ -438,7 +439,7 @@
           uuid_Xcode4_BuildFileInHeaders {AA31B0AE-6C72-4409-8F77-4A2F6A74B681}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/CheckButton.h}
+          filename_and_path {include/fltk3/CheckButton.h}
         }
         file_ref {Choice.h} {
           uuid_Xcode4_BuildFile {1F012CFB-A6E1-4945-A9B7-86F6A9BCF983}
@@ -446,7 +447,7 @@
           uuid_Xcode4_BuildFileInHeaders {DC27C811-8F0D-4E0A-BFE0-0FFF0781059C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Choice.h}
+          filename_and_path {include/fltk3/Choice.h}
         }
         file_ref {Clock.h} {
           uuid_Xcode4_BuildFile {714334FF-5D89-4BA6-9C63-339DE784279E}
@@ -454,7 +455,7 @@
           uuid_Xcode4_BuildFileInHeaders {461C93A2-6C95-4F96-964B-6F91C35C104C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Clock.h}
+          filename_and_path {include/fltk3/Clock.h}
         }
         file_ref {ColorChooser.h} {
           uuid_Xcode4_BuildFile {4E4C6BDD-DD3C-486B-9F8B-4C0C67DA0183}
@@ -462,7 +463,7 @@
           uuid_Xcode4_BuildFileInHeaders {ECAF2473-7556-47E6-987E-1CF2D90709AB}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ColorChooser.h}
+          filename_and_path {include/fltk3/ColorChooser.h}
         }
         file_ref {Counter.h} {
           uuid_Xcode4_BuildFile {F86B5E39-4135-4B33-9DDA-E9F0C4DDF91F}
@@ -470,7 +471,7 @@
           uuid_Xcode4_BuildFileInHeaders {AB0027C4-0E48-4E2D-A47C-63DC6F8005A4}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Counter.h}
+          filename_and_path {include/fltk3/Counter.h}
         }
         file_ref {Device.h} {
           uuid_Xcode4_BuildFile {D2B75DDD-0FB8-4245-B646-F692C20A37A8}
@@ -478,7 +479,7 @@
           uuid_Xcode4_BuildFileInHeaders {94A746DB-214C-45E3-913A-6B958F66C743}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Device.h}
+          filename_and_path {include/fltk3/Device.h}
         }
         file_ref {Dial.h} {
           uuid_Xcode4_BuildFile {E5B25268-CCB4-4EFE-9232-DB0631926A25}
@@ -486,7 +487,7 @@
           uuid_Xcode4_BuildFileInHeaders {8AE207C7-9385-491F-9AD1-301D8986E342}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Dial.h}
+          filename_and_path {include/fltk3/Dial.h}
         }
         file_ref {dirent.h} {
           uuid_Xcode4_BuildFile {4D18FEE1-2E3E-4C13-B0FC-D5A3F45FD1B2}
@@ -494,7 +495,7 @@
           uuid_Xcode4_BuildFileInHeaders {0D8E3B84-F38C-4F4E-87B7-36F76BDEAD11}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/dirent.h}
+          filename_and_path {include/fltk3/dirent.h}
         }
         file_ref {DoubleWindow.h} {
           uuid_Xcode4_BuildFile {C914169D-8DAD-49F1-973F-B6C1EE636CC0}
@@ -502,7 +503,7 @@
           uuid_Xcode4_BuildFileInHeaders {25D240CF-7FD0-4512-9541-BC9147CFB972}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/DoubleWindow.h}
+          filename_and_path {include/fltk3/DoubleWindow.h}
         }
         file_ref {draw.h} {
           uuid_Xcode4_BuildFile {87FA373D-1868-4353-94D6-7CC84E82F89D}
@@ -510,7 +511,7 @@
           uuid_Xcode4_BuildFileInHeaders {2D8A06C2-A684-4BBC-9074-816B411621F3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/draw.h}
+          filename_and_path {include/fltk3/draw.h}
         }
         file_ref {enumerations.h} {
           uuid_Xcode4_BuildFile {B3B44B22-A2AB-4046-BE0D-01AC71420AEE}
@@ -518,7 +519,7 @@
           uuid_Xcode4_BuildFileInHeaders {FDE3D852-C30F-4612-8D20-4F455DB7C755}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/enumerations.h}
+          filename_and_path {include/fltk3/enumerations.h}
         }
         file_ref {Export.h} {
           uuid_Xcode4_BuildFile {D3C18CCD-F2C1-4685-902F-DE409B589265}
@@ -526,7 +527,7 @@
           uuid_Xcode4_BuildFileInHeaders {E26E5B3F-935D-4CD5-9519-C470334CD6BD}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Export.h}
+          filename_and_path {include/fltk3/Export.h}
         }
         file_ref {FileBrowser.h} {
           uuid_Xcode4_BuildFile {BC0DCAEA-F201-436F-8293-974E7D64E065}
@@ -534,7 +535,7 @@
           uuid_Xcode4_BuildFileInHeaders {5C0C7B7C-7B7D-4BD1-960A-C9F1E33840F0}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FileBrowser.h}
+          filename_and_path {include/fltk3/FileBrowser.h}
         }
         file_ref {FileChooser.h} {
           uuid_Xcode4_BuildFile {0CB0EBF3-B975-46CC-8918-C4E211FA4048}
@@ -542,7 +543,7 @@
           uuid_Xcode4_BuildFileInHeaders {3A9C5ECF-2BAD-42B3-B946-66BD0CA7A48C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FileChooser.h}
+          filename_and_path {include/fltk3/FileChooser.h}
         }
         file_ref {FileIcon.h} {
           uuid_Xcode4_BuildFile {3716C3D5-92AE-4141-AA97-DD2ADE3750A6}
@@ -550,7 +551,7 @@
           uuid_Xcode4_BuildFileInHeaders {9BF596FE-B1E4-4820-B2DC-3B6DA3F6E734}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FileIcon.h}
+          filename_and_path {include/fltk3/FileIcon.h}
         }
         file_ref {FileInput.h} {
           uuid_Xcode4_BuildFile {8245FBEA-22EA-408C-9198-D464AC8B07CB}
@@ -558,7 +559,7 @@
           uuid_Xcode4_BuildFileInHeaders {61494E2D-0FB7-41C8-B06D-6E0BF8C8F159}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FileInput.h}
+          filename_and_path {include/fltk3/FileInput.h}
         }
         file_ref {filename.h} {
           uuid_Xcode4_BuildFile {2567B83E-EC58-4004-938C-0632F0947FD3}
@@ -566,7 +567,7 @@
           uuid_Xcode4_BuildFileInHeaders {8836B634-99CB-4580-A741-697F1EA78A51}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/filename.h}
+          filename_and_path {include/fltk3/filename.h}
         }
         file_ref {FillDial.h} {
           uuid_Xcode4_BuildFile {E8A30BF0-DB33-4B0C-80BF-B8732323CC5A}
@@ -574,7 +575,7 @@
           uuid_Xcode4_BuildFileInHeaders {A2F8F6E1-7232-462B-8FFC-A7C42D9478D6}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FillDial.h}
+          filename_and_path {include/fltk3/FillDial.h}
         }
         file_ref {FillSlider.h} {
           uuid_Xcode4_BuildFile {3AC5E477-8EB2-438C-9321-387A4D128525}
@@ -582,7 +583,7 @@
           uuid_Xcode4_BuildFileInHeaders {B4296EAA-4A9D-4EFD-B418-68ACD54887F6}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FillSlider.h}
+          filename_and_path {include/fltk3/FillSlider.h}
         }
         file_ref {FloatInput.h} {
           uuid_Xcode4_BuildFile {6A64A514-3CD0-4BF8-863C-3B24348C989E}
@@ -590,7 +591,7 @@
           uuid_Xcode4_BuildFileInHeaders {40EE4457-2251-440D-9DB4-F2C22AAB502C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FloatInput.h}
+          filename_and_path {include/fltk3/FloatInput.h}
         }
         file_ref {forms.h} {
           uuid_Xcode4_BuildFile {13BD0083-5C3A-4485-B0C4-76521CB9DCF9}
@@ -598,7 +599,7 @@
           uuid_Xcode4_BuildFileInHeaders {0AEE62FF-5E0B-4D27-9E43-D21940004C32}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/forms.h}
+          filename_and_path {include/fltk3/forms.h}
         }
         file_ref {FormsBitmap.h} {
           uuid_Xcode4_BuildFile {16C8EAEF-18D0-4B67-B81A-EF35EB92559A}
@@ -606,7 +607,7 @@
           uuid_Xcode4_BuildFileInHeaders {20CBFB6F-1144-464E-9949-D183A0751DBF}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FormsBitmap.h}
+          filename_and_path {include/fltk3/FormsBitmap.h}
         }
         file_ref {FormsPixmap.h} {
           uuid_Xcode4_BuildFile {CF013257-1A2A-481C-AAA2-28D934B7AAC1}
@@ -614,7 +615,7 @@
           uuid_Xcode4_BuildFileInHeaders {742D204F-0600-4AEC-AB75-6D25D53AC070}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/FormsPixmap.h}
+          filename_and_path {include/fltk3/FormsPixmap.h}
         }
         file_ref {Free.h} {
           uuid_Xcode4_BuildFile {E420FEC9-D30F-468D-A6B6-7AD4CEA93947}
@@ -622,7 +623,7 @@
           uuid_Xcode4_BuildFileInHeaders {6A197BCC-1ECB-4FDC-A201-11676D368B25}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Free.h}
+          filename_and_path {include/fltk3/Free.h}
         }
         file_ref {GIFImage.h} {
           uuid_Xcode4_BuildFile {E1645FE3-A511-42A3-873D-131C575CF91A}
@@ -630,7 +631,7 @@
           uuid_Xcode4_BuildFileInHeaders {8845649A-5BB6-4BA3-879C-1952D0C93211}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/GIFImage.h}
+          filename_and_path {include/fltk3/GIFImage.h}
         }
         file_ref {gl.h} {
           uuid_Xcode4_BuildFile {171AF659-2712-45E4-917F-0971FA2C1040}
@@ -638,7 +639,7 @@
           uuid_Xcode4_BuildFileInHeaders {53065D00-00D5-4F2D-B6B0-0238CFA68C55}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/gl.h}
+          filename_and_path {include/fltk3/gl.h}
         }
         file_ref {gl2opengl.h} {
           uuid_Xcode4_BuildFile {A18A80EF-C434-4B35-BE46-702905667C1D}
@@ -646,7 +647,7 @@
           uuid_Xcode4_BuildFileInHeaders {72812FEB-26EE-488F-9EEC-B4ED02F3DE4D}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/gl2opengl.h}
+          filename_and_path {include/fltk3/gl2opengl.h}
         }
         file_ref {glDraw.h} {
           uuid_Xcode4_BuildFile {0CE51E55-FA96-44E7-B2E8-67DD96F3C30C}
@@ -654,7 +655,7 @@
           uuid_Xcode4_BuildFileInHeaders {48257DCA-61D9-4813-AF09-08C1AA38665E}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/glDraw.h}
+          filename_and_path {include/fltk3/glDraw.h}
         }
         file_ref {glu.h} {
           uuid_Xcode4_BuildFile {E5E7BD83-9048-4F70-B075-3AEBA4E431F3}
@@ -662,7 +663,7 @@
           uuid_Xcode4_BuildFileInHeaders {4DB7B8EB-64B3-4C69-9F0A-88278049A0C9}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/glu.h}
+          filename_and_path {include/fltk3/glu.h}
         }
         file_ref {glut.h} {
           uuid_Xcode4_BuildFile {8AB70A97-595C-4E23-B623-688B0FF2BCE4}
@@ -670,7 +671,7 @@
           uuid_Xcode4_BuildFileInHeaders {665EED20-74C2-4B26-A298-617066EA7551}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/glut.h}
+          filename_and_path {include/fltk3/glut.h}
         }
         file_ref {GlWindow.h} {
           uuid_Xcode4_BuildFile {8949C41C-2C1C-4C70-B1D1-CD2E7FF04607}
@@ -678,7 +679,7 @@
           uuid_Xcode4_BuildFileInHeaders {7A5AD5C3-4B24-4558-AD62-1B5C2E02E9F8}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/GlWindow.h}
+          filename_and_path {include/fltk3/GlWindow.h}
         }
         file_ref {Group.h} {
           uuid_Xcode4_BuildFile {2D46FE73-1213-4993-9C58-3AD4F912D0F1}
@@ -686,7 +687,7 @@
           uuid_Xcode4_BuildFileInHeaders {5E1D236D-9F1B-4003-9849-9118F39D88D0}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Group.h}
+          filename_and_path {include/fltk3/Group.h}
         }
         file_ref {HelpDialog.h} {
           uuid_Xcode4_BuildFile {039E6910-80A1-4672-8705-02AC45E81900}
@@ -694,7 +695,7 @@
           uuid_Xcode4_BuildFileInHeaders {F7A66B0A-98D9-44E3-B704-829151BB84FB}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HelpDialog.h}
+          filename_and_path {include/fltk3/HelpDialog.h}
         }
         file_ref {HelpView.h} {
           uuid_Xcode4_BuildFile {35AC3DE1-3781-43C2-A095-E3DC454BDCD4}
@@ -702,7 +703,7 @@
           uuid_Xcode4_BuildFileInHeaders {E5826346-35B1-44CF-847B-2081214A9B1B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HelpView.h}
+          filename_and_path {include/fltk3/HelpView.h}
         }
         file_ref {HoldBrowser.h} {
           uuid_Xcode4_BuildFile {49B90CF5-91E1-4814-A362-A2044664DE22}
@@ -710,7 +711,7 @@
           uuid_Xcode4_BuildFileInHeaders {0CBBFB5E-78C4-408D-B206-C4AD8AC9A2E0}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HoldBrowser.h}
+          filename_and_path {include/fltk3/HoldBrowser.h}
         }
         file_ref {HorFillSlider.h} {
           uuid_Xcode4_BuildFile {4FC85770-D876-4202-93C8-0B47C06A7864}
@@ -718,7 +719,7 @@
           uuid_Xcode4_BuildFileInHeaders {C731F1AF-5BBD-4CE8-BC2C-9F9B79E819E5}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HorFillSlider.h}
+          filename_and_path {include/fltk3/HorFillSlider.h}
         }
         file_ref {HorNiceSlider.h} {
           uuid_Xcode4_BuildFile {069B4980-A156-4F26-AE84-D70B7AAB0958}
@@ -726,7 +727,7 @@
           uuid_Xcode4_BuildFileInHeaders {2434070F-F43B-475D-8783-E7E46C21E521}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HorNiceSlider.h}
+          filename_and_path {include/fltk3/HorNiceSlider.h}
         }
         file_ref {HorSlider.h} {
           uuid_Xcode4_BuildFile {4B1AABAD-79EA-4796-97CD-F347C825D3AF}
@@ -734,7 +735,7 @@
           uuid_Xcode4_BuildFileInHeaders {C334620B-BD8B-4E36-92AD-84BD2D9B6288}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HorSlider.h}
+          filename_and_path {include/fltk3/HorSlider.h}
         }
         file_ref {HorValueSlider.h} {
           uuid_Xcode4_BuildFile {8C3AD61D-0E49-444A-86A7-57A53EF411E4}
@@ -742,7 +743,7 @@
           uuid_Xcode4_BuildFileInHeaders {7002C191-8642-4B49-A0CB-1F7CA1E02B97}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/HorValueSlider.h}
+          filename_and_path {include/fltk3/HorValueSlider.h}
         }
         file_ref {Image.h} {
           uuid_Xcode4_BuildFile {3C411723-0BA7-420B-AB44-CC070E604583}
@@ -750,7 +751,7 @@
           uuid_Xcode4_BuildFileInHeaders {18E4DD12-8C1E-4E2D-8067-74ACC23340D2}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Image.h}
+          filename_and_path {include/fltk3/Image.h}
         }
         file_ref {Input_.h} {
           uuid_Xcode4_BuildFile {7A45BCF9-5AF0-4946-8F5F-2685AE0BB1B8}
@@ -758,7 +759,7 @@
           uuid_Xcode4_BuildFileInHeaders {7E5C399B-F774-40EA-A8C4-6776AD8D99C7}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Input_.h}
+          filename_and_path {include/fltk3/Input_.h}
         }
         file_ref {Input.h} {
           uuid_Xcode4_BuildFile {B4744BA6-3A72-44C6-AECB-1886322E24B9}
@@ -766,7 +767,7 @@
           uuid_Xcode4_BuildFileInHeaders {78D8944F-2B82-4BD3-ADAC-5BFB4682C312}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Input.h}
+          filename_and_path {include/fltk3/Input.h}
         }
         file_ref {InputChoice.h} {
           uuid_Xcode4_BuildFile {AD7AEF6A-2D92-41A6-B0BF-D55FDFA155FC}
@@ -774,7 +775,7 @@
           uuid_Xcode4_BuildFileInHeaders {6291854E-0119-44D4-A168-971E3495507E}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/InputChoice.h}
+          filename_and_path {include/fltk3/InputChoice.h}
         }
         file_ref {IntInput.h} {
           uuid_Xcode4_BuildFile {DD5E12EF-D917-4A2D-A1BB-2A4C73C57153}
@@ -782,7 +783,7 @@
           uuid_Xcode4_BuildFileInHeaders {0F589793-D1A8-4B9A-A566-C3E8EBBEA347}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/IntInput.h}
+          filename_and_path {include/fltk3/IntInput.h}
         }
         file_ref {JPEGImage.h} {
           uuid_Xcode4_BuildFile {E924726D-D8F9-42F3-99B6-0B33A6E07929}
@@ -790,7 +791,7 @@
           uuid_Xcode4_BuildFileInHeaders {30029E6A-2C65-48E5-8722-0B7CFEBA9CF8}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/JPEGImage.h}
+          filename_and_path {include/fltk3/JPEGImage.h}
         }
         file_ref {LightButton.h} {
           uuid_Xcode4_BuildFile {CC28845A-AB92-4F7F-8BAB-D7C630F0AD00}
@@ -798,7 +799,7 @@
           uuid_Xcode4_BuildFileInHeaders {8E35401D-136F-4D7B-97E6-D9AEE1E2E147}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/LightButton.h}
+          filename_and_path {include/fltk3/LightButton.h}
         }
         file_ref {LineDial.h} {
           uuid_Xcode4_BuildFile {18F94519-BC08-476F-AA92-C89EFFC7D6C0}
@@ -806,7 +807,7 @@
           uuid_Xcode4_BuildFileInHeaders {C5C32DAE-E855-4957-BEF4-6CA912F86757}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/LineDial.h}
+          filename_and_path {include/fltk3/LineDial.h}
         }
         file_ref {math.h} {
           uuid_Xcode4_BuildFile {9E556D63-6BE1-4DAA-BE86-D6882A75C50E}
@@ -814,7 +815,7 @@
           uuid_Xcode4_BuildFileInHeaders {E62C50EA-E62F-4C63-9214-D945F3A50640}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/math.h}
+          filename_and_path {include/fltk3/math.h}
         }
         file_ref {Menu_.h} {
           uuid_Xcode4_BuildFile {6E367156-49F5-45B1-8865-73C6C12A3AD4}
@@ -822,7 +823,7 @@
           uuid_Xcode4_BuildFileInHeaders {460DA151-8796-426A-AEF1-099BF42C91D0}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Menu_.h}
+          filename_and_path {include/fltk3/Menu_.h}
         }
         file_ref {Menu.h} {
           uuid_Xcode4_BuildFile {49A939E9-0E99-4BCD-B42E-F1E99E13D150}
@@ -830,7 +831,7 @@
           uuid_Xcode4_BuildFileInHeaders {52639EA1-9489-42A9-9577-65334616D3B1}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Menu.h}
+          filename_and_path {include/fltk3/Menu.h}
         }
         file_ref {MenuBar.h} {
           uuid_Xcode4_BuildFile {0EEEBBEA-D744-4E2B-8A67-867E2D3D50AC}
@@ -838,7 +839,7 @@
           uuid_Xcode4_BuildFileInHeaders {13B94AD3-BB4B-4D0E-B2C5-5F11DDF980B9}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MenuBar.h}
+          filename_and_path {include/fltk3/MenuBar.h}
         }
         file_ref {MenuButton.h} {
           uuid_Xcode4_BuildFile {9B8AFFC5-3B65-4686-9AD9-E7704DCA3698}
@@ -846,7 +847,7 @@
           uuid_Xcode4_BuildFileInHeaders {C6C8DFFE-E780-4CB0-81C6-5C4B55CDA057}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MenuButton.h}
+          filename_and_path {include/fltk3/MenuButton.h}
         }
         file_ref {MenuItem.h} {
           uuid_Xcode4_BuildFile {35B87DDE-7E6F-4981-98E6-A06CF94616CC}
@@ -854,7 +855,7 @@
           uuid_Xcode4_BuildFileInHeaders {5485A3F5-A7EB-4F24-B420-F52DE07B8A66}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MenuItem.h}
+          filename_and_path {include/fltk3/MenuItem.h}
         }
         file_ref {MenuWindow.h} {
           uuid_Xcode4_BuildFile {F9ADA642-4ECF-4A83-B141-074E96D90DEF}
@@ -862,7 +863,7 @@
           uuid_Xcode4_BuildFileInHeaders {85734D6A-80B4-4BBB-8B51-3306648C33CB}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MenuWindow.h}
+          filename_and_path {include/fltk3/MenuWindow.h}
         }
         file_ref {message.h} {
           uuid_Xcode4_BuildFile {7B1F47C1-B2E6-46BF-AC3B-268CE1FD07A8}
@@ -870,7 +871,7 @@
           uuid_Xcode4_BuildFileInHeaders {E77DDE3A-506C-448E-A7B0-B0DC4112A1B3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/message.h}
+          filename_and_path {include/fltk3/message.h}
         }
         file_ref {MultiBrowser.h} {
           uuid_Xcode4_BuildFile {68DADDDB-2980-48DA-BA9A-2FE33327CC73}
@@ -878,7 +879,7 @@
           uuid_Xcode4_BuildFileInHeaders {65396451-251A-4A92-BD0D-B70126DF582D}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MultiBrowser.h}
+          filename_and_path {include/fltk3/MultiBrowser.h}
         }
         file_ref {MultiLabel.h} {
           uuid_Xcode4_BuildFile {F4A1C768-90F7-4F3E-83A7-0859BE906866}
@@ -886,7 +887,7 @@
           uuid_Xcode4_BuildFileInHeaders {8248E334-7267-43BA-ACDC-5252C9417904}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MultiLabel.h}
+          filename_and_path {include/fltk3/MultiLabel.h}
         }
         file_ref {MultilineInput.h} {
           uuid_Xcode4_BuildFile {907F6D8E-AFEA-405C-A766-47019492BA4A}
@@ -894,7 +895,7 @@
           uuid_Xcode4_BuildFileInHeaders {B96D1B8C-C2EC-4316-9AD3-BEC4E682879C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MultilineInput.h}
+          filename_and_path {include/fltk3/MultilineInput.h}
         }
         file_ref {MultilineOutput.h} {
           uuid_Xcode4_BuildFile {FBB9EBB6-321E-411B-BA9C-E2589E820CD8}
@@ -902,7 +903,7 @@
           uuid_Xcode4_BuildFileInHeaders {F07D774A-93B3-4980-93EF-1CF643C75A46}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/MultilineOutput.h}
+          filename_and_path {include/fltk3/MultilineOutput.h}
         }
         file_ref {names.h} {
           uuid_Xcode4_BuildFile {17406949-1209-4EB6-8D75-0CB4C7601908}
@@ -910,7 +911,7 @@
           uuid_Xcode4_BuildFileInHeaders {9E23CC9E-C91B-4547-8A7B-489E858CDECF}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/names.h}
+          filename_and_path {include/fltk3/names.h}
         }
         file_ref {NativeFileChooser.h} {
           uuid_Xcode4_BuildFile {AB7BA9B4-F91E-4B45-B306-F4AA69FB2C02}
@@ -918,7 +919,7 @@
           uuid_Xcode4_BuildFileInHeaders {9908F978-694B-448F-AB54-851FC11A5065}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/NativeFileChooser.h}
+          filename_and_path {include/fltk3/NativeFileChooser.h}
         }
         file_ref {NiceSlider.h} {
           uuid_Xcode4_BuildFile {9828396D-E899-44F0-B0C9-6282CC57D77A}
@@ -926,7 +927,7 @@
           uuid_Xcode4_BuildFileInHeaders {E163267B-E829-46FF-8FC4-EF1F4952DE87}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/NiceSlider.h}
+          filename_and_path {include/fltk3/NiceSlider.h}
         }
         file_ref {Object.h} {
           uuid_Xcode4_BuildFile {40D638D3-8D31-4F0D-B53A-F3FCBE42C40B}
@@ -934,7 +935,7 @@
           uuid_Xcode4_BuildFileInHeaders {568A4A99-6975-429F-B940-96448020F79D}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Object.h}
+          filename_and_path {include/fltk3/Object.h}
         }
         file_ref {osx.h} {
           uuid_Xcode4_BuildFile {7A284F23-A5FE-4AA4-A9D0-D1E8A4A43C35}
@@ -942,7 +943,7 @@
           uuid_Xcode4_BuildFileInHeaders {C8AC369D-99D4-45B6-873D-BE23BFB0413B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/osx.h}
+          filename_and_path {include/fltk3/osx.h}
         }
         file_ref {Output.h} {
           uuid_Xcode4_BuildFile {4764043F-5C8D-440A-A65E-F3928A0AE1BB}
@@ -950,7 +951,7 @@
           uuid_Xcode4_BuildFileInHeaders {39B20019-684B-4DCC-98B6-06CA934CA7C9}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Output.h}
+          filename_and_path {include/fltk3/Output.h}
         }
         file_ref {OverlayWindow.h} {
           uuid_Xcode4_BuildFile {3F380557-8CBD-4B6B-AD4C-9EDFE0BA5B4F}
@@ -958,7 +959,7 @@
           uuid_Xcode4_BuildFileInHeaders {E613F74A-024D-4828-8E63-B0F6E3293370}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/OverlayWindow.h}
+          filename_and_path {include/fltk3/OverlayWindow.h}
         }
         file_ref {PackedGroup.h} {
           uuid_Xcode4_BuildFile {952AA8C1-6406-4B61-B4F3-5FEC742B4484}
@@ -966,7 +967,7 @@
           uuid_Xcode4_BuildFileInHeaders {CB8DCA5D-F848-4796-ADA6-66249BFA7C58}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/PackedGroup.h}
+          filename_and_path {include/fltk3/PackedGroup.h}
         }
         file_ref {PagedDevice.h} {
           uuid_Xcode4_BuildFile {211FAC46-08EB-488A-BAC1-54548D29475B}
@@ -974,7 +975,7 @@
           uuid_Xcode4_BuildFileInHeaders {38C7D942-122B-4A30-AF38-D36B69F2AC03}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/PagedDevice.h}
+          filename_and_path {include/fltk3/PagedDevice.h}
         }
         file_ref {Pixmap.h} {
           uuid_Xcode4_BuildFile {BF1FA8FE-B4EA-4EFD-9513-82A904563D59}
@@ -982,7 +983,7 @@
           uuid_Xcode4_BuildFileInHeaders {F5061313-11B9-48D6-A27B-B9BC61AC582B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Pixmap.h}
+          filename_and_path {include/fltk3/Pixmap.h}
         }
         file_ref {Plugin.h} {
           uuid_Xcode4_BuildFile {6463D727-3733-4F2F-B46C-67F19D55B802}
@@ -990,7 +991,7 @@
           uuid_Xcode4_BuildFileInHeaders {6AFC8619-9E0F-41FD-ABB7-518104F112C0}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Plugin.h}
+          filename_and_path {include/fltk3/Plugin.h}
         }
         file_ref {PNGImage.h} {
           uuid_Xcode4_BuildFile {5D9E7161-6EC7-4233-AA60-D021CB0DFC59}
@@ -998,7 +999,7 @@
           uuid_Xcode4_BuildFileInHeaders {E3127242-7B17-4B32-9FCC-1F2101B769A4}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/PNGImage.h}
+          filename_and_path {include/fltk3/PNGImage.h}
         }
         file_ref {PNMImage.h} {
           uuid_Xcode4_BuildFile {4C35DB58-66D6-4FE6-8D74-0F09B1B8EC70}
@@ -1006,7 +1007,7 @@
           uuid_Xcode4_BuildFileInHeaders {CBE8880E-97E1-45DC-8CC0-78ED5298EAAE}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/PNMImage.h}
+          filename_and_path {include/fltk3/PNMImage.h}
         }
         file_ref {Positioner.h} {
           uuid_Xcode4_BuildFile {62B3D61F-3AE4-4EF7-8084-F0A6FBD55B84}
@@ -1014,7 +1015,7 @@
           uuid_Xcode4_BuildFileInHeaders {F702DFA6-016B-474B-B152-017876332D90}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Positioner.h}
+          filename_and_path {include/fltk3/Positioner.h}
         }
         file_ref {PostScript.h} {
           uuid_Xcode4_BuildFile {F1D238B9-0348-4C69-8A96-C1AB02BD55F5}
@@ -1022,7 +1023,7 @@
           uuid_Xcode4_BuildFileInHeaders {ACFD331F-72AF-4B41-93F1-35A491D0492B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/PostScript.h}
+          filename_and_path {include/fltk3/PostScript.h}
         }
         file_ref {Preferences.h} {
           uuid_Xcode4_BuildFile {B14021BB-7B7C-43FA-90DD-8D574E85F561}
@@ -1030,7 +1031,7 @@
           uuid_Xcode4_BuildFileInHeaders {987CCADF-403E-478E-8653-AD854D159D9F}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Preferences.h}
+          filename_and_path {include/fltk3/Preferences.h}
         }
         file_ref {Printer.h} {
           uuid_Xcode4_BuildFile {DCF86F46-6E2A-4B75-8213-6E5D920E8E26}
@@ -1038,7 +1039,7 @@
           uuid_Xcode4_BuildFileInHeaders {8430686C-EEEE-479F-B49F-452BA9BA5883}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Printer.h}
+          filename_and_path {include/fltk3/Printer.h}
         }
         file_ref {Progress.h} {
           uuid_Xcode4_BuildFile {90702262-589B-4260-980F-F0F0A458B87F}
@@ -1046,7 +1047,7 @@
           uuid_Xcode4_BuildFileInHeaders {57474483-0DC8-4217-9124-B2B78DE7715A}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Progress.h}
+          filename_and_path {include/fltk3/Progress.h}
         }
         file_ref {RadioButton.h} {
           uuid_Xcode4_BuildFile {773E10BB-A982-4CA8-8A1A-5FB15C62C366}
@@ -1054,7 +1055,7 @@
           uuid_Xcode4_BuildFileInHeaders {C4F9F5BB-9115-4E00-91DB-B8BEDCB41239}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RadioButton.h}
+          filename_and_path {include/fltk3/RadioButton.h}
         }
         file_ref {RadioLightButton.h} {
           uuid_Xcode4_BuildFile {D0CA766C-B070-486D-90CE-96EF6EA98ED4}
@@ -1062,7 +1063,7 @@
           uuid_Xcode4_BuildFileInHeaders {3D04BFFA-DFD2-4B13-A253-9156B6909190}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RadioLightButton.h}
+          filename_and_path {include/fltk3/RadioLightButton.h}
         }
         file_ref {RadioRoundButton.h} {
           uuid_Xcode4_BuildFile {50F213E5-2D3D-4C82-9871-7544B9453BF5}
@@ -1070,7 +1071,7 @@
           uuid_Xcode4_BuildFileInHeaders {5FFF3E76-4C2F-4412-B935-2C9344DF6FB5}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RadioRoundButton.h}
+          filename_and_path {include/fltk3/RadioRoundButton.h}
         }
         file_ref {Rectangle.h} {
           uuid_Xcode4_BuildFile {F95C5A92-0695-40C4-A6E2-0A592EE1EC0F}
@@ -1078,7 +1079,7 @@
           uuid_Xcode4_BuildFileInHeaders {541F4505-F6CF-4A86-A3AC-2C612392DC3A}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Rectangle.h}
+          filename_and_path {include/fltk3/Rectangle.h}
         }
         file_ref {RepeatButton.h} {
           uuid_Xcode4_BuildFile {1CF53F2D-715D-4512-8F5B-BA20E1726122}
@@ -1086,7 +1087,7 @@
           uuid_Xcode4_BuildFileInHeaders {C314F850-5A3E-4BDA-86AC-A9714B7AE660}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RepeatButton.h}
+          filename_and_path {include/fltk3/RepeatButton.h}
         }
         file_ref {ReturnButton.h} {
           uuid_Xcode4_BuildFile {ADBE4846-AA90-4966-93EB-74E39DB2C2AE}
@@ -1094,7 +1095,7 @@
           uuid_Xcode4_BuildFileInHeaders {50013BF4-F5A7-4361-8879-40B29DE191B9}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ReturnButton.h}
+          filename_and_path {include/fltk3/ReturnButton.h}
         }
         file_ref {RGBImage.h} {
           uuid_Xcode4_BuildFile {CBF2F915-9357-4362-B83C-A7188315D23A}
@@ -1102,7 +1103,7 @@
           uuid_Xcode4_BuildFileInHeaders {EDCB645E-C684-42DE-B3FF-A1D94E5C33B0}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RGBImage.h}
+          filename_and_path {include/fltk3/RGBImage.h}
         }
         file_ref {Roller.h} {
           uuid_Xcode4_BuildFile {665F39DC-8BFF-4675-8D7B-09FAF762FCDA}
@@ -1110,7 +1111,7 @@
           uuid_Xcode4_BuildFileInHeaders {3C8B5344-6082-424D-B091-8F72B6D66AD2}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Roller.h}
+          filename_and_path {include/fltk3/Roller.h}
         }
         file_ref {RoundButton.h} {
           uuid_Xcode4_BuildFile {5EB54150-424C-4F97-906A-8FCB03F50F7B}
@@ -1118,7 +1119,7 @@
           uuid_Xcode4_BuildFileInHeaders {8403B06A-ECAC-4A4D-85B3-416D5D5C4BF3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RoundButton.h}
+          filename_and_path {include/fltk3/RoundButton.h}
         }
         file_ref {RoundClock.h} {
           uuid_Xcode4_BuildFile {85ACD94A-E352-413E-976C-A3EDA23F0DF7}
@@ -1126,7 +1127,7 @@
           uuid_Xcode4_BuildFileInHeaders {00201E11-A702-4F28-A948-382089C546F3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/RoundClock.h}
+          filename_and_path {include/fltk3/RoundClock.h}
         }
         file_ref {run.h} {
           uuid_Xcode4_BuildFile {BCD82270-EAA9-459A-B5E0-1E59FC5155BB}
@@ -1134,7 +1135,7 @@
           uuid_Xcode4_BuildFileInHeaders {C7F15631-4A95-4D04-A073-3ABF449125E2}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/run.h}
+          filename_and_path {include/fltk3/run.h}
         }
         file_ref {Scrollbar.h} {
           uuid_Xcode4_BuildFile {1091CE8D-5503-4DCF-93C7-D91C1FAF8A72}
@@ -1142,7 +1143,7 @@
           uuid_Xcode4_BuildFileInHeaders {C0F0690F-24A1-40E8-84F8-0BBD8B042439}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Scrollbar.h}
+          filename_and_path {include/fltk3/Scrollbar.h}
         }
         file_ref {ScrollGroup.h} {
           uuid_Xcode4_BuildFile {44E8E706-EBB1-4AAA-9E77-5D686B09EBCD}
@@ -1150,7 +1151,7 @@
           uuid_Xcode4_BuildFileInHeaders {CB5654D1-1A9A-4ED8-BFA5-DC7FE472204B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ScrollGroup.h}
+          filename_and_path {include/fltk3/ScrollGroup.h}
         }
         file_ref {SecretInput.h} {
           uuid_Xcode4_BuildFile {4BDB4DCC-387B-40BE-99BA-006DED0FCBDA}
@@ -1158,7 +1159,7 @@
           uuid_Xcode4_BuildFileInHeaders {17B837F8-0F28-431F-ADAE-04322865F23B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/SecretInput.h}
+          filename_and_path {include/fltk3/SecretInput.h}
         }
         file_ref {SelectBrowser.h} {
           uuid_Xcode4_BuildFile {D7845810-9029-405E-ADA3-38C399188304}
@@ -1166,7 +1167,7 @@
           uuid_Xcode4_BuildFileInHeaders {B7B93C84-ADAA-40AC-9177-AAA069314391}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/SelectBrowser.h}
+          filename_and_path {include/fltk3/SelectBrowser.h}
         }
         file_ref {SharedImage.h} {
           uuid_Xcode4_BuildFile {F6781690-45D3-43A2-97D0-428E3F972600}
@@ -1174,7 +1175,7 @@
           uuid_Xcode4_BuildFileInHeaders {034AC216-1264-4079-A638-B25B5586EBB3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/SharedImage.h}
+          filename_and_path {include/fltk3/SharedImage.h}
         }
         file_ref {show_colormap.h} {
           uuid_Xcode4_BuildFile {03BC6417-4A25-49D8-85A9-54830C1D008E}
@@ -1182,7 +1183,7 @@
           uuid_Xcode4_BuildFileInHeaders {0EE3255F-C540-4507-87FD-67DF1CB9C57B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/show_colormap.h}
+          filename_and_path {include/fltk3/show_colormap.h}
         }
         file_ref {showInput.h} {
           uuid_Xcode4_BuildFile {9F31C590-F3DE-4CF5-AFB9-3A193109953D}
@@ -1190,7 +1191,7 @@
           uuid_Xcode4_BuildFileInHeaders {243DD608-9CDF-48B3-AA01-B8E25191E9F4}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/showInput.h}
+          filename_and_path {include/fltk3/showInput.h}
         }
         file_ref {SimpleCounter.h} {
           uuid_Xcode4_BuildFile {FDB479E7-809A-4CFB-AC49-334E29BBAC34}
@@ -1198,7 +1199,7 @@
           uuid_Xcode4_BuildFileInHeaders {03FFBC63-D943-41E1-9CE1-E6EE6DB7968F}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/SimpleCounter.h}
+          filename_and_path {include/fltk3/SimpleCounter.h}
         }
         file_ref {SingleWindow.h} {
           uuid_Xcode4_BuildFile {9132D3A1-012D-4D80-ACE1-8F382C0A351B}
@@ -1206,7 +1207,7 @@
           uuid_Xcode4_BuildFileInHeaders {6B6E9395-D797-4BB1-8548-C3DD71F9DFD1}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/SingleWindow.h}
+          filename_and_path {include/fltk3/SingleWindow.h}
         }
         file_ref {Slider.h} {
           uuid_Xcode4_BuildFile {EBE0213A-2491-433A-A674-322BE25FAA14}
@@ -1214,7 +1215,7 @@
           uuid_Xcode4_BuildFileInHeaders {58F214FC-B7A1-4476-A240-28AA6EBE814F}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Slider.h}
+          filename_and_path {include/fltk3/Slider.h}
         }
         file_ref {Spinner.h} {
           uuid_Xcode4_BuildFile {D76363C0-7FE0-4A29-8EBA-6F929B570EFF}
@@ -1222,7 +1223,7 @@
           uuid_Xcode4_BuildFileInHeaders {32F02A4A-46AA-43A9-B168-66EABF4AC7AF}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Spinner.h}
+          filename_and_path {include/fltk3/Spinner.h}
         }
         file_ref {Style.h} {
           uuid_Xcode4_BuildFile {3E5FDE91-66B5-4D67-8BB6-92C0A8FA56D7}
@@ -1230,7 +1231,7 @@
           uuid_Xcode4_BuildFileInHeaders {4D7A7651-910F-4947-9747-DBFC4F5ACD8B}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Style.h}
+          filename_and_path {include/fltk3/Style.h}
         }
         file_ref {SysMenuBar.h} {
           uuid_Xcode4_BuildFile {F9CF92AB-336C-4D0A-BFF4-835EC59F6CD1}
@@ -1238,7 +1239,7 @@
           uuid_Xcode4_BuildFileInHeaders {52D66EE7-091B-4554-A028-A06D04F481BE}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/SysMenuBar.h}
+          filename_and_path {include/fltk3/SysMenuBar.h}
         }
         file_ref {TabGroup.h} {
           uuid_Xcode4_BuildFile {C5106059-F99B-4031-925E-961380819E74}
@@ -1246,7 +1247,7 @@
           uuid_Xcode4_BuildFileInHeaders {2ABC0F5B-D156-4E2A-8805-C817195F0A58}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TabGroup.h}
+          filename_and_path {include/fltk3/TabGroup.h}
         }
         file_ref {Table.h} {
           uuid_Xcode4_BuildFile {ABE56142-DE83-4A0F-B010-446DCF23A83F}
@@ -1254,7 +1255,7 @@
           uuid_Xcode4_BuildFileInHeaders {0F974000-4A81-4F44-927A-5CD92C40A1AB}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Table.h}
+          filename_and_path {include/fltk3/Table.h}
         }
         file_ref {TableRow.h} {
           uuid_Xcode4_BuildFile {89662D26-D11B-416D-A194-583ED4288C78}
@@ -1262,7 +1263,7 @@
           uuid_Xcode4_BuildFileInHeaders {D2129EFD-8DCF-4241-96E9-D5F8288BCD3C}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TableRow.h}
+          filename_and_path {include/fltk3/TableRow.h}
         }
         file_ref {TextBuffer.h} {
           uuid_Xcode4_BuildFile {CDEC102F-FF80-40F7-A9D5-7B7E96042E19}
@@ -1270,7 +1271,7 @@
           uuid_Xcode4_BuildFileInHeaders {1EC56E32-DCBA-4902-9A44-E104B7C1EA04}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TextBuffer.h}
+          filename_and_path {include/fltk3/TextBuffer.h}
         }
         file_ref {TextDisplay.h} {
           uuid_Xcode4_BuildFile {A9AF1C37-3D0A-4F48-BA94-4B86C7A1A761}
@@ -1278,7 +1279,7 @@
           uuid_Xcode4_BuildFileInHeaders {47412292-91CB-4F3E-8E91-8E387FB2409D}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TextDisplay.h}
+          filename_and_path {include/fltk3/TextDisplay.h}
         }
         file_ref {TextEditor.h} {
           uuid_Xcode4_BuildFile {67C7FA0B-802E-4487-97A1-6E6387F62564}
@@ -1286,7 +1287,7 @@
           uuid_Xcode4_BuildFileInHeaders {032C0D1B-F7C0-4165-B390-04CC05B16008}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TextEditor.h}
+          filename_and_path {include/fltk3/TextEditor.h}
         }
         file_ref {TiledGroup.h} {
           uuid_Xcode4_BuildFile {6E1AAABD-0D0E-43B6-8155-0314EF3BE7FE}
@@ -1294,7 +1295,7 @@
           uuid_Xcode4_BuildFileInHeaders {E6D42645-6C7B-4F32-8F1D-D282CD7C2759}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TiledGroup.h}
+          filename_and_path {include/fltk3/TiledGroup.h}
         }
         file_ref {TiledImage.h} {
           uuid_Xcode4_BuildFile {F5886F9D-2362-4C9E-92FB-EF926EFECAE5}
@@ -1302,7 +1303,7 @@
           uuid_Xcode4_BuildFileInHeaders {55FA8DD4-3A6B-41C7-9C12-42D1B3629750}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TiledImage.h}
+          filename_and_path {include/fltk3/TiledImage.h}
         }
         file_ref {Timer.h} {
           uuid_Xcode4_BuildFile {59B60905-6FB9-4807-A57B-5401B9F8AAB0}
@@ -1310,7 +1311,7 @@
           uuid_Xcode4_BuildFileInHeaders {7D435058-9BC6-4BD8-9C06-A7CD0DCF2928}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Timer.h}
+          filename_and_path {include/fltk3/Timer.h}
         }
         file_ref {ToggleButton.h} {
           uuid_Xcode4_BuildFile {24974A99-72A3-4E92-922F-33308EA73586}
@@ -1318,7 +1319,7 @@
           uuid_Xcode4_BuildFileInHeaders {5B70C041-3241-49EF-B798-C2A977EE03FD}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ToggleButton.h}
+          filename_and_path {include/fltk3/ToggleButton.h}
         }
         file_ref {ToggleLightButton.h} {
           uuid_Xcode4_BuildFile {F28C203D-5411-4C83-BF4A-2CFD3CF3403A}
@@ -1326,7 +1327,7 @@
           uuid_Xcode4_BuildFileInHeaders {9836A45A-4039-4822-A8DC-A8A70696720D}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ToggleLightButton.h}
+          filename_and_path {include/fltk3/ToggleLightButton.h}
         }
         file_ref {ToggleRoundButton.h} {
           uuid_Xcode4_BuildFile {93A7154C-012D-476D-889D-9762A6750520}
@@ -1334,7 +1335,7 @@
           uuid_Xcode4_BuildFileInHeaders {60B64DAA-DF8F-4CDA-8AB0-0755C6D660B2}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ToggleRoundButton.h}
+          filename_and_path {include/fltk3/ToggleRoundButton.h}
         }
         file_ref {Tooltip.h} {
           uuid_Xcode4_BuildFile {8276B012-4188-4C12-8305-1F5251314F05}
@@ -1342,7 +1343,7 @@
           uuid_Xcode4_BuildFileInHeaders {F44ED487-33C0-4390-9AFF-E14EF80A6B2A}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Tooltip.h}
+          filename_and_path {include/fltk3/Tooltip.h}
         }
         file_ref {Tree.h} {
           uuid_Xcode4_BuildFile {C3BC5E98-4E3F-46D5-9A15-FFA50F065D47}
@@ -1350,7 +1351,7 @@
           uuid_Xcode4_BuildFileInHeaders {797815C0-D853-4374-8491-D79A6E32B00F}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Tree.h}
+          filename_and_path {include/fltk3/Tree.h}
         }
         file_ref {TreeItem.h} {
           uuid_Xcode4_BuildFile {FE8A3875-9AFD-4CD4-B185-179F8E48178E}
@@ -1358,7 +1359,7 @@
           uuid_Xcode4_BuildFileInHeaders {FA3EFF2F-55A0-48AE-A219-742C29B91EBC}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TreeItem.h}
+          filename_and_path {include/fltk3/TreeItem.h}
         }
         file_ref {TreeItemArray.h} {
           uuid_Xcode4_BuildFile {66D03DB1-40F6-4172-A57A-1D2C7A55CE91}
@@ -1366,7 +1367,7 @@
           uuid_Xcode4_BuildFileInHeaders {AC33B9D6-AAD0-46C9-9D3C-CD4B1DF3DC2D}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TreeItemArray.h}
+          filename_and_path {include/fltk3/TreeItemArray.h}
         }
         file_ref {TreePrefs.h} {
           uuid_Xcode4_BuildFile {C2B74F46-3E7C-4CD7-8267-4FC28F34895D}
@@ -1374,7 +1375,7 @@
           uuid_Xcode4_BuildFileInHeaders {47916CFC-DEAC-4C97-87E7-E90852A1DA48}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/TreePrefs.h}
+          filename_and_path {include/fltk3/TreePrefs.h}
         }
         file_ref {types.h} {
           uuid_Xcode4_BuildFile {DC994779-18AC-4E19-A594-CC1898905C23}
@@ -1382,7 +1383,7 @@
           uuid_Xcode4_BuildFileInHeaders {981A2121-8BF0-4100-834F-33D64D743735}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/types.h}
+          filename_and_path {include/fltk3/types.h}
         }
         file_ref {utf8.h} {
           uuid_Xcode4_BuildFile {681E2C35-DD25-4D5E-86E3-8D324589B6C3}
@@ -1390,7 +1391,7 @@
           uuid_Xcode4_BuildFileInHeaders {31CF6B74-9890-4CD5-A622-B66955254BAF}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/utf8.h}
+          filename_and_path {include/fltk3/utf8.h}
         }
         file_ref {Valuator.h} {
           uuid_Xcode4_BuildFile {C47845FF-66AC-429D-BEA1-A6DE64E3B916}
@@ -1398,7 +1399,7 @@
           uuid_Xcode4_BuildFileInHeaders {A5459139-9707-42A6-83E8-812ED01B4470}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Valuator.h}
+          filename_and_path {include/fltk3/Valuator.h}
         }
         file_ref {ValueInput.h} {
           uuid_Xcode4_BuildFile {DFE89C49-5316-4CBC-8197-BCFF6A20EE92}
@@ -1406,7 +1407,7 @@
           uuid_Xcode4_BuildFileInHeaders {CB50E373-F0EF-4A54-BCB5-EA81DC0B7EFD}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ValueInput.h}
+          filename_and_path {include/fltk3/ValueInput.h}
         }
         file_ref {ValueOutput.h} {
           uuid_Xcode4_BuildFile {F5859980-E64A-4F2F-8C57-35C2CFDBF3B6}
@@ -1414,7 +1415,7 @@
           uuid_Xcode4_BuildFileInHeaders {A62395C6-99EF-44CC-AFDA-4C40602E899E}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ValueOutput.h}
+          filename_and_path {include/fltk3/ValueOutput.h}
         }
         file_ref {ValueSlider.h} {
           uuid_Xcode4_BuildFile {9CCACFCE-2AEE-4A38-9F8C-7ABBDAA107EA}
@@ -1422,7 +1423,7 @@
           uuid_Xcode4_BuildFileInHeaders {AFE07F39-FDFF-44DF-B055-7C3F63517A4E}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/ValueSlider.h}
+          filename_and_path {include/fltk3/ValueSlider.h}
         }
         file_ref {Widget.h} {
           uuid_Xcode4_BuildFile {77EFEC33-D024-4917-9CDB-7D74C85D2145}
@@ -1430,7 +1431,7 @@
           uuid_Xcode4_BuildFileInHeaders {94E2F8C4-9026-4615-9CE8-6379806F20EB}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Widget.h}
+          filename_and_path {include/fltk3/Widget.h}
         }
         file_ref {win32.h} {
           uuid_Xcode4_BuildFile {B6BC0131-EF86-48A2-A56E-0A39CA8B36DF}
@@ -1438,7 +1439,7 @@
           uuid_Xcode4_BuildFileInHeaders {CA399162-BE25-41CB-BED0-CF55B2354DD7}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/win32.h}
+          filename_and_path {include/fltk3/win32.h}
         }
         file_ref {Window.h} {
           uuid_Xcode4_BuildFile {11F547C0-6521-40C7-ACBF-7258AB416476}
@@ -1446,7 +1447,7 @@
           uuid_Xcode4_BuildFileInHeaders {E2AA1677-998C-4AAF-A032-E0DA24CFDBE3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Window.h}
+          filename_and_path {include/fltk3/Window.h}
         }
         file_ref {WizardGroup.h} {
           uuid_Xcode4_BuildFile {911B9212-7CE9-4673-B58A-1F685B0F7488}
@@ -1454,7 +1455,7 @@
           uuid_Xcode4_BuildFileInHeaders {92B4EB04-831A-4CE6-ADE5-F32AD3F79630}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/WizardGroup.h}
+          filename_and_path {include/fltk3/WizardGroup.h}
         }
         file_ref {Wrapper.h} {
           uuid_Xcode4_BuildFile {D3AF8F9F-6681-4F22-A57D-19DF636D33A2}
@@ -1462,7 +1463,7 @@
           uuid_Xcode4_BuildFileInHeaders {65AFEF19-9ADA-44EA-82DF-DEFED5DD6CA6}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Wrapper.h}
+          filename_and_path {include/fltk3/Wrapper.h}
         }
         file_ref {x.h} {
           uuid_Xcode4_BuildFile {569F455D-36D9-478D-8499-634081EA3C24}
@@ -1470,7 +1471,7 @@
           uuid_Xcode4_BuildFileInHeaders {39A61403-FB07-4880-B309-5FDC8A0E92D3}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/x.h}
+          filename_and_path {include/fltk3/x.h}
         }
         file_ref {XBMImage.h} {
           uuid_Xcode4_BuildFile {8AF480EA-F1C2-4A25-9AD4-658E8600CB70}
@@ -1478,7 +1479,7 @@
           uuid_Xcode4_BuildFileInHeaders {CBE1938D-1ECF-4F06-B613-EF22483B5C48}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/XBMImage.h}
+          filename_and_path {include/fltk3/XBMImage.h}
         }
         file_ref {XPMImage.h} {
           uuid_Xcode4_BuildFile {DAEEEDE3-9330-459C-AC22-055D2BB29021}
@@ -1486,7 +1487,7 @@
           uuid_Xcode4_BuildFileInHeaders {ACA9550A-8689-4F8A-8C59-6F8A1D80B160}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/XPMImage.h}
+          filename_and_path {include/fltk3/XPMImage.h}
         }
         file_ref {Xutf8.h} {
           uuid_Xcode4_BuildFile {A0588617-DA9D-48BB-8001-E0414DBCBAA2}
@@ -1494,7 +1495,7 @@
           uuid_Xcode4_BuildFileInHeaders {E0943D9D-3EC5-4918-9A46-090378EBF9DF}
           build_env 96
           list_env 124
-          filename_and_path {fltk3/Xutf8.h}
+          filename_and_path {include/fltk3/Xutf8.h}
         }
       }
       folder Sources {open
@@ -1506,7 +1507,7 @@
           uuid_Xcode4_BuildFileInSources {69C261B5-4876-4079-9B0B-EBCE4F62E633}
           build_env 99
           list_env 96
-          filename_and_path {src/Fl_cocoa.mm}
+          filename_and_path {src/core/Fl_cocoa.mm}
         }
         file_ref {Fl_Native_File_Chooser_MAC.mm} {
           uuid_Xcode4_BuildFile {60D9759F-404F-4A7C-A356-2F92BC2F400F}
@@ -1514,7 +1515,7 @@
           uuid_Xcode4_BuildFileInSources {02BBCA82-9B2B-44D0-9C15-96A37443CA28}
           build_env 99
           list_env 96
-          filename_and_path {src/Fl_Native_File_Chooser_MAC.mm}
+          filename_and_path {src/core/Fl_Native_File_Chooser_MAC.mm}
         }
         file_ref {Fl_Quartz_Printer.mm} {
           uuid_Xcode4_BuildFile {982B3E9E-7B79-4E84-A10F-7270A2EB17A5}
@@ -1522,935 +1523,935 @@
           uuid_Xcode4_BuildFileInSources {B7920395-B4B5-480F-BB30-14BE46AA357D}
           build_env 99
           list_env 96
-          filename_and_path {src/Fl_Quartz_Printer.mm}
+          filename_and_path {src/core/Fl_Quartz_Printer.mm}
         }
         file_ref {Fl.cxx} {
           uuid_Xcode4_BuildFile {5E78E80A-9D1C-4351-9F3E-B2944D622982}
           uuid_Xcode4_FileRef {81045D02-0D89-472C-BAE7-D77BD81C23A2}
           uuid_Xcode4_BuildFileInSources {008DDC0F-78E3-4A40-8F42-9408DA34594C}
-          filename_and_path {src/Fl.cxx}
+          filename_and_path {src/core/Fl.cxx}
         }
         file_ref {Fl_Adjuster.cxx} {
           uuid_Xcode4_BuildFile {91FE1840-74E4-4847-8B8E-D8952CEAF112}
           uuid_Xcode4_FileRef {ECEA64F2-F8B3-4A76-B195-748D6949AD76}
           uuid_Xcode4_BuildFileInSources {2271ACEB-F7A7-435C-8F11-380D4086EF24}
-          filename_and_path {src/Fl_Adjuster.cxx}
+          filename_and_path {src/core/Fl_Adjuster.cxx}
         }
         file_ref {Fl_Bitmap.cxx} {
           uuid_Xcode4_BuildFile {E9733D69-4D22-4B2E-B89C-81D879FA8FC5}
           uuid_Xcode4_FileRef {D68004A5-9E82-4A55-B1D1-365E2E22B59B}
           uuid_Xcode4_BuildFileInSources {87F292ED-EBB4-4EBB-BAC3-FF7CAEA18EC5}
-          filename_and_path {src/Fl_Bitmap.cxx}
+          filename_and_path {src/core/Fl_Bitmap.cxx}
         }
         file_ref {Fl_Box.cxx} {
           uuid_Xcode4_BuildFile {F4F6FEBB-918A-4AC7-813D-7B3E68C40425}
           uuid_Xcode4_FileRef {81608512-8823-4586-AF62-6E7935A2B539}
           uuid_Xcode4_BuildFileInSources {D3D9C65E-F19F-4B98-BE09-98BD5E8C7725}
-          filename_and_path {src/Fl_Box.cxx}
+          filename_and_path {src/core/Fl_Box.cxx}
         }
         file_ref {Fl_Browser.cxx} {
           uuid_Xcode4_BuildFile {DA189983-8D64-4A1D-96B0-2E367C8C4CC6}
           uuid_Xcode4_FileRef {5CE1FF6E-BFDC-4925-A6BE-F6B954C22170}
           uuid_Xcode4_BuildFileInSources {F343A0DF-4678-4211-8A50-FC76857BF06F}
-          filename_and_path {src/Fl_Browser.cxx}
+          filename_and_path {src/core/Fl_Browser.cxx}
         }
         file_ref {Fl_Browser_.cxx} {
           uuid_Xcode4_BuildFile {545A2839-E435-4EB6-839C-22C991346FF0}
           uuid_Xcode4_FileRef {2FC85E98-E2B4-484F-815B-75078EBBA1CC}
           uuid_Xcode4_BuildFileInSources {9036C344-A95E-4174-8C78-610EB425415E}
-          filename_and_path {src/Fl_Browser_.cxx}
+          filename_and_path {src/core/Fl_Browser_.cxx}
         }
         file_ref {Fl_Browser_load.cxx} {
           uuid_Xcode4_BuildFile {C18A3B76-19AC-4503-9A82-6386F545EFE7}
           uuid_Xcode4_FileRef {B89AE0F9-320A-489A-A15A-34AEA064E6FF}
           uuid_Xcode4_BuildFileInSources {C96803EE-BABD-4805-97B5-C7008A9507D0}
-          filename_and_path {src/Fl_Browser_load.cxx}
+          filename_and_path {src/core/Fl_Browser_load.cxx}
         }
         file_ref {Fl_Button.cxx} {
           uuid_Xcode4_BuildFile {07627EF8-0726-4AEE-A7BE-5B01D59A2320}
           uuid_Xcode4_FileRef {70F96088-141B-442E-AF9B-5EAE13E45EFD}
           uuid_Xcode4_BuildFileInSources {DE2BB513-7AFF-460D-8095-4D0C6D632F84}
-          filename_and_path {src/Fl_Button.cxx}
+          filename_and_path {src/core/Fl_Button.cxx}
         }
         file_ref {Fl_Chart.cxx} {
           uuid_Xcode4_BuildFile {A6F1AA20-5E36-4069-95D7-B2ADB04EACBB}
           uuid_Xcode4_FileRef {39250031-7441-4BDF-ABE1-745EE2786E57}
           uuid_Xcode4_BuildFileInSources {B0CAF4D1-1E41-4BDD-AF60-C1F8DFCA17AA}
-          filename_and_path {src/Fl_Chart.cxx}
+          filename_and_path {src/core/Fl_Chart.cxx}
         }
         file_ref {Fl_Check_Browser.cxx} {
           uuid_Xcode4_BuildFile {2D43DF76-FFA8-46BE-8CC7-97E71F74AB36}
           uuid_Xcode4_FileRef {F6EC011E-29BD-4ADB-B4C8-EEC9E72E52E7}
           uuid_Xcode4_BuildFileInSources {37D83B9E-5F12-4F75-9351-7841D83CC630}
-          filename_and_path {src/Fl_Check_Browser.cxx}
+          filename_and_path {src/core/Fl_Check_Browser.cxx}
         }
         file_ref {Fl_Check_Button.cxx} {
           uuid_Xcode4_BuildFile {6F0253C7-58FE-4E3E-A84D-ACA19AE0B60F}
           uuid_Xcode4_FileRef {490C9DC5-6833-46C7-A0F5-F3D9C9795A6D}
           uuid_Xcode4_BuildFileInSources {B34F20AC-057A-41BD-B8E5-05E3F37A17B1}
-          filename_and_path {src/Fl_Check_Button.cxx}
+          filename_and_path {src/core/Fl_Check_Button.cxx}
         }
         file_ref {Fl_Choice.cxx} {
           uuid_Xcode4_BuildFile {3BD02867-1A12-4C3A-AE6C-5D570873345C}
           uuid_Xcode4_FileRef {6356BFF2-3C95-496B-8310-FA86D8F77F5C}
           uuid_Xcode4_BuildFileInSources {16189C32-2A6C-4A8A-BAF6-4DFE1DBD4A2E}
-          filename_and_path {src/Fl_Choice.cxx}
+          filename_and_path {src/core/Fl_Choice.cxx}
         }
         file_ref {Fl_Clock.cxx} {
           uuid_Xcode4_BuildFile {64809F27-28E9-4E6E-95D6-BF69AE67D5FD}
           uuid_Xcode4_FileRef {1C4F7DBF-440E-4FD8-A83E-F098D786280A}
           uuid_Xcode4_BuildFileInSources {4BB96489-76E9-44BD-A619-51624DCAD9BA}
-          filename_and_path {src/Fl_Clock.cxx}
+          filename_and_path {src/core/Fl_Clock.cxx}
         }
         file_ref {Fl_Color_Chooser.cxx} {
           uuid_Xcode4_BuildFile {F4AB783F-377F-4E93-8461-F7D5660002E3}
           uuid_Xcode4_FileRef {4CF353D8-81FC-4DE3-9189-39E910629419}
           uuid_Xcode4_BuildFileInSources {2D847DBF-42FA-4B1F-8C9F-587D52345529}
-          filename_and_path {src/Fl_Color_Chooser.cxx}
+          filename_and_path {src/core/Fl_Color_Chooser.cxx}
         }
         file_ref {Fl_Counter.cxx} {
           uuid_Xcode4_BuildFile {45E38AE7-C514-4BBB-A2CE-4B897029509D}
           uuid_Xcode4_FileRef {96D41530-E053-46CC-8B6F-C1EBDBF7E11E}
           uuid_Xcode4_BuildFileInSources {B2BB321C-34B1-4D09-9434-7E63F4A99288}
-          filename_and_path {src/Fl_Counter.cxx}
+          filename_and_path {src/core/Fl_Counter.cxx}
         }
         file_ref {Fl_Device.cxx} {
           uuid_Xcode4_BuildFile {9CBCE251-1829-44C4-BAF4-F95523E02EDF}
           uuid_Xcode4_FileRef {CB4EA804-687E-4579-AB3B-DE67EA64E9FB}
           uuid_Xcode4_BuildFileInSources {B1AB3E6C-AA35-4A2D-9177-44469F0CB1D8}
-          filename_and_path {src/Fl_Device.cxx}
+          filename_and_path {src/core/Fl_Device.cxx}
         }
         file_ref {Fl_Dial.cxx} {
           uuid_Xcode4_BuildFile {F4D1986C-C2AB-46EA-951E-0F696A73F7F5}
           uuid_Xcode4_FileRef {FDB40722-2840-4C62-98C1-D38291CAB607}
           uuid_Xcode4_BuildFileInSources {1369E7AD-84B4-4FD2-9D04-99627B063564}
-          filename_and_path {src/Fl_Dial.cxx}
+          filename_and_path {src/core/Fl_Dial.cxx}
         }
         file_ref {Fl_Double_Window.cxx} {
           uuid_Xcode4_BuildFile {6E8494D3-F35B-4D9F-846B-5EFE8203DC04}
           uuid_Xcode4_FileRef {D65E879C-A8F7-46EF-94C2-E474B73853BC}
           uuid_Xcode4_BuildFileInSources {43FA5D81-2826-46FC-95B5-175515727381}
-          filename_and_path {src/Fl_Double_Window.cxx}
+          filename_and_path {src/core/Fl_Double_Window.cxx}
         }
         file_ref {Fl_File_Browser.cxx} {
           uuid_Xcode4_BuildFile {3C81269D-295A-4C8D-93B4-9A7B72027FE2}
           uuid_Xcode4_FileRef {31B32445-8CFD-4811-A4C7-628F7D814264}
           uuid_Xcode4_BuildFileInSources {ECCA6DC4-1741-433D-AE93-BFDE5390C8D1}
-          filename_and_path {src/Fl_File_Browser.cxx}
+          filename_and_path {src/core/Fl_File_Browser.cxx}
         }
         file_ref {Fl_File_Chooser.cxx} {
           uuid_Xcode4_BuildFile {3B24302E-E655-42B1-8195-4A65633638BE}
           uuid_Xcode4_FileRef {E74C762F-3E71-4C17-8E8F-783C5BA2394A}
           uuid_Xcode4_BuildFileInSources {049EB013-455E-45FB-A557-6567D1DB2191}
-          filename_and_path {src/Fl_File_Chooser.cxx}
+          filename_and_path {src/core/Fl_File_Chooser.cxx}
         }
         file_ref {Fl_File_Chooser2.cxx} {
           uuid_Xcode4_BuildFile {22A4B14E-FC3A-4D9F-A56C-07AD36664F71}
           uuid_Xcode4_FileRef {A7770A7F-FF59-489E-AB60-3811A3BFB46C}
           uuid_Xcode4_BuildFileInSources {17819EFD-407A-4954-8402-474A47FF9A97}
-          filename_and_path {src/Fl_File_Chooser2.cxx}
+          filename_and_path {src/core/Fl_File_Chooser2.cxx}
         }
         file_ref {Fl_File_Icon.cxx} {
           uuid_Xcode4_BuildFile {AF7F7642-24A6-444F-9A16-C020F722E332}
           uuid_Xcode4_FileRef {19FA31AE-9089-4E73-97EA-56F68EC5D035}
           uuid_Xcode4_BuildFileInSources {3DCD457D-328B-485F-8CAE-463ED9EE4246}
-          filename_and_path {src/Fl_File_Icon.cxx}
+          filename_and_path {src/core/Fl_File_Icon.cxx}
         }
         file_ref {Fl_File_Input.cxx} {
           uuid_Xcode4_BuildFile {E80A34C3-962D-4260-9AE8-3099080002B9}
           uuid_Xcode4_FileRef {D05F5EBC-72FF-49FD-912F-BB5399F2DDC2}
           uuid_Xcode4_BuildFileInSources {8F4CA13F-413A-400F-8266-4ABF3D647078}
-          filename_and_path {src/Fl_File_Input.cxx}
+          filename_and_path {src/core/Fl_File_Input.cxx}
         }
         file_ref {Fl_Group.cxx} {
           uuid_Xcode4_BuildFile {18D56E2C-8A51-4AC4-8247-489E424C5E2D}
           uuid_Xcode4_FileRef {A5952FB9-CE93-48E3-8F3E-9906B15F1B22}
           uuid_Xcode4_BuildFileInSources {99FB6408-3164-4FB6-8895-DA2F31644F95}
-          filename_and_path {src/Fl_Group.cxx}
+          filename_and_path {src/core/Fl_Group.cxx}
         }
         file_ref {Fl_Help_View.cxx} {
           uuid_Xcode4_BuildFile {E452ED95-DA10-4107-8505-81FF885CB929}
           uuid_Xcode4_FileRef {047B650C-DBF4-44C6-8D05-A009B49D48D6}
           uuid_Xcode4_BuildFileInSources {5D0D1C84-6B6B-4157-A676-0974C4878E5E}
-          filename_and_path {src/Fl_Help_View.cxx}
+          filename_and_path {src/core/Fl_Help_View.cxx}
         }
         file_ref {Fl_Image.cxx} {
           uuid_Xcode4_BuildFile {DF973496-4200-49AA-BC93-249BA2210DA0}
           uuid_Xcode4_FileRef {E01E16F1-143B-485F-B5FC-F6258C32F5F6}
           uuid_Xcode4_BuildFileInSources {DE9BFEBC-9FBA-49A7-86CB-DD7151D3A983}
-          filename_and_path {src/Fl_Image.cxx}
+          filename_and_path {src/core/Fl_Image.cxx}
         }
         file_ref {Fl_Input.cxx} {
           uuid_Xcode4_BuildFile {76FB90B7-4336-4503-9BE1-BAFE1C6595FD}
           uuid_Xcode4_FileRef {184F6210-C542-4DA1-83AC-8711FD7A0384}
           uuid_Xcode4_BuildFileInSources {1DC72F81-A8D1-4EAC-A118-87F7C91CC055}
-          filename_and_path {src/Fl_Input.cxx}
+          filename_and_path {src/core/Fl_Input.cxx}
         }
         file_ref {Fl_Input_.cxx} {
           uuid_Xcode4_BuildFile {48A7C3EF-5BA8-4979-B113-AD2901649800}
           uuid_Xcode4_FileRef {A8924614-71DC-4863-9895-60692D538E50}
           uuid_Xcode4_BuildFileInSources {22D48105-5628-4901-9056-E590708B7A5C}
-          filename_and_path {src/Fl_Input_.cxx}
+          filename_and_path {src/core/Fl_Input_.cxx}
         }
         file_ref {Fl_Light_Button.cxx} {
           uuid_Xcode4_BuildFile {A7701349-FD57-46A0-84D3-B65C795C834B}
           uuid_Xcode4_FileRef {36C72097-8E40-47E8-914C-FB7F861ACD51}
           uuid_Xcode4_BuildFileInSources {EDFFE30A-F0F2-4A3C-BBFA-CC51818EFD3C}
-          filename_and_path {src/Fl_Light_Button.cxx}
+          filename_and_path {src/core/Fl_Light_Button.cxx}
         }
         file_ref {Fl_Menu.cxx} {
           uuid_Xcode4_BuildFile {FC5ADC05-7CB3-4213-9C1A-5F737CC9EDAE}
           uuid_Xcode4_FileRef {4672B51C-C45E-4BD5-8083-1C8403D7EAA5}
           uuid_Xcode4_BuildFileInSources {FB4C0311-03FE-4E29-A8FE-55B021C93B23}
-          filename_and_path {src/Fl_Menu.cxx}
+          filename_and_path {src/core/Fl_Menu.cxx}
         }
         file_ref {Fl_Menu_.cxx} {
           uuid_Xcode4_BuildFile {F4886C34-73DF-44FB-A100-AD10EEC6340F}
           uuid_Xcode4_FileRef {DE9E57A2-6320-4D65-8B5C-485F9D820566}
           uuid_Xcode4_BuildFileInSources {24D66152-234B-40E8-96E4-9BE455EEA9CD}
-          filename_and_path {src/Fl_Menu_.cxx}
+          filename_and_path {src/core/Fl_Menu_.cxx}
         }
         file_ref {Fl_Menu_Bar.cxx} {
           uuid_Xcode4_BuildFile {F690A4A3-C410-4C28-8B0C-DD694D66E06E}
           uuid_Xcode4_FileRef {265C00BF-D5DC-4849-813B-19E9A10BE42A}
           uuid_Xcode4_BuildFileInSources {BD7AE3AE-8500-4770-86A5-3D5C7D63A102}
-          filename_and_path {src/Fl_Menu_Bar.cxx}
+          filename_and_path {src/core/Fl_Menu_Bar.cxx}
         }
         file_ref {Fl_Menu_Button.cxx} {
           uuid_Xcode4_BuildFile {FD9004A1-F802-4C5D-9225-5344D737A373}
           uuid_Xcode4_FileRef {58FD2064-F6B4-447C-BCF8-E8998D2E68DB}
           uuid_Xcode4_BuildFileInSources {1EC305B7-05F0-4FD7-A035-7FAC4486CAEA}
-          filename_and_path {src/Fl_Menu_Button.cxx}
+          filename_and_path {src/core/Fl_Menu_Button.cxx}
         }
         file_ref {Fl_Menu_Window.cxx} {
           uuid_Xcode4_BuildFile {8C7C9611-0CD1-4C32-847B-11A750EB0745}
           uuid_Xcode4_FileRef {CBE03F81-8878-47F2-8580-C669735AEFC9}
           uuid_Xcode4_BuildFileInSources {63C85999-1423-4DE8-A091-764292A98548}
-          filename_and_path {src/Fl_Menu_Window.cxx}
+          filename_and_path {src/core/Fl_Menu_Window.cxx}
         }
         file_ref {Fl_Menu_add.cxx} {
           uuid_Xcode4_BuildFile {83EF6417-50A0-4E49-8D93-357ECA893443}
           uuid_Xcode4_FileRef {C649ABF1-FC49-41C2-B145-EEF11539FB5F}
           uuid_Xcode4_BuildFileInSources {A5B4D789-9B30-4430-9193-9A2FCFC14069}
-          filename_and_path {src/Fl_Menu_add.cxx}
+          filename_and_path {src/core/Fl_Menu_add.cxx}
         }
         file_ref {Fl_Menu_global.cxx} {
           uuid_Xcode4_BuildFile {8FA4327A-A0BD-4F1B-A447-93E87A9BCE1C}
           uuid_Xcode4_FileRef {25D17230-B6AF-4AF7-B3C0-2995DA9C6F23}
           uuid_Xcode4_BuildFileInSources {6C148F33-17A5-4AF2-9A68-A5C91E171DE8}
-          filename_and_path {src/Fl_Menu_global.cxx}
+          filename_and_path {src/core/Fl_Menu_global.cxx}
         }
         file_ref {Fl_Multi_Label.cxx} {
           uuid_Xcode4_BuildFile {2F50A0D8-B6F7-490A-A8EC-11F893AC8AB9}
           uuid_Xcode4_FileRef {37D57C7D-DA2D-4296-AA55-229B1A3BFC20}
           uuid_Xcode4_BuildFileInSources {46A6752E-635C-4E9A-AA63-5B7155C93484}
-          filename_and_path {src/Fl_Multi_Label.cxx}
+          filename_and_path {src/core/Fl_Multi_Label.cxx}
         }
         file_ref {Fl_Native_File_Chooser.cxx} {
           uuid_Xcode4_BuildFile {3CCD0677-B052-4EAB-847D-EA18F342D11F}
           uuid_Xcode4_FileRef {FC634C34-9189-40E6-90A4-8D42EF923847}
           uuid_Xcode4_BuildFileInSources {B30D6189-B227-4351-BD2F-EAAB376B6779}
-          filename_and_path {src/Fl_Native_File_Chooser.cxx}
+          filename_and_path {src/core/Fl_Native_File_Chooser.cxx}
         }
         file_ref {Fl_Overlay_Window.cxx} {
           uuid_Xcode4_BuildFile {50CCB3E9-D605-4F6C-97EA-4607BFC19BEC}
           uuid_Xcode4_FileRef {CEF1A66A-1E4B-4A61-A236-82B007C52832}
           uuid_Xcode4_BuildFileInSources {5857DE8B-5066-46E4-89B9-03B693032DB4}
-          filename_and_path {src/Fl_Overlay_Window.cxx}
+          filename_and_path {src/core/Fl_Overlay_Window.cxx}
         }
         file_ref {Fl_Pack.cxx} {
           uuid_Xcode4_BuildFile {2EC07AEA-4325-4E47-8D60-139740EAE1C2}
           uuid_Xcode4_FileRef {0F0129FF-794E-4E1D-9091-7900F59B9FB5}
           uuid_Xcode4_BuildFileInSources {5C93DA84-CF25-4D54-ACD5-CFE6763AA2F8}
-          filename_and_path {src/Fl_Pack.cxx}
+          filename_and_path {src/core/Fl_Pack.cxx}
         }
         file_ref {Fl_Paged_Device.cxx} {
           uuid_Xcode4_BuildFile {3851F580-32C6-4733-9167-C8CBD7610692}
           uuid_Xcode4_FileRef {680EF039-6F4F-4B31-B176-BD222AD802F6}
           uuid_Xcode4_BuildFileInSources {BFD45A93-42FD-4D79-8F8D-953B663EB28F}
-          filename_and_path {src/Fl_Paged_Device.cxx}
+          filename_and_path {src/core/Fl_Paged_Device.cxx}
         }
         file_ref {Fl_Pixmap.cxx} {
           uuid_Xcode4_BuildFile {C4D7E2E9-314F-4361-AD85-CDBEB0E9B9A8}
           uuid_Xcode4_FileRef {9AEB9365-32CF-48CF-8810-7F9B2046454D}
           uuid_Xcode4_BuildFileInSources {EBD65896-39D0-45DE-9F3B-66A8B55D8A75}
-          filename_and_path {src/Fl_Pixmap.cxx}
+          filename_and_path {src/core/Fl_Pixmap.cxx}
         }
         file_ref {Fl_Positioner.cxx} {
           uuid_Xcode4_BuildFile {AFC22C98-7D5A-47AD-8F79-8AE0ABA64048}
           uuid_Xcode4_FileRef {9EB992B1-D710-426E-A89D-8F3306A07426}
           uuid_Xcode4_BuildFileInSources {78781310-D555-4403-B4E1-EF0EA0E1E765}
-          filename_and_path {src/Fl_Positioner.cxx}
+          filename_and_path {src/core/Fl_Positioner.cxx}
         }
         file_ref {Fl_Printer.cxx} {
           uuid_Xcode4_BuildFile {7BA4A607-6C7B-4BB0-B8CB-0F7B4F3EDE3F}
           uuid_Xcode4_FileRef {53F2F9DE-99B0-4879-AD46-BA1EA21D0246}
           uuid_Xcode4_BuildFileInSources {C759F618-3B69-4CCC-A1E6-73E8DBD7488D}
-          filename_and_path {src/Fl_Printer.cxx}
+          filename_and_path {src/core/Fl_Printer.cxx}
         }
         file_ref {Fl_Preferences.cxx} {
           uuid_Xcode4_BuildFile {B6CC4604-60B8-4F7A-B134-C1D8EC515A12}
           uuid_Xcode4_FileRef {59610374-761E-4912-BDCE-5F669B7B3FA5}
           uuid_Xcode4_BuildFileInSources {96257899-ED70-4DA5-83C8-42BB3FAC5200}
-          filename_and_path {src/Fl_Preferences.cxx}
+          filename_and_path {src/core/Fl_Preferences.cxx}
         }
         file_ref {Fl_Progress.cxx} {
           uuid_Xcode4_BuildFile {20F00948-E2C6-4027-BE38-4BD07D34D62E}
           uuid_Xcode4_FileRef {B62169E8-CBE5-4A83-8893-D176E6E4DD9F}
           uuid_Xcode4_BuildFileInSources {486D31DD-6CF6-4B78-B16A-9D3B44B6284E}
-          filename_and_path {src/Fl_Progress.cxx}
+          filename_and_path {src/core/Fl_Progress.cxx}
         }
         file_ref {Fl_Repeat_Button.cxx} {
           uuid_Xcode4_BuildFile {A494B047-B897-48AC-B463-91BA94498C6B}
           uuid_Xcode4_FileRef {F2E611B0-825F-4087-AD5E-6863D06946BC}
           uuid_Xcode4_BuildFileInSources {4E4DEB0F-5530-4490-8B70-6CDBB682FBAF}
-          filename_and_path {src/Fl_Repeat_Button.cxx}
+          filename_and_path {src/core/Fl_Repeat_Button.cxx}
         }
         file_ref {Fl_Return_Button.cxx} {
           uuid_Xcode4_BuildFile {87CE402C-87A8-4C9C-AB9A-0F4D9B28E093}
           uuid_Xcode4_FileRef {69E296C0-6A1A-43E1-A97D-9905A82EE913}
           uuid_Xcode4_BuildFileInSources {5B4F6F77-657B-4161-8495-8F9D9DCE19F1}
-          filename_and_path {src/Fl_Return_Button.cxx}
+          filename_and_path {src/core/Fl_Return_Button.cxx}
         }
         file_ref {Fl_Roller.cxx} {
           uuid_Xcode4_BuildFile {07E3396B-982F-4ACA-A15F-604C0F96FB37}
           uuid_Xcode4_FileRef {A5526E66-615E-4C5D-BEFD-4A34647C13A4}
           uuid_Xcode4_BuildFileInSources {01570F25-D56A-4F38-A635-7167DA170772}
-          filename_and_path {src/Fl_Roller.cxx}
+          filename_and_path {src/core/Fl_Roller.cxx}
         }
         file_ref {Fl_Round_Button.cxx} {
           uuid_Xcode4_BuildFile {8CE9A2F5-45BE-4D71-845A-3BCEFBC1D0AF}
           uuid_Xcode4_FileRef {5DA33AF3-3DC1-4878-970E-E2E5BE824A96}
           uuid_Xcode4_BuildFileInSources {F32B3FAD-0BC4-4B34-9E26-9E69FA6158E3}
-          filename_and_path {src/Fl_Round_Button.cxx}
+          filename_and_path {src/core/Fl_Round_Button.cxx}
         }
         file_ref {Fl_Scroll.cxx} {
           uuid_Xcode4_BuildFile {0105EB4F-2FD7-4B85-B5D8-B09B33CEBC16}
           uuid_Xcode4_FileRef {135F7AE4-1BF1-474C-BB37-117ED80BB12D}
           uuid_Xcode4_BuildFileInSources {B506EE63-364E-4744-9C3F-94D382B52F62}
-          filename_and_path {src/Fl_Scroll.cxx}
+          filename_and_path {src/core/Fl_Scroll.cxx}
         }
         file_ref {Fl_Scrollbar.cxx} {
           uuid_Xcode4_BuildFile {5C70A5A9-A67B-4B14-9D23-ABBDCE533FD9}
           uuid_Xcode4_FileRef {6F7BEB35-6EBF-499D-A9F5-BD43167B1FB8}
           uuid_Xcode4_BuildFileInSources {5622DE29-66EB-4F16-8F99-3642F1607BC6}
-          filename_and_path {src/Fl_Scrollbar.cxx}
+          filename_and_path {src/core/Fl_Scrollbar.cxx}
         }
         file_ref {Fl_Shared_Image.cxx} {
           uuid_Xcode4_BuildFile {8A0C023A-0383-430E-95D8-B9AEA5E17969}
           uuid_Xcode4_FileRef {8580401C-DB11-4629-931A-AA44CAD127AC}
           uuid_Xcode4_BuildFileInSources {7CB9D27B-4F25-4039-8052-62DE828F280B}
-          filename_and_path {src/Fl_Shared_Image.cxx}
+          filename_and_path {src/core/Fl_Shared_Image.cxx}
         }
         file_ref {Fl_Single_Window.cxx} {
           uuid_Xcode4_BuildFile {C6BD816D-59B7-4C3C-A83A-A78D32B5BDBC}
           uuid_Xcode4_FileRef {17A03BA5-0404-4989-A516-C22F7D8BDCEE}
           uuid_Xcode4_BuildFileInSources {550F71EE-612D-428E-8D5C-55BC0A890F88}
-          filename_and_path {src/Fl_Single_Window.cxx}
+          filename_and_path {src/core/Fl_Single_Window.cxx}
         }
         file_ref {Fl_Slider.cxx} {
           uuid_Xcode4_BuildFile {05A570C7-6790-48AF-B07E-3DA2E4738B28}
           uuid_Xcode4_FileRef {085FAF82-6F59-4F42-AB4C-349D927A8BAA}
           uuid_Xcode4_BuildFileInSources {052ACB65-EF8A-454B-AFDB-BD3FDFA7B7C1}
-          filename_and_path {src/Fl_Slider.cxx}
+          filename_and_path {src/core/Fl_Slider.cxx}
         }
         file_ref {Style.cxx} {
           uuid_Xcode4_BuildFile {DD895EB1-D352-4D09-99D7-D9DE1758D9F9}
           uuid_Xcode4_FileRef {CAA3AD96-0CC5-4893-8893-68022791C783}
           uuid_Xcode4_BuildFileInSources {19513486-168E-430B-88A7-6896DF857E7B}
-          filename_and_path {src/Style.cxx}
+          filename_and_path {src/core/Style.cxx}
         }
         file_ref {Fl_Sys_Menu_Bar.cxx} {
           uuid_Xcode4_BuildFile {FC5F7A11-9A94-4596-BCF0-458EB54BF587}
           uuid_Xcode4_FileRef {43C12A4D-7C89-4BAE-B250-C5E2307220CC}
           uuid_Xcode4_BuildFileInSources {B7E4B117-9D18-4D8B-A68F-4BDF4AD5127B}
-          filename_and_path {src/Fl_Sys_Menu_Bar.cxx}
+          filename_and_path {src/core/Fl_Sys_Menu_Bar.cxx}
         }
         file_ref {Fl_Table.cxx} {
           uuid_Xcode4_BuildFile {BFA14DC7-600F-49DF-99DF-24A48C8142E6}
           uuid_Xcode4_FileRef {02584243-5408-4D4A-96A5-3FA806F5BCFA}
           uuid_Xcode4_BuildFileInSources {E0D6CAE3-0A6F-47A7-9A4B-CE1FB5C61EBA}
-          filename_and_path {src/Fl_Table.cxx}
+          filename_and_path {src/core/Fl_Table.cxx}
         }
         file_ref {Fl_Table_Row.cxx} {
           uuid_Xcode4_BuildFile {8B6C6698-82A4-490F-B7D9-3AB8182B0DD4}
           uuid_Xcode4_FileRef {7097EA09-FB87-4E3F-B29A-4E64EBE28CA8}
           uuid_Xcode4_BuildFileInSources {56C8DD01-88A0-4126-BD4E-B59F64F2047B}
-          filename_and_path {src/Fl_Table_Row.cxx}
+          filename_and_path {src/core/Fl_Table_Row.cxx}
         }
         file_ref {Fl_Tabs.cxx} {
           uuid_Xcode4_BuildFile {BDA1F834-FADD-4394-A2A3-67616F09DB47}
           uuid_Xcode4_FileRef {77126381-0CA1-4F19-8800-48B51FF6A61B}
           uuid_Xcode4_BuildFileInSources {135F22EC-8E13-48D2-AB1C-CF4BF223E1EA}
-          filename_and_path {src/Fl_Tabs.cxx}
+          filename_and_path {src/core/Fl_Tabs.cxx}
         }
         file_ref {Fl_Text_Buffer.cxx} {
           uuid_Xcode4_BuildFile {9BD37A78-D289-47A9-BBA2-7B67CEFEB0DA}
           uuid_Xcode4_FileRef {8867A20B-7B96-4B4E-BBE1-E492D157D617}
           uuid_Xcode4_BuildFileInSources {1ABCEAD8-C819-4B1E-971C-A1F949D56A9B}
-          filename_and_path {src/Fl_Text_Buffer.cxx}
+          filename_and_path {src/core/Fl_Text_Buffer.cxx}
         }
         file_ref {Fl_Text_Display.cxx} {
           uuid_Xcode4_BuildFile {1A94F4A9-95C0-4A75-8DE5-8945E353D597}
           uuid_Xcode4_FileRef {E5E1DA87-AA6C-460E-90F4-2C8D9411CDB9}
           uuid_Xcode4_BuildFileInSources {9B434666-39BA-4D16-8A78-77F8CF1A44C7}
-          filename_and_path {src/Fl_Text_Display.cxx}
+          filename_and_path {src/core/Fl_Text_Display.cxx}
         }
         file_ref {Fl_Text_Editor.cxx} {
           uuid_Xcode4_BuildFile {A507F8F6-5687-406F-A0B0-A424A3CB162B}
           uuid_Xcode4_FileRef {5995AACC-72D1-4AAA-A20A-84D4CEE88139}
           uuid_Xcode4_BuildFileInSources {038A56E9-A8EE-4DC7-971B-3C3FD59EF7FA}
-          filename_and_path {src/Fl_Text_Editor.cxx}
+          filename_and_path {src/core/Fl_Text_Editor.cxx}
         }
         file_ref {Fl_Tile.cxx} {
           uuid_Xcode4_BuildFile {3870255E-E9C6-4D50-9C26-E04A6CA659C9}
           uuid_Xcode4_FileRef {A3F6667D-AF2F-460F-809F-4BDDED6E95FC}
           uuid_Xcode4_BuildFileInSources {45E744C6-8C6C-4F03-913D-2D3B7F9F04EE}
-          filename_and_path {src/Fl_Tile.cxx}
+          filename_and_path {src/core/Fl_Tile.cxx}
         }
         file_ref {Fl_Tiled_Image.cxx} {
           uuid_Xcode4_BuildFile {C043B0DE-0983-418C-88CB-5CB7F7F4A60A}
           uuid_Xcode4_FileRef {4C92BA7B-29EF-46D2-91C9-348D49388F69}
           uuid_Xcode4_BuildFileInSources {E9D3E58E-0CCD-4003-845F-E0C0B2BC43EA}
-          filename_and_path {src/Fl_Tiled_Image.cxx}
+          filename_and_path {src/core/Fl_Tiled_Image.cxx}
         }
         file_ref {Fl_Tooltip.cxx} {
           uuid_Xcode4_BuildFile {36ACF63E-9691-4DFE-8918-CA3610F13FAD}
           uuid_Xcode4_FileRef {22CA4A41-F913-4DAC-A13D-CC57F6A6F244}
           uuid_Xcode4_BuildFileInSources {90FFE6AA-D57A-4579-BAB9-1C971983C991}
-          filename_and_path {src/Fl_Tooltip.cxx}
+          filename_and_path {src/core/Fl_Tooltip.cxx}
         }
         file_ref {Fl_Tree.cxx} {
           uuid_Xcode4_BuildFile {AE64AF6B-751E-4D4E-B923-16EFC07C9234}
           uuid_Xcode4_FileRef {214492E9-38C0-491D-AC42-F4E1EF8FEAA3}
           uuid_Xcode4_BuildFileInSources {68148315-74B0-49C3-9C8F-FE81AA36873D}
-          filename_and_path {src/Fl_Tree.cxx}
+          filename_and_path {src/core/Fl_Tree.cxx}
         }
         file_ref {Fl_Tree_Item.cxx} {
           uuid_Xcode4_BuildFile {03133ABA-346B-4DEC-B667-9E9A78C07AD7}
           uuid_Xcode4_FileRef {D9F29791-60DE-48C5-9266-701106AB7E8E}
           uuid_Xcode4_BuildFileInSources {9A57CF11-9BC9-40E0-B6C2-E305BAEF98A7}
-          filename_and_path {src/Fl_Tree_Item.cxx}
+          filename_and_path {src/core/Fl_Tree_Item.cxx}
         }
         file_ref {Fl_Tree_Item_Array.cxx} {
           uuid_Xcode4_BuildFile {A082BAF2-ECA2-4E15-A323-76837C355BE9}
           uuid_Xcode4_FileRef {D6CBFFFA-2FE1-4D65-883E-F592FACE5284}
           uuid_Xcode4_BuildFileInSources {D2A37420-118D-4BAF-A60C-C4B971A051DE}
-          filename_and_path {src/Fl_Tree_Item_Array.cxx}
+          filename_and_path {src/core/Fl_Tree_Item_Array.cxx}
         }
         file_ref {Fl_Tree_Prefs.cxx} {
           uuid_Xcode4_BuildFile {D18C9E57-25E8-4D5D-8A64-59536C9DD869}
           uuid_Xcode4_FileRef {CFFE37EE-309C-43FC-BCE5-41E02E7B592D}
           uuid_Xcode4_BuildFileInSources {68CC4C36-27B6-4DA0-9B5A-A5E1BCEE853E}
-          filename_and_path {src/Fl_Tree_Prefs.cxx}
+          filename_and_path {src/core/Fl_Tree_Prefs.cxx}
         }
         file_ref {Fl_Valuator.cxx} {
           uuid_Xcode4_BuildFile {2BE8F141-3682-40D9-86E6-ED82BFF69E75}
           uuid_Xcode4_FileRef {35EB53B1-EE73-4CA2-A8DE-47D037A4970E}
           uuid_Xcode4_BuildFileInSources {4A519B4F-67A2-43BF-9740-82E3DA6D3231}
-          filename_and_path {src/Fl_Valuator.cxx}
+          filename_and_path {src/core/Fl_Valuator.cxx}
         }
         file_ref {Fl_Value_Input.cxx} {
           uuid_Xcode4_BuildFile {44BC0D55-DA69-4BD4-9F19-B42DD0F34E4E}
           uuid_Xcode4_FileRef {1685625E-A5F8-463D-BE13-D96C29D7D314}
           uuid_Xcode4_BuildFileInSources {BD78190E-0B6A-4932-85C7-DA11B71AFEDA}
-          filename_and_path {src/Fl_Value_Input.cxx}
+          filename_and_path {src/core/Fl_Value_Input.cxx}
         }
         file_ref {Fl_Value_Output.cxx} {
           uuid_Xcode4_BuildFile {4EA1B94C-4E2A-4416-A2D4-2552A132F55A}
           uuid_Xcode4_FileRef {7553A0E7-0663-41E1-AE1E-E07C7DB0DDE5}
           uuid_Xcode4_BuildFileInSources {7E26A26E-5A02-440D-8966-60F1255F67D7}
-          filename_and_path {src/Fl_Value_Output.cxx}
+          filename_and_path {src/core/Fl_Value_Output.cxx}
         }
         file_ref {Fl_Value_Slider.cxx} {
           uuid_Xcode4_BuildFile {2AF743E0-9646-472E-9B92-7D02BD5C25D0}
           uuid_Xcode4_FileRef {07F5E789-E549-43E0-B527-FB1FE46B9744}
           uuid_Xcode4_BuildFileInSources {00BFB74D-1DF3-4632-9997-B303AFF72C8E}
-          filename_and_path {src/Fl_Value_Slider.cxx}
+          filename_and_path {src/core/Fl_Value_Slider.cxx}
         }
         file_ref {Fl_Widget.cxx} {
           uuid_Xcode4_BuildFile {9B2E9C9D-3B03-453C-B5ED-887C12F26BBC}
           uuid_Xcode4_FileRef {C5F5E189-F794-4C76-B727-E18198ADF418}
           uuid_Xcode4_BuildFileInSources {C8308863-F3C1-47E0-8715-2A26C5442423}
-          filename_and_path {src/Fl_Widget.cxx}
+          filename_and_path {src/core/Fl_Widget.cxx}
         }
         file_ref {Fl_Window.cxx} {
           uuid_Xcode4_BuildFile {92A1ED53-56AF-4774-ADED-DC90687267DF}
           uuid_Xcode4_FileRef {8E1A3A4F-8323-456A-9EC0-B1C80AF48D54}
           uuid_Xcode4_BuildFileInSources {EAFF1F86-859B-4124-B744-7D388FCCEA28}
-          filename_and_path {src/Fl_Window.cxx}
+          filename_and_path {src/core/Fl_Window.cxx}
         }
         file_ref {Fl_Window_fullscreen.cxx} {
           uuid_Xcode4_BuildFile {06F92B62-70C7-4220-9B40-9E49613889D5}
           uuid_Xcode4_FileRef {7679F6CC-1F04-4C95-82A8-45ADD9B921DA}
           uuid_Xcode4_BuildFileInSources {C62F4F9E-5D2F-4E98-A29C-451146033106}
-          filename_and_path {src/Fl_Window_fullscreen.cxx}
+          filename_and_path {src/core/Fl_Window_fullscreen.cxx}
         }
         file_ref {Fl_Window_hotspot.cxx} {
           uuid_Xcode4_BuildFile {01838D98-2D61-477B-8251-BFEF7F7934B1}
           uuid_Xcode4_FileRef {B5E58AC3-DBBC-4921-9066-AABABE238301}
           uuid_Xcode4_BuildFileInSources {A76E032A-9937-4086-80F0-B370163BB493}
-          filename_and_path {src/Fl_Window_hotspot.cxx}
+          filename_and_path {src/core/Fl_Window_hotspot.cxx}
         }
         file_ref {Fl_Window_iconize.cxx} {
           uuid_Xcode4_BuildFile {C23C9712-2419-4812-927C-ADFAB6DF91C0}
           uuid_Xcode4_FileRef {C34CF806-B0A3-4A4A-B3B1-502CDFD23D3B}
           uuid_Xcode4_BuildFileInSources {E373B7F4-2FFB-4CEE-9357-7586F6D255E9}
-          filename_and_path {src/Fl_Window_iconize.cxx}
+          filename_and_path {src/core/Fl_Window_iconize.cxx}
         }
         file_ref {Fl_Wizard.cxx} {
           uuid_Xcode4_BuildFile {0ECB24E4-43CE-497B-AE79-CFB4AA24EE9F}
           uuid_Xcode4_FileRef {A84F1844-4DC5-4FCD-925E-20F4809D2871}
           uuid_Xcode4_BuildFileInSources {72DEB4A9-12C7-445B-82A8-8DB9C103EF90}
-          filename_and_path {src/Fl_Wizard.cxx}
+          filename_and_path {src/core/Fl_Wizard.cxx}
         }
         file_ref {Fl_XBM_Image.cxx} {
           uuid_Xcode4_BuildFile {0331C1F4-F50E-40CE-A3DF-DBCE1026AEE5}
           uuid_Xcode4_FileRef {9A21D7ED-A598-46CE-9BEF-FF2BB0EDD969}
           uuid_Xcode4_BuildFileInSources {F4974EC2-D5E9-4919-8325-C1F3AEB0CC0D}
-          filename_and_path {src/Fl_XBM_Image.cxx}
+          filename_and_path {src/core/Fl_XBM_Image.cxx}
         }
         file_ref {Fl_XPM_Image.cxx} {
           uuid_Xcode4_BuildFile {BA6520FE-E8C8-46CE-97D2-B2004FBA58EB}
           uuid_Xcode4_FileRef {302A3FA8-E0E6-4BBF-BFFF-61815255E28C}
           uuid_Xcode4_BuildFileInSources {A7891F57-3F3F-4B7F-B2EF-B57A4D70C5D4}
-          filename_and_path {src/Fl_XPM_Image.cxx}
+          filename_and_path {src/core/Fl_XPM_Image.cxx}
         }
         file_ref {Fl_abort.cxx} {
           uuid_Xcode4_BuildFile {76CBBC9B-34FC-4D1D-8B91-4364D399C78E}
           uuid_Xcode4_FileRef {671B96BA-1F00-4285-B741-6287EE31AB76}
           uuid_Xcode4_BuildFileInSources {230F7BA0-D22C-4FF3-BDAC-74F889B89DFF}
-          filename_and_path {src/Fl_abort.cxx}
+          filename_and_path {src/core/Fl_abort.cxx}
         }
         file_ref {Fl_add_idle.cxx} {
           uuid_Xcode4_BuildFile {995D8E2D-7F48-4AA5-BC5D-1EE141C7D5B7}
           uuid_Xcode4_FileRef {1821AF47-D43D-4B6F-BAF7-0C8239CB0CF8}
           uuid_Xcode4_BuildFileInSources {EC8E6A4E-E23B-4501-9094-B62AEC330000}
-          filename_and_path {src/Fl_add_idle.cxx}
+          filename_and_path {src/core/Fl_add_idle.cxx}
         }
         file_ref {Fl_arg.cxx} {
           uuid_Xcode4_BuildFile {3DBCCC28-455E-4B3D-A821-A87B87661BAB}
           uuid_Xcode4_FileRef {8E5EB755-F5D6-4F27-8C0C-B3BD5109FC0C}
           uuid_Xcode4_BuildFileInSources {A87E247A-A9E6-4714-843A-A9F46B7DFEE1}
-          filename_and_path {src/Fl_arg.cxx}
+          filename_and_path {src/core/Fl_arg.cxx}
         }
         file_ref {Fl_compose.cxx} {
           uuid_Xcode4_BuildFile {008D083F-48BF-4D00-91BE-4A038C38678F}
           uuid_Xcode4_FileRef {AA048ACB-ADC4-4FE4-9FEE-77DF739595BD}
           uuid_Xcode4_BuildFileInSources {867ED2B3-580E-4431-AD43-EC19CBA63053}
-          filename_and_path {src/Fl_compose.cxx}
+          filename_and_path {src/core/Fl_compose.cxx}
         }
         file_ref {Fl_display.cxx} {
           uuid_Xcode4_BuildFile {7CD1939D-5904-41CA-8EDF-051E74AF82AD}
           uuid_Xcode4_FileRef {44287148-A93A-4F14-BF82-CF1A80C4EA41}
           uuid_Xcode4_BuildFileInSources {EF8285FB-C1F0-4987-9920-B186F7E61B8A}
-          filename_and_path {src/Fl_display.cxx}
+          filename_and_path {src/core/Fl_display.cxx}
         }
         file_ref {Fl_get_key.cxx} {
           uuid_Xcode4_BuildFile {A82ED410-8A3B-4306-8DB8-B26F032BF0B4}
           uuid_Xcode4_FileRef {A8DC358A-CD4F-4EDF-BCC0-1853A9A8AE55}
           uuid_Xcode4_BuildFileInSources {11ADE417-BC90-4DDF-8E9C-777EEE8083CE}
-          filename_and_path {src/Fl_get_key.cxx}
+          filename_and_path {src/core/Fl_get_key.cxx}
         }
         file_ref {Fl_get_system_colors.cxx} {
           uuid_Xcode4_BuildFile {304D9DBC-B02C-4B24-9313-78D56E0DB732}
           uuid_Xcode4_FileRef {FEADB63E-10A5-4C86-BDC0-C7427884C5C5}
           uuid_Xcode4_BuildFileInSources {05360A38-1464-4542-ADD3-F1DC5DE74075}
-          filename_and_path {src/Fl_get_system_colors.cxx}
+          filename_and_path {src/core/Fl_get_system_colors.cxx}
         }
         file_ref {Fl_grab.cxx} {
           uuid_Xcode4_BuildFile {63ABEAB0-ACB7-4C09-907A-41FB050A8D7C}
           uuid_Xcode4_FileRef {76AA6E6C-3BA9-4D36-8E49-3F1EF8125874}
           uuid_Xcode4_BuildFileInSources {DF2B279A-3F18-4376-A29F-EF041DAF6A30}
-          filename_and_path {src/Fl_grab.cxx}
+          filename_and_path {src/core/Fl_grab.cxx}
         }
         file_ref {Fl_lock.cxx} {
           uuid_Xcode4_BuildFile {590BA941-4384-40FA-AFFA-2CA40D153532}
           uuid_Xcode4_FileRef {7FAC5183-623B-4758-B960-41D044E55B90}
           uuid_Xcode4_BuildFileInSources {F08C8B0E-2FA4-4A06-8350-642417682E0C}
-          filename_and_path {src/Fl_lock.cxx}
+          filename_and_path {src/core/Fl_lock.cxx}
         }
         file_ref {Fl_own_colormap.cxx} {
           uuid_Xcode4_BuildFile {2A1194F3-22E2-490B-AD07-E1CAB1EBB610}
           uuid_Xcode4_FileRef {013DBB50-59E0-4063-B31F-D57E3C31E2A9}
           uuid_Xcode4_BuildFileInSources {D93BEFC6-7FD5-48E3-935B-5D96C57C91B9}
-          filename_and_path {src/Fl_own_colormap.cxx}
+          filename_and_path {src/core/Fl_own_colormap.cxx}
         }
         file_ref {Fl_visual.cxx} {
           uuid_Xcode4_BuildFile {899B51B6-BAE8-4D54-942F-B2CD51DE703F}
           uuid_Xcode4_FileRef {1626800F-6D7F-4052-88E8-7EF69E2468DD}
           uuid_Xcode4_BuildFileInSources {D57FBCFB-33F0-4145-A643-4334A7F80562}
-          filename_and_path {src/Fl_visual.cxx}
+          filename_and_path {src/core/Fl_visual.cxx}
         }
         file_ref {Fl_x.cxx} {
           uuid_Xcode4_BuildFile {4FEC890B-E99A-4CC0-B4FA-8A61FFB4C5AD}
           uuid_Xcode4_FileRef {F285310A-3E4D-4595-B259-6AD6965104C8}
           uuid_Xcode4_BuildFileInSources {D9007598-62D1-4DEA-BB6B-B7B00EF91A73}
-          filename_and_path {src/Fl_x.cxx}
+          filename_and_path {src/core/Fl_x.cxx}
         }
         file_ref {filename_absolute.cxx} {
           uuid_Xcode4_BuildFile {9C057CB7-470D-474A-8A65-F3EB5D64C178}
           uuid_Xcode4_FileRef {04A6409B-1DA2-4F77-8692-2F0417606460}
           uuid_Xcode4_BuildFileInSources {AABCD211-5E58-4F6F-8407-F05C5B24F9F8}
-          filename_and_path {src/filename_absolute.cxx}
+          filename_and_path {src/core/filename_absolute.cxx}
         }
         file_ref {filename_expand.cxx} {
           uuid_Xcode4_BuildFile {53B53EC9-FB0E-4CA1-908C-AD77EC9602D1}
           uuid_Xcode4_FileRef {F9F779F2-6B64-4A82-B453-84BD4A837595}
           uuid_Xcode4_BuildFileInSources {B1C7F800-5F13-4AF7-8785-DF351ED0339C}
-          filename_and_path {src/filename_expand.cxx}
+          filename_and_path {src/core/filename_expand.cxx}
         }
         file_ref {filename_ext.cxx} {
           uuid_Xcode4_BuildFile {D613722A-19E9-4250-953B-907DFE7B14FC}
           uuid_Xcode4_FileRef {210616B2-483B-418C-9D2D-89C418A5CD3B}
           uuid_Xcode4_BuildFileInSources {80D7B46E-ED1F-468B-8C5B-E65A968CCDF8}
-          filename_and_path {src/filename_ext.cxx}
+          filename_and_path {src/core/filename_ext.cxx}
         }
         file_ref {filename_isdir.cxx} {
           uuid_Xcode4_BuildFile {6C9314CD-21BC-40F7-8415-73B0E190D503}
           uuid_Xcode4_FileRef {C07EC3AE-3C83-4B3E-9966-35A28058E2CA}
           uuid_Xcode4_BuildFileInSources {3211F94B-69C8-49ED-B0E1-2B661D48CC63}
-          filename_and_path {src/filename_isdir.cxx}
+          filename_and_path {src/core/filename_isdir.cxx}
         }
         file_ref {filename_list.cxx} {
           uuid_Xcode4_BuildFile {F2152084-2546-45BA-8321-EB4ADC4D82C9}
           uuid_Xcode4_FileRef {F08599CC-AC58-4DC3-9A01-8C41395AB3D0}
           uuid_Xcode4_BuildFileInSources {8C352F42-1C2F-4C09-B088-AEE742F1FA19}
-          filename_and_path {src/filename_list.cxx}
+          filename_and_path {src/core/filename_list.cxx}
         }
         file_ref {filename_match.cxx} {
           uuid_Xcode4_BuildFile {D2F1A161-BF18-4766-B901-D2BF0C467D27}
           uuid_Xcode4_FileRef {AB171A4B-B928-4010-BDE1-1F82E10FD0AD}
           uuid_Xcode4_BuildFileInSources {BF87576C-B066-4869-859A-D0477380B991}
-          filename_and_path {src/filename_match.cxx}
+          filename_and_path {src/core/filename_match.cxx}
         }
         file_ref {filename_setext.cxx} {
           uuid_Xcode4_BuildFile {B68A8072-65B1-4E62-8618-393D6277AB38}
           uuid_Xcode4_FileRef {003AA96B-483E-4BCF-BB09-CF9C7585B088}
           uuid_Xcode4_BuildFileInSources {53ADEE51-9229-4C76-A145-4FAE4A79CA21}
-          filename_and_path {src/filename_setext.cxx}
+          filename_and_path {src/core/filename_setext.cxx}
         }
         file_ref {fl_arc.cxx} {
           uuid_Xcode4_BuildFile {F2D72D4B-3CD3-424B-BCBE-E6ED0B1ADE19}
           uuid_Xcode4_FileRef {876B6A63-7D11-413F-926D-F400FC3119DD}
           uuid_Xcode4_BuildFileInSources {CF3BDDBE-929B-42C9-B756-D8C9B4C8A1D2}
-          filename_and_path {src/fl_arc.cxx}
+          filename_and_path {src/core/fl_arc.cxx}
         }
         file_ref {fl_arci.cxx} {
           uuid_Xcode4_BuildFile {201C7772-F8EA-46A9-8675-1DC75946FF84}
           uuid_Xcode4_FileRef {E52CB16D-9900-4D70-ACBA-7698063934AA}
           uuid_Xcode4_BuildFileInSources {3C758F19-115F-4754-92FA-29F331A7A741}
-          filename_and_path {src/fl_arci.cxx}
+          filename_and_path {src/core/fl_arci.cxx}
         }
         file_ref {fl_ask.cxx} {
           uuid_Xcode4_BuildFile {7888A1B7-3CC5-44AD-B3AB-20E7A8B7289F}
           uuid_Xcode4_FileRef {60E7DD73-D034-4D69-BA46-619166E2E30F}
           uuid_Xcode4_BuildFileInSources {F10B0DD6-7998-48AA-AE32-78A6D8879B1C}
-          filename_and_path {src/fl_ask.cxx}
+          filename_and_path {src/core/fl_ask.cxx}
         }
         file_ref {fl_boxtype.cxx} {
           uuid_Xcode4_BuildFile {FFD22E0B-E0EC-485B-8838-5DF7DC9649AC}
           uuid_Xcode4_FileRef {BC14596F-6410-40F3-96F5-930B8CE39DAF}
           uuid_Xcode4_BuildFileInSources {7CD1A504-D74F-4F06-AAA0-B99DFB39DF46}
-          filename_and_path {src/fl_boxtype.cxx}
+          filename_and_path {src/core/fl_boxtype.cxx}
         }
         file_ref {fl_call_main.cxx} {
           uuid_Xcode4_BuildFile {E0BFCC98-3264-4E4F-A465-DAD81F5A9450}
           uuid_Xcode4_FileRef {8B35EF2F-2920-4F0F-A82D-D8472B46BDD7}
           uuid_Xcode4_BuildFileInSources {36978A2B-1507-4071-9AD5-7F9BDA3F8D90}
-          filename_and_path {src/fl_call_main.cxx}
+          filename_and_path {src/core/fl_call_main.cxx}
         }
         file_ref {fl_color.cxx} {
           uuid_Xcode4_BuildFile {27FB3CD2-EF50-4CE1-A940-76EE40C14C3D}
           uuid_Xcode4_FileRef {02716487-AA34-406A-9C95-983284DE5A34}
           uuid_Xcode4_BuildFileInSources {E5A3C248-605C-4BC2-BA7A-9BF5550D91DA}
-          filename_and_path {src/fl_color.cxx}
+          filename_and_path {src/core/fl_color.cxx}
         }
         file_ref {fl_cursor.cxx} {
           uuid_Xcode4_BuildFile {191125BA-A890-4754-AB59-D8FB26F9328A}
           uuid_Xcode4_FileRef {C832D220-A5C0-4938-8129-C2CB8FBAFED8}
           uuid_Xcode4_BuildFileInSources {79967B56-B64B-423D-B3EA-8097A7A830CF}
-          filename_and_path {src/fl_cursor.cxx}
+          filename_and_path {src/core/fl_cursor.cxx}
         }
         file_ref {fl_curve.cxx} {
           uuid_Xcode4_BuildFile {56EADAE0-20B2-430D-B01C-FA223EA97E3A}
           uuid_Xcode4_FileRef {53EC964E-94FC-461A-A2EF-7CA3BF80B206}
           uuid_Xcode4_BuildFileInSources {B2341118-0C6D-4D9E-876D-4B5EC32E75A1}
-          filename_and_path {src/fl_curve.cxx}
+          filename_and_path {src/core/fl_curve.cxx}
         }
         file_ref {fl_diamond_box.cxx} {
           uuid_Xcode4_BuildFile {E40B19F0-5E9F-4EC7-9899-F4528B9AA70D}
           uuid_Xcode4_FileRef {5557266E-5E95-4208-AE3A-EA3B72D5DF09}
           uuid_Xcode4_BuildFileInSources {2BF48610-D394-48FD-8CF6-4319B5C7950E}
-          filename_and_path {src/fl_diamond_box.cxx}
+          filename_and_path {src/core/fl_diamond_box.cxx}
         }
         file_ref {fl_dnd.cxx} {
           uuid_Xcode4_BuildFile {298EDA4F-8AF0-4A92-AFC1-9408CFCD5712}
           uuid_Xcode4_FileRef {D1E006BE-6D34-4468-9F0D-9085A8E51304}
           uuid_Xcode4_BuildFileInSources {207AE6E5-9923-44E6-84D3-5AEC30896F39}
-          filename_and_path {src/fl_dnd.cxx}
+          filename_and_path {src/core/fl_dnd.cxx}
         }
         file_ref {fl_draw.cxx} {
           uuid_Xcode4_BuildFile {4F438445-50DE-4B76-BBFF-BC46EBBFA664}
           uuid_Xcode4_FileRef {3CF0F8B5-7C8D-4462-B572-4A122D6549B0}
           uuid_Xcode4_BuildFileInSources {363F858B-A81F-4AFF-A530-A54242350184}
-          filename_and_path {src/fl_draw.cxx}
+          filename_and_path {src/core/fl_draw.cxx}
         }
         file_ref {fl_draw_image.cxx} {
           uuid_Xcode4_BuildFile {4665DB5F-068D-4310-B2C0-AE689AA85929}
           uuid_Xcode4_FileRef {F608DA64-EF05-49A3-ABAC-C7C9E7494BEA}
           uuid_Xcode4_BuildFileInSources {F546A37A-4D5E-4409-9163-28738A3E4227}
-          filename_and_path {src/fl_draw_image.cxx}
+          filename_and_path {src/core/fl_draw_image.cxx}
         }
         file_ref {fl_draw_pixmap.cxx} {
           uuid_Xcode4_BuildFile {E4923B73-9025-450C-BB43-97FC0850A83A}
           uuid_Xcode4_FileRef {B6E2BA6C-59E0-4F18-AD7D-164F016C0FF0}
           uuid_Xcode4_BuildFileInSources {30E10499-75E4-4180-8EB1-884A87A5DD43}
-          filename_and_path {src/fl_draw_pixmap.cxx}
+          filename_and_path {src/core/fl_draw_pixmap.cxx}
         }
         file_ref {fl_encoding_latin1.cxx} {
           uuid_Xcode4_BuildFile {B00A9E35-5560-4825-904B-EF57CD4C0A92}
           uuid_Xcode4_FileRef {0BEBF5A7-7773-43BE-91CC-B0DFBB6BDA08}
           uuid_Xcode4_BuildFileInSources {DE48D544-6329-4439-8CA5-E1D3FDA1F6E0}
-          filename_and_path {src/fl_encoding_latin1.cxx}
+          filename_and_path {src/core/fl_encoding_latin1.cxx}
         }
         file_ref {fl_encoding_mac_roman.cxx} {
           uuid_Xcode4_BuildFile {8555518A-BE8E-4BFA-B667-6551E92013A8}
           uuid_Xcode4_FileRef {C2BF9CDF-E31E-4895-A45D-5AAF3768C51B}
           uuid_Xcode4_BuildFileInSources {ABB49E92-5D1D-47B4-8863-06E5EBD8142A}
-          filename_and_path {src/fl_encoding_mac_roman.cxx}
+          filename_and_path {src/core/fl_encoding_mac_roman.cxx}
         }
         file_ref {fl_engraved_label.cxx} {
           uuid_Xcode4_BuildFile {52DA813A-9A95-4890-A38D-19B026277F95}
           uuid_Xcode4_FileRef {0522E1C2-0E5A-4C29-A956-E8CD45EF1B4D}
           uuid_Xcode4_BuildFileInSources {15FDFD86-96C6-4012-A0D0-F022C221FBAC}
-          filename_and_path {src/fl_engraved_label.cxx}
+          filename_and_path {src/core/fl_engraved_label.cxx}
         }
         file_ref {fl_file_dir.cxx} {
           uuid_Xcode4_BuildFile {8F52E66B-DE06-408C-9FA4-1444637F7B80}
           uuid_Xcode4_FileRef {1BF9BBF4-D53A-424A-8C0A-D3B0D92797FF}
           uuid_Xcode4_BuildFileInSources {EB81F388-5E43-4527-9396-969A7D312740}
-          filename_and_path {src/fl_file_dir.cxx}
+          filename_and_path {src/core/fl_file_dir.cxx}
         }
         file_ref {fl_font.cxx} {
           uuid_Xcode4_BuildFile {DAECD573-97D2-4295-8321-13B8F8BC23A6}
           uuid_Xcode4_FileRef {1CFFB72A-F54F-4002-AE50-C1BCF9F0C89C}
           uuid_Xcode4_BuildFileInSources {C9F44B46-D3FF-4EA3-9D30-1E9AB89600F8}
-          filename_and_path {src/fl_font.cxx}
+          filename_and_path {src/core/fl_font.cxx}
         }
         file_ref {fl_gtk.cxx} {
           uuid_Xcode4_BuildFile {1FB7855F-AB31-4B42-AA73-93B07D746272}
           uuid_Xcode4_FileRef {E3303C9A-F31B-4B23-8AC3-863A5C000D0C}
           uuid_Xcode4_BuildFileInSources {EFCDA004-6B05-439D-AD1D-A8747F6CF4B9}
-          filename_and_path {src/fl_gtk.cxx}
+          filename_and_path {src/core/fl_gtk.cxx}
         }
         file_ref {fl_labeltype.cxx} {
           uuid_Xcode4_BuildFile {A91665C1-0010-43EE-8A86-9EC869983557}
           uuid_Xcode4_FileRef {95F43A2D-21DE-4899-9F5B-1DB341E90C3A}
           uuid_Xcode4_BuildFileInSources {4598BB77-92AB-4548-B34E-78B261C56140}
-          filename_and_path {src/fl_labeltype.cxx}
+          filename_and_path {src/core/fl_labeltype.cxx}
         }
         file_ref {fl_line_style.cxx} {
           uuid_Xcode4_BuildFile {70D1EF40-CEE3-4460-9437-445EF6570006}
           uuid_Xcode4_FileRef {5FD374C4-6C63-497E-9F2B-1B396390EEE5}
           uuid_Xcode4_BuildFileInSources {A59E78B8-0AD1-490B-ABBF-87C212D49294}
-          filename_and_path {src/fl_line_style.cxx}
+          filename_and_path {src/core/fl_line_style.cxx}
         }
         file_ref {fl_open_uri.cxx} {
           uuid_Xcode4_BuildFile {AE238B51-38F4-4F2E-BC0B-78F3746B987F}
           uuid_Xcode4_FileRef {5515C9CC-3DEB-4ED1-8B65-42966A9B7E06}
           uuid_Xcode4_BuildFileInSources {BE74DB33-04BD-4EEC-A847-755EB62B76EB}
-          filename_and_path {src/fl_open_uri.cxx}
+          filename_and_path {src/core/fl_open_uri.cxx}
         }
         file_ref {fl_oval_box.cxx} {
           uuid_Xcode4_BuildFile {5C5315ED-224F-4077-A54A-D916A09FD43D}
           uuid_Xcode4_FileRef {554EB894-1B49-46DC-9B44-004AF565327A}
           uuid_Xcode4_BuildFileInSources {61BF99BB-9B5E-4A8F-B47A-362BE0170B8A}
-          filename_and_path {src/fl_oval_box.cxx}
+          filename_and_path {src/core/fl_oval_box.cxx}
         }
         file_ref {fl_overlay.cxx} {
           uuid_Xcode4_BuildFile {13DECC0A-91E0-4B09-9A65-7565C4E4DE00}
           uuid_Xcode4_FileRef {5536CF51-0B6B-499F-9C91-C2E4898D00BA}
           uuid_Xcode4_BuildFileInSources {C4F171DD-B2C3-45AB-B493-13C66A684B76}
-          filename_and_path {src/fl_overlay.cxx}
+          filename_and_path {src/core/fl_overlay.cxx}
         }
         file_ref {fl_overlay_visual.cxx} {
           uuid_Xcode4_BuildFile {B447BDF4-E847-4FC6-A720-0CDF4002BA4E}
           uuid_Xcode4_FileRef {3132F016-7D43-43BE-B074-445C9F20DB50}
           uuid_Xcode4_BuildFileInSources {305944C7-0273-41CA-B68D-4B8634805326}
-          filename_and_path {src/fl_overlay_visual.cxx}
+          filename_and_path {src/core/fl_overlay_visual.cxx}
         }
         file_ref {fl_plastic.cxx} {
           uuid_Xcode4_BuildFile {E84D52FD-DECE-4423-8099-1101A9B16E65}
           uuid_Xcode4_FileRef {D9934C34-B4C6-45E9-9D8D-302562D201D1}
           uuid_Xcode4_BuildFileInSources {40F29FD8-75BE-4958-9975-880694258FAB}
-          filename_and_path {src/fl_plastic.cxx}
+          filename_and_path {src/core/fl_plastic.cxx}
         }
         file_ref {fl_read_image.cxx} {
           uuid_Xcode4_BuildFile {89292870-50B2-4B4C-9C47-BDD54D8F9A95}
           uuid_Xcode4_FileRef {1FA85C80-2951-4144-A92D-E37E598C9B19}
           uuid_Xcode4_BuildFileInSources {C91AB9AC-9EA0-4F8B-982E-2C9D52A00338}
-          filename_and_path {src/fl_read_image.cxx}
+          filename_and_path {src/core/fl_read_image.cxx}
         }
         file_ref {fl_rect.cxx} {
           uuid_Xcode4_BuildFile {7DFE2DA4-C5ED-4447-8F6A-3F7D514DEDA3}
           uuid_Xcode4_FileRef {82F1E1FC-8B3C-460B-A309-ABE348A6FD1B}
           uuid_Xcode4_BuildFileInSources {39238B46-6210-41AC-B7DC-4153DA9EE223}
-          filename_and_path {src/fl_rect.cxx}
+          filename_and_path {src/core/fl_rect.cxx}
         }
         file_ref {fl_round_box.cxx} {
           uuid_Xcode4_BuildFile {54AED6D6-19AA-4960-A913-C1DDE3A04981}
           uuid_Xcode4_FileRef {C791DFA1-9A90-4016-B393-FF1205CA92D3}
           uuid_Xcode4_BuildFileInSources {FE83B31E-A46A-4A32-A89D-E1A6D243B8C2}
-          filename_and_path {src/fl_round_box.cxx}
+          filename_and_path {src/core/fl_round_box.cxx}
         }
         file_ref {fl_rounded_box.cxx} {
           uuid_Xcode4_BuildFile {07653622-17B7-423E-8440-FA89462F116C}
           uuid_Xcode4_FileRef {557E8041-0084-4B1C-9D36-CF44F1C0F5BE}
           uuid_Xcode4_BuildFileInSources {AD0B8E3D-D68A-481D-8F9F-69BAC55B967F}
-          filename_and_path {src/fl_rounded_box.cxx}
+          filename_and_path {src/core/fl_rounded_box.cxx}
         }
         file_ref {fl_scroll_area.cxx} {
           uuid_Xcode4_BuildFile {62206CE3-C4B8-41A3-B0B2-E87558EF8359}
           uuid_Xcode4_FileRef {0E08EA1C-BD91-44D4-A0EA-0D4243805A2C}
           uuid_Xcode4_BuildFileInSources {FCAEAB49-901B-4E09-A421-B91C2138610D}
-          filename_and_path {src/fl_scroll_area.cxx}
+          filename_and_path {src/core/fl_scroll_area.cxx}
         }
         file_ref {fl_set_font.cxx} {
           uuid_Xcode4_BuildFile {A21C7DBB-77B4-4145-94D3-C8F4E0F7A704}
           uuid_Xcode4_FileRef {C7ED2C14-A368-4077-A484-B5C6DDCAC057}
           uuid_Xcode4_BuildFileInSources {2952645A-BFB2-4D1A-AA4B-9C938ADA48F9}
-          filename_and_path {src/fl_set_font.cxx}
+          filename_and_path {src/core/fl_set_font.cxx}
         }
         file_ref {fl_set_fonts.cxx} {
           uuid_Xcode4_BuildFile {2D99B7D6-2146-4F22-B7C4-7CF6B353B3B6}
           uuid_Xcode4_FileRef {22603052-0721-416C-9BC9-9117FA96A7E6}
           uuid_Xcode4_BuildFileInSources {83BEAD36-5B66-40D1-BDE6-01CAD030A36B}
-          filename_and_path {src/fl_set_fonts.cxx}
+          filename_and_path {src/core/fl_set_fonts.cxx}
         }
         file_ref {fl_shadow_box.cxx} {
           uuid_Xcode4_BuildFile {5F09A8BB-4F72-4A29-9D89-1B3686738A5F}
           uuid_Xcode4_FileRef {2C5EEC89-51E9-41FB-8530-FBF66EEA73B1}
           uuid_Xcode4_BuildFileInSources {03E51C61-09BD-4D5D-8C34-E11561CDE5EB}
-          filename_and_path {src/fl_shadow_box.cxx}
+          filename_and_path {src/core/fl_shadow_box.cxx}
         }
         file_ref {fl_shortcut.cxx} {
           uuid_Xcode4_BuildFile {6DC429A2-4E0F-46F0-9928-C972C13F3A79}
           uuid_Xcode4_FileRef {BFCE21B1-56B8-4D68-B7AE-BFB8E2D65029}
           uuid_Xcode4_BuildFileInSources {1915B2B4-3576-473D-8C68-044EC53616C9}
-          filename_and_path {src/fl_shortcut.cxx}
+          filename_and_path {src/core/fl_shortcut.cxx}
         }
         file_ref {fl_show_colormap.cxx} {
           uuid_Xcode4_BuildFile {09571C9D-E0F2-44E1-B3BB-BEA58AF6DB6E}
           uuid_Xcode4_FileRef {76D6638A-FCA0-47DD-97AC-02F20B149360}
           uuid_Xcode4_BuildFileInSources {CA982582-BAB9-4F43-AE95-97787D7118DA}
-          filename_and_path {src/fl_show_colormap.cxx}
+          filename_and_path {src/core/fl_show_colormap.cxx}
         }
         file_ref {fl_symbols.cxx} {
           uuid_Xcode4_BuildFile {E5E13729-9359-407A-ADAE-8CA9BF1153A4}
           uuid_Xcode4_FileRef {ECAFDF98-A4C6-47A4-AAC5-CBBAA9E2B887}
           uuid_Xcode4_BuildFileInSources {3F497BC1-2E55-4693-A590-93B1AB680203}
-          filename_and_path {src/fl_symbols.cxx}
+          filename_and_path {src/core/fl_symbols.cxx}
         }
         file_ref {fl_utf8.cxx} {
           uuid_Xcode4_BuildFile {1D28C444-CF47-48A3-B7BD-AC7FC031BF60}
           uuid_Xcode4_FileRef {C82D09C9-A25C-4969-AA75-C1844388A904}
           uuid_Xcode4_BuildFileInSources {E05DB01E-3C7C-4D10-B25A-24C5B0A9984E}
-          filename_and_path {src/fl_utf8.cxx}
+          filename_and_path {src/core/fl_utf8.cxx}
         }
         file_ref {fl_utf.cxx} {
           uuid_Xcode4_BuildFile {AB04400B-9F1A-4F37-888C-89372FDCF7F7}
           uuid_Xcode4_FileRef {574878A1-4FD8-42FA-9BD2-ABE5009BD0DE}
           uuid_Xcode4_BuildFileInSources {DBA6ED75-939E-4F8A-B1F2-9A110D95B619}
-          filename_and_path {src/fl_utf.cxx}
+          filename_and_path {src/core/fl_utf.cxx}
         }
         file_ref {fl_vertex.cxx} {
           uuid_Xcode4_BuildFile {62CA9151-24C4-427F-8D7C-E667CB1A6005}
           uuid_Xcode4_FileRef {6C74D84D-D2D9-473C-B4EF-A2916D41A606}
           uuid_Xcode4_BuildFileInSources {0DA67340-5E06-45F0-98AB-1EF4FFEF7D18}
-          filename_and_path {src/fl_vertex.cxx}
+          filename_and_path {src/core/fl_vertex.cxx}
         }
         file_ref {numericsort.cxx} {
           uuid_Xcode4_BuildFile {BDD37F5E-669D-45D0-AEA7-84934BD116C6}
           uuid_Xcode4_FileRef {2286DB22-6117-4F0A-BEE5-E39D655B21BB}
           uuid_Xcode4_BuildFileInSources {F9A99DC4-A8F3-48B7-B098-CACFF2242B0F}
-          filename_and_path {src/numericsort.cxx}
+          filename_and_path {src/core/numericsort.cxx}
         }
         file_ref {ps_image.cxx} {
           uuid_Xcode4_BuildFile {3FCA9BA2-08F4-4493-AAC5-1C5BA6C19BF9}
           uuid_Xcode4_FileRef {472AB397-43B4-4F36-8D30-46796562F422}
           uuid_Xcode4_BuildFileInSources {7B5F222A-9CA7-4A2B-BB10-915A4853951A}
-          filename_and_path {src/ps_image.cxx}
+          filename_and_path {src/core/ps_image.cxx}
         }
         file_ref {scandir.cxx} {
           uuid_Xcode4_BuildFile {91F32552-6EBD-41A3-A404-C13499D47D1B}
           uuid_Xcode4_FileRef {1E2B1DAE-2CA8-4E24-9D70-7648A5F0E604}
           uuid_Xcode4_BuildFileInSources {611144BE-9E25-4734-BEB0-17AA14E629C2}
-          filename_and_path {src/scandir.cxx}
+          filename_and_path {src/core/scandir.cxx}
         }
         file_ref {screen_xywh.cxx} {
           uuid_Xcode4_BuildFile {898DCC19-92C6-4CAD-8F97-795C17BF0F8E}
           uuid_Xcode4_FileRef {4302C79C-040D-4155-9A83-7B77750879E4}
           uuid_Xcode4_BuildFileInSources {ED67E26F-DB1F-48D1-A1D9-9717C2196D3A}
-          filename_and_path {src/screen_xywh.cxx}
+          filename_and_path {src/core/screen_xywh.cxx}
         }
         file_ref {flstring.c} {
           uuid_Xcode4_BuildFile {1B622B06-3765-4E90-BE13-155DFCBAB791}
           uuid_Xcode4_FileRef {EF672C7C-6AF9-43D0-8320-CBAED55C8145}
           uuid_Xcode4_BuildFileInSources {F4C279B7-3932-4279-8131-B75DFA0C11E5}
-          filename_and_path {src/flstring.c}
+          filename_and_path {src/core/flstring.c}
         }
         file_ref {vsnprintf.c} {
           uuid_Xcode4_BuildFile {22C4313D-D9D6-41BD-BA8B-E3CE07600FE1}
           uuid_Xcode4_FileRef {4024031C-0F34-4A2D-A3F2-9D9373805457}
           uuid_Xcode4_BuildFileInSources {2A8804F6-AFE8-4FED-BF50-8CAEF1B22A54}
-          filename_and_path {src/vsnprintf.c}
+          filename_and_path {src/core/vsnprintf.c}
         }
         file_ref {case.c} {
           uuid_Xcode4_BuildFile {F9589A9E-897C-4D01-9853-40C736FE4C03}
           uuid_Xcode4_FileRef {6A8D0240-7AD5-4648-B663-8D1B5B0D8F30}
           uuid_Xcode4_BuildFileInSources {C8A52709-D6A3-46B6-8BC2-631AC161BB93}
-          filename_and_path {src/xutf8/case.c}
+          filename_and_path {src/core/xutf8/case.c}
         }
         file_ref {is_right2left.c} {
           uuid_Xcode4_BuildFile {5D197D19-28FF-4FA8-B83B-F0796D18D7C7}
           uuid_Xcode4_FileRef {15064F3F-0F6F-4A59-8531-9E361125C187}
           uuid_Xcode4_BuildFileInSources {8DB42169-E703-4087-8E7D-743F1AAADA6D}
-          filename_and_path {src/xutf8/is_right2left.c}
+          filename_and_path {src/core/xutf8/is_right2left.c}
         }
         file_ref {is_spacing.c} {
           uuid_Xcode4_BuildFile {33D01DE7-EC28-45C9-AC26-AB81F6F7E056}
           uuid_Xcode4_FileRef {35196210-B2C0-48F9-88B8-7DB816C06ED2}
           uuid_Xcode4_BuildFileInSources {2FAB16B4-529A-454C-8FDD-480347534445}
-          filename_and_path {src/xutf8/is_spacing.c}
+          filename_and_path {src/core/xutf8/is_spacing.c}
         }
         file_ref {keysym2Ucs.c} {
           uuid_Xcode4_BuildFileInSources {5947D812-BC7F-4400-9267-2ED8879F5C8C}
           uuid_Xcode4_FileRef {6FB3D799-D5E6-4B46-B0D8-241B52F0EF44}
           build_env 3
           list_env 0
-          filename_and_path {src/xutf8/keysym2Ucs.c}
+          filename_and_path {src/core/xutf8/keysym2Ucs.c}
         }
         file_ref {utf8Input.c} {
           uuid_Xcode4_BuildFileInSources {25B5DE2D-97EE-4E32-9CA8-05174FB0DB2F}
           uuid_Xcode4_FileRef {77C2578B-D9D9-4526-BB2D-01C1C3C80034}
           build_env 3
           list_env 0
-          filename_and_path {src/xutf8/utf8Input.c}
+          filename_and_path {src/core/xutf8/utf8Input.c}
         }
         file_ref {utf8Utils.c} {
           uuid_Xcode4_BuildFileInSources {24005306-9985-4AC5-BE6D-6D7500E3217E}
           uuid_Xcode4_FileRef {737A139C-1672-4BB4-8105-7BBD5750BA73}
           build_env 3
           list_env 0
-          filename_and_path {src/xutf8/utf8Utils.c}
+          filename_and_path {src/core/xutf8/utf8Utils.c}
         }
         file_ref {utf8Wrap.c} {
           uuid_Xcode4_BuildFileInSources {C7B16874-D0F9-451B-82FE-5CDE5ED6E374}
           uuid_Xcode4_FileRef {46AA9D55-FF6A-42F9-9D65-167B6C61CD4A}
           build_env 3
           list_env 0
-          filename_and_path {src/xutf8/utf8Wrap.c}
+          filename_and_path {src/core/xutf8/utf8Wrap.c}
         }
       }
       folder Libraries {open
@@ -2467,7 +2468,7 @@
         }
       }
     }
-    lib_target fltk_gl {
+    lib_target fltk3gl {
       uuid_Xcode4_FluidBuildRule {C15C877E-5712-4AB2-B7BE-7B8A5F1D6F49}
       uuid_Xcode4_ProductFileReference {47405B55-C42D-4839-B6BF-F6B5BA410AF3}
       uuid_Xcode4_FrameworksBuildPhase {A02CA389-C019-4CB2-82B7-1CC18C255A72}
@@ -2490,57 +2491,57 @@
         file_ref {Fl_Gl_Choice.cxx} {
           uuid_Xcode4_BuildFileInSources {E1C77AA3-F9A7-4CE9-8892-06DA277C3538}
           uuid_Xcode4_FileRef {DE5C107D-166F-42F2-9042-0A08FBEF3B60}
-          filename_and_path {src/Fl_Gl_Choice.cxx}
+          filename_and_path {src/core/Fl_Gl_Choice.cxx}
         }
         file_ref {Fl_Gl_Device_Plugin.cxx} {
           uuid_Xcode4_BuildFileInSources {E8D5789A-7A69-45A6-9900-2123CBE99BDE}
           uuid_Xcode4_FileRef {391E3B0B-3499-46A4-B0FC-8BA7EC865531}
-          filename_and_path {src/Fl_Gl_Device_Plugin.cxx}
+          filename_and_path {src/core/Fl_Gl_Device_Plugin.cxx}
         }
         file_ref {Fl_Gl_Overlay.cxx} {
           uuid_Xcode4_BuildFileInSources {070BED62-ED38-45D1-BDFE-569E9EBED411}
           uuid_Xcode4_FileRef {07BC5E29-F3DD-4EF8-A362-BEB97204BFDA}
-          filename_and_path {src/Fl_Gl_Overlay.cxx}
+          filename_and_path {src/core/Fl_Gl_Overlay.cxx}
         }
         file_ref {Fl_Gl_Window.cxx} {
           uuid_Xcode4_BuildFileInSources {32BC3E68-841A-4283-B00D-A5EB305FD0AA}
           uuid_Xcode4_FileRef {53DC629E-53C3-498E-91AD-57A275B5DB21}
-          filename_and_path {src/Fl_Gl_Window.cxx}
+          filename_and_path {src/core/Fl_Gl_Window.cxx}
         }
         file_ref {freeglut_geometry.cxx} {
           uuid_Xcode4_BuildFileInSources {ECB8D856-36CB-46A6-91F6-208478C0CBF3}
           uuid_Xcode4_FileRef {FFAAC078-4DCA-4EEE-926B-22E2398B7046}
-          filename_and_path {src/freeglut_geometry.cxx}
+          filename_and_path {src/core/freeglut_geometry.cxx}
         }
         file_ref {freeglut_stroke_mono_roman.cxx} {
           uuid_Xcode4_BuildFileInSources {75788B42-B62E-4C4F-9E61-4B91C7324344}
           uuid_Xcode4_FileRef {504FF704-8B78-42E2-BB35-33253373D40F}
-          filename_and_path {src/freeglut_stroke_mono_roman.cxx}
+          filename_and_path {src/core/freeglut_stroke_mono_roman.cxx}
         }
         file_ref {freeglut_stroke_roman.cxx} {
           uuid_Xcode4_BuildFileInSources {9CDFF782-50BD-4118-B043-8B22A9B2F2CC}
           uuid_Xcode4_FileRef {B2D08460-836E-4E9C-A77B-DBD6C1A1A460}
-          filename_and_path {src/freeglut_stroke_roman.cxx}
+          filename_and_path {src/core/freeglut_stroke_roman.cxx}
         }
         file_ref {freeglut_teapot.cxx} {
           uuid_Xcode4_BuildFileInSources {CE3D60CB-29C8-424A-91AA-1742E2155791}
           uuid_Xcode4_FileRef {9F61A674-BE2D-4567-9B0F-B0A7A83F337A}
-          filename_and_path {src/freeglut_teapot.cxx}
+          filename_and_path {src/core/freeglut_teapot.cxx}
         }
         file_ref {gl_draw.cxx} {
           uuid_Xcode4_BuildFileInSources {008A289F-3FCA-4E5D-9F9D-A6601947D877}
           uuid_Xcode4_FileRef {CBE8D5E4-01A5-438B-B144-4FFA652AE41A}
-          filename_and_path {src/gl_draw.cxx}
+          filename_and_path {src/core/gl_draw.cxx}
         }
         file_ref {glut_compatability.cxx} {
           uuid_Xcode4_BuildFileInSources {4432E2FF-063E-407F-B040-F7168FACEC8A}
           uuid_Xcode4_FileRef {7458D589-B1BE-4EFD-8D40-E5B8F83EDDDE}
-          filename_and_path {src/glut_compatability.cxx}
+          filename_and_path {src/core/glut_compatability.cxx}
         }
         file_ref {glut_font.cxx} {
           uuid_Xcode4_BuildFileInSources {52743D1F-C453-4A9C-B7FF-24D5110D8886}
           uuid_Xcode4_FileRef {8A51D2BA-6224-4A81-A7C0-1FF09F60F380}
-          filename_and_path {src/glut_font.cxx}
+          filename_and_path {src/core/glut_font.cxx}
         }
       }
       folder Libraries {open
@@ -2586,7 +2587,7 @@
       folder Dependencies {open
         uuid_Xcode4_Group {5AD936C1-6A47-4960-8FF6-30D89A6A3DA1}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {A63A2DF4-FCDA-49A6-8E07-491575DAF8AC}
           uuid_Xcode4_BuildFileInCopyFiles {3A7B0801-6B7F-4688-BC98-DD30E2829536}
           uuid_Xcode4_ContainerItemProxy {A8E79403-D7ED-4D85-92DE-AB2236A0903A}
@@ -2595,7 +2596,7 @@
         }
       }
     }
-    lib_target fltk_images {
+    lib_target fltk3images {
       uuid_Xcode4_FluidBuildRule {3B6D1711-B7F7-4646-9550-CCC0D38666DB}
       uuid_Xcode4_ProductFileReference {BF7522F0-DF30-4FBE-B61F-D44FB67C2110}
       uuid_Xcode4_FrameworksBuildPhase {E922EF9B-6694-4CD8-9E64-646407893DE6}
@@ -2618,62 +2619,62 @@
         file_ref {Fl_BMP_Image.cxx} {
           uuid_Xcode4_BuildFileInSources {E6582F0C-0750-4240-82F3-E8318102A2E1}
           uuid_Xcode4_FileRef {BEBF4248-3EAD-4A52-AAA4-E820B7383470}
-          filename_and_path {src/Fl_BMP_Image.cxx}
+          filename_and_path {src/core/Fl_BMP_Image.cxx}
         }
         file_ref {Fl_File_Icon2.cxx} {
           uuid_Xcode4_BuildFileInSources {4527A184-6B41-4768-86C4-ACF47AB984FD}
           uuid_Xcode4_FileRef {7655FB1C-DE8D-4283-BC6F-56486E0C6765}
-          filename_and_path {src/Fl_File_Icon2.cxx}
+          filename_and_path {src/core/Fl_File_Icon2.cxx}
         }
         file_ref {Fl_GIF_Image.cxx} {
           uuid_Xcode4_BuildFileInSources {61475B35-29FB-4C24-8830-ECA24AD4D896}
           uuid_Xcode4_FileRef {CFAC1FAE-3A10-47AA-AFCF-D8465E2BC5E9}
-          filename_and_path {src/Fl_GIF_Image.cxx}
+          filename_and_path {src/core/Fl_GIF_Image.cxx}
         }
         file_ref {Fl_Help_Dialog.cxx} {
           uuid_Xcode4_BuildFileInSources {D0C37235-7804-45A7-899C-281EC063120A}
           uuid_Xcode4_FileRef {0EDA91FF-EE99-4E85-8C47-3C2A2CD72D46}
-          filename_and_path {src/Fl_Help_Dialog.cxx}
+          filename_and_path {src/core/Fl_Help_Dialog.cxx}
         }
         file_ref {Fl_JPEG_Image.cxx} {
           uuid_Xcode4_BuildFileInSources {633E5465-917A-472C-A60F-0F991EB5A771}
           uuid_Xcode4_FileRef {771C095F-B545-47EB-A972-E68EACA213AB}
-          filename_and_path {src/Fl_JPEG_Image.cxx}
+          filename_and_path {src/core/Fl_JPEG_Image.cxx}
         }
         file_ref {Fl_PNG_Image.cxx} {
           uuid_Xcode4_BuildFileInSources {6C957398-2885-42CA-94E3-6A7DE9ADFFDD}
           uuid_Xcode4_FileRef {E1BECD1D-5322-476A-97C7-1A355469A00E}
-          filename_and_path {src/Fl_PNG_Image.cxx}
+          filename_and_path {src/core/Fl_PNG_Image.cxx}
         }
         file_ref {Fl_PNM_Image.cxx} {
           uuid_Xcode4_BuildFileInSources {E8B17358-E01C-468D-BA98-FD841B2BD4D5}
           uuid_Xcode4_FileRef {948DEE29-B0C3-4360-8B48-E166578DD9C0}
-          filename_and_path {src/Fl_PNM_Image.cxx}
+          filename_and_path {src/core/Fl_PNM_Image.cxx}
         }
         file_ref {fl_images_core.cxx} {
           uuid_Xcode4_BuildFileInSources {C99E8BD8-E953-4FF3-8C5D-3186E07EE04C}
           uuid_Xcode4_FileRef {6ADD9C72-9A09-406D-A836-86A180529588}
-          filename_and_path {src/fl_images_core.cxx}
+          filename_and_path {src/core/fl_images_core.cxx}
         }
       }
       folder Dependencies {open
         uuid_Xcode4_Group {5C231979-6ADE-4A65-9BA7-0688B9D02387}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {8A255408-4E71-485E-B62A-CC1D77F2346E}
           uuid_Xcode4_BuildFileInCopyFiles {8B041A15-060E-4ED8-BB33-F147C4EB7662}
           uuid_Xcode4_ContainerItemProxy {6B50C690-8555-4F18-86CC-49B249AFF4A1}
           uuid_Xcode4_TargetDependency {0ED253BE-A025-449A-B0CE-98970A1A8119}
           build_env 91
         }
-        target_dependency fltk_png {
+        target_dependency fltk3png {
           uuid_Xcode4_BuildFileInFrameworks {5F01A68D-D52A-4AC6-AA14-4F0CEF71F730}
           uuid_Xcode4_BuildFileInCopyFiles {1F90ED55-BDB0-413C-9A63-FD8E24D69794}
           uuid_Xcode4_ContainerItemProxy {B08169D8-AD1B-4FE0-8708-8176EB6EE7B3}
           uuid_Xcode4_TargetDependency {BCCDA5FF-EE55-4F37-83CF-ECE0A4EA0315}
           build_env 91
         }
-        target_dependency fltk_jpeg {
+        target_dependency fltk3jpeg {
           uuid_Xcode4_BuildFileInFrameworks {788FE6BC-FC49-4F30-8C02-E66DF4069E08}
           uuid_Xcode4_BuildFileInCopyFiles {496D6E42-F3B3-4972-914E-84B3A6BEDA0E}
           uuid_Xcode4_ContainerItemProxy {B17A1C57-1070-4AB8-88C1-EAAE31224532}
@@ -2682,7 +2683,7 @@
         }
       }
     }
-    lib_target fltk_png {
+    lib_target fltk3png {
       uuid_Xcode4_FluidBuildRule {B468177C-52F4-4139-A3FF-67AB6002BC34}
       uuid_Xcode4_ProductFileReference {06A7B68E-69DF-48DF-9752-4CC40872987D}
       uuid_Xcode4_FrameworksBuildPhase {E6A799B5-B767-4119-BAAE-E6ABAED46318}
@@ -2706,90 +2707,90 @@
         file_ref {png.c} {
           uuid_Xcode4_BuildFileInSources {6F20F990-BFF6-476E-B9AA-D6671402AB51}
           uuid_Xcode4_FileRef {6B712BE1-E979-4100-8238-C53FCD95C26F}
-          filename_and_path {png/png.c}
+          filename_and_path {src/png/png.c}
         }
         file_ref {pngerror.c} {
           uuid_Xcode4_BuildFileInSources {363FC5CA-BA18-4E0B-B08C-F86B0697DAE9}
           uuid_Xcode4_FileRef {1773D73E-7040-449F-B17A-BCFC32576CC2}
-          filename_and_path {png/pngerror.c}
+          filename_and_path {src/png/pngerror.c}
         }
         file_ref {pngget.c} {
           uuid_Xcode4_BuildFileInSources {23E0C5B5-DCB0-4137-815C-0698047B64AC}
           uuid_Xcode4_FileRef {DD39B9F3-BB4C-4DE7-A35D-F41A47525FC8}
-          filename_and_path {png/pngget.c}
+          filename_and_path {src/png/pngget.c}
         }
         file_ref {pngmem.c} {
           uuid_Xcode4_BuildFileInSources {EDC7DC5B-824C-45E6-AB5D-DE9D566E0BE9}
           uuid_Xcode4_FileRef {459F31DC-C130-4D9D-8BA6-C6CC18A2B274}
-          filename_and_path {png/pngmem.c}
+          filename_and_path {src/png/pngmem.c}
         }
         file_ref {pngpread.c} {
           uuid_Xcode4_BuildFileInSources {664352FA-C06C-4E8D-9359-AAEDA6B4B206}
           uuid_Xcode4_FileRef {D922ACBB-42C1-452F-AD39-4FBD38BC9C23}
-          filename_and_path {png/pngpread.c}
+          filename_and_path {src/png/pngpread.c}
         }
         file_ref {pngread.c} {
           uuid_Xcode4_BuildFileInSources {B4A3041F-EB8B-4F62-81F1-A6016FA0E727}
           uuid_Xcode4_FileRef {3466ECAF-94B6-41A6-848B-B4532D8756C9}
-          filename_and_path {png/pngread.c}
+          filename_and_path {src/png/pngread.c}
         }
         file_ref {pngrio.c} {
           uuid_Xcode4_BuildFileInSources {90B706F8-BBB5-4900-B96B-FE84E1638DEE}
           uuid_Xcode4_FileRef {F74E2081-855B-4410-9107-C6E7C8A7003A}
-          filename_and_path {png/pngrio.c}
+          filename_and_path {src/png/pngrio.c}
         }
         file_ref {pngrtran.c} {
           uuid_Xcode4_BuildFileInSources {845E26FE-38F8-4129-A28C-97B9BA2A60D5}
           uuid_Xcode4_FileRef {7122D728-C3EA-4218-80ED-6A9281EBEBD3}
-          filename_and_path {png/pngrtran.c}
+          filename_and_path {src/png/pngrtran.c}
         }
         file_ref {pngrutil.c} {
           uuid_Xcode4_BuildFileInSources {82E970ED-E1C1-4E60-9153-3DAB83C5EDD4}
           uuid_Xcode4_FileRef {5BEF2DB3-6546-4924-BC2D-7BFF5D5303E3}
-          filename_and_path {png/pngrutil.c}
+          filename_and_path {src/png/pngrutil.c}
         }
         file_ref {pngset.c} {
           uuid_Xcode4_BuildFileInSources {101F19A2-1FB6-4BFF-A71D-C938325B85A4}
           uuid_Xcode4_FileRef {C3B834FF-C05F-4928-8148-3204AE193B67}
-          filename_and_path {png/pngset.c}
+          filename_and_path {src/png/pngset.c}
         }
         file_ref {pngtrans.c} {
           uuid_Xcode4_BuildFileInSources {73845E7C-AA74-4D9A-8366-9D3F7CF10E30}
           uuid_Xcode4_FileRef {3CCB7520-77B6-440D-AA4E-0501F95165BE}
-          filename_and_path {png/pngtrans.c}
+          filename_and_path {src/png/pngtrans.c}
         }
         file_ref {pngwio.c} {
           uuid_Xcode4_BuildFileInSources {3D43AAF9-6CB6-4FFB-90C2-209E84575E33}
           uuid_Xcode4_FileRef {D83965A3-1DB2-45BE-BAAE-168FE9E870E2}
-          filename_and_path {png/pngwio.c}
+          filename_and_path {src/png/pngwio.c}
         }
         file_ref {pngwrite.c} {
           uuid_Xcode4_BuildFileInSources {D3013979-5BC3-4F49-A2C2-C64DBCD983A2}
           uuid_Xcode4_FileRef {5BAD5EB2-AE72-48E8-9401-BF28E5FD588C}
-          filename_and_path {png/pngwrite.c}
+          filename_and_path {src/png/pngwrite.c}
         }
         file_ref {pngwtran.c} {
           uuid_Xcode4_BuildFileInSources {78D6D247-E96A-4FD4-9277-0753C0BA95EF}
           uuid_Xcode4_FileRef {589B114A-FD66-440D-AA9E-402011FF760C}
-          filename_and_path {png/pngwtran.c}
+          filename_and_path {src/png/pngwtran.c}
         }
         file_ref {pngwutil.c} {
           uuid_Xcode4_BuildFileInSources {CBA0A339-F833-4456-B957-D426AD95F7F4}
           uuid_Xcode4_FileRef {BB2B54C5-D832-4C2A-9C56-3E9C9CCC8159}
-          filename_and_path {png/pngwutil.c}
+          filename_and_path {src/png/pngwutil.c}
         }
       }
       folder Dependencies {open
         uuid_Xcode4_Group {A97D3E94-724B-4CAA-8AB2-247AD83A5B2D}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {6D845CB7-854A-4800-9AD9-2B53655ABEAF}
           uuid_Xcode4_BuildFileInCopyFiles {487334DA-41CD-4EDA-B24E-D9C633C85812}
           uuid_Xcode4_ContainerItemProxy {EDC7DB92-9194-40C0-ABB4-5D02D8DAC985}
           uuid_Xcode4_TargetDependency {705F04BB-AA4A-4845-AC82-61E2709BCB42}
           build_env 91
         }
-        target_dependency fltk_zlib {
+        target_dependency fltk3zlib {
           uuid_Xcode4_BuildFileInFrameworks {AB672F58-66FD-476C-BA59-994248B463F8}
           uuid_Xcode4_BuildFileInCopyFiles {2DA17766-AF46-4EB8-BF0C-B958F80158A2}
           uuid_Xcode4_ContainerItemProxy {E9425A34-644F-4D08-86E8-0C6577B981FD}
@@ -2798,7 +2799,7 @@
         }
       }
     }
-    lib_target fltk_jpeg {
+    lib_target fltk3jpeg {
       uuid_Xcode4_FluidBuildRule {657AA958-2632-4A29-B657-91775A869EBC}
       uuid_Xcode4_ProductFileReference {C03975F6-58DD-41B5-9A0D-D73961888340}
       uuid_Xcode4_FrameworksBuildPhase {65CF0CCA-3098-403B-A9B6-70000827BCE8}
@@ -2822,238 +2823,238 @@
         file_ref {jaricom.c} {
           uuid_Xcode4_BuildFileInSources {0F6F13CB-23C0-485E-A717-983187573244}
           uuid_Xcode4_FileRef {693F4237-F486-4BBA-8EE8-FE38FC7D08F6}
-          filename_and_path {jpeg/jaricom.c}
+          filename_and_path {src/jpeg/jaricom.c}
         }
         file_ref {jcarith.c} {
           uuid_Xcode4_BuildFileInSources {0BC9CDFC-57BC-4F2C-BE30-3049D67F6017}
           uuid_Xcode4_FileRef {72ABFB26-4F71-4747-9B79-07A337C77C2F}
-          filename_and_path {jpeg/jcarith.c}
+          filename_and_path {src/jpeg/jcarith.c}
         }
         file_ref {jdarith.c} {
           uuid_Xcode4_BuildFileInSources {85476745-C36A-475D-B24A-C1BA4303F50A}
           uuid_Xcode4_FileRef {2964F2B7-8BC3-4E65-A540-99D51C03AA24}
-          filename_and_path {jpeg/jdarith.c}
+          filename_and_path {src/jpeg/jdarith.c}
         }
         file_ref {jcapimin.c} {
           uuid_Xcode4_BuildFileInSources {8D7AFAF6-F148-4667-9E48-80CD935CEDF5}
           uuid_Xcode4_FileRef {FB6E486A-C35D-420C-BA96-4DA3009EC010}
-          filename_and_path {jpeg/jcapimin.c}
+          filename_and_path {src/jpeg/jcapimin.c}
         }
         file_ref {jcapistd.c} {
           uuid_Xcode4_BuildFileInSources {3F4CCF20-ADBD-4E57-9307-0203943BDBD6}
           uuid_Xcode4_FileRef {057D4054-6B02-481C-808D-A547346FB68A}
-          filename_and_path {jpeg/jcapistd.c}
+          filename_and_path {src/jpeg/jcapistd.c}
         }
         file_ref {jccoefct.c} {
           uuid_Xcode4_BuildFileInSources {93CA99FA-167D-4F3C-A5F3-BA10C9B637EC}
           uuid_Xcode4_FileRef {CEAC28BB-B960-4CD7-9E9A-86FAD3EF102B}
-          filename_and_path {jpeg/jccoefct.c}
+          filename_and_path {src/jpeg/jccoefct.c}
         }
         file_ref {jccolor.c} {
           uuid_Xcode4_BuildFileInSources {E2CDC5EE-79CE-444D-AC8C-CF1EA8630221}
           uuid_Xcode4_FileRef {809AF344-3D79-4677-86FD-169321F2A86B}
-          filename_and_path {jpeg/jccolor.c}
+          filename_and_path {src/jpeg/jccolor.c}
         }
         file_ref {jcdctmgr.c} {
           uuid_Xcode4_BuildFileInSources {42A29A32-6094-45EB-8769-A9C1E2A57975}
           uuid_Xcode4_FileRef {1590B3B2-B4B8-4B64-A031-7B7647042C2C}
-          filename_and_path {jpeg/jcdctmgr.c}
+          filename_and_path {src/jpeg/jcdctmgr.c}
         }
         file_ref {jchuff.c} {
           uuid_Xcode4_BuildFileInSources {04A60174-19A4-4581-A8B8-6CBD65E22170}
           uuid_Xcode4_FileRef {2E971DDC-9491-4309-98D9-AACC1070E85B}
-          filename_and_path {jpeg/jchuff.c}
+          filename_and_path {src/jpeg/jchuff.c}
         }
         file_ref {jcinit.c} {
           uuid_Xcode4_BuildFileInSources {D265819F-15A5-42D7-8C32-8988DA8A43B3}
           uuid_Xcode4_FileRef {814BE969-AF77-4C0D-82F5-A28DCE617107}
-          filename_and_path {jpeg/jcinit.c}
+          filename_and_path {src/jpeg/jcinit.c}
         }
         file_ref {jcmainct.c} {
           uuid_Xcode4_BuildFileInSources {B51ED764-5063-4038-83F3-414EE50637AB}
           uuid_Xcode4_FileRef {AD0A0161-F77D-419A-BFC0-0BC6989ACA4A}
-          filename_and_path {jpeg/jcmainct.c}
+          filename_and_path {src/jpeg/jcmainct.c}
         }
         file_ref {jcmarker.c} {
           uuid_Xcode4_BuildFileInSources {03D0D430-8CCA-424D-9994-3C03CD192005}
           uuid_Xcode4_FileRef {D2164F03-0054-481B-9F15-B6DD6A57771C}
-          filename_and_path {jpeg/jcmarker.c}
+          filename_and_path {src/jpeg/jcmarker.c}
         }
         file_ref {jcmaster.c} {
           uuid_Xcode4_BuildFileInSources {63F3DCA1-8817-40E4-8A17-C27E2E9B4D7E}
           uuid_Xcode4_FileRef {61763219-DF34-46C3-B577-F26763612615}
-          filename_and_path {jpeg/jcmaster.c}
+          filename_and_path {src/jpeg/jcmaster.c}
         }
         file_ref {jcomapi.c} {
           uuid_Xcode4_BuildFileInSources {D7A12A5C-3217-49A3-9412-3F8FFDDD2664}
           uuid_Xcode4_FileRef {232A27C0-8509-4D05-AA89-2BD6B5288634}
-          filename_and_path {jpeg/jcomapi.c}
+          filename_and_path {src/jpeg/jcomapi.c}
         }
         file_ref {jcparam.c} {
           uuid_Xcode4_BuildFileInSources {E4F0CE8C-9CDF-4D1B-805F-380ED645DB8B}
           uuid_Xcode4_FileRef {40C23607-AE76-40B3-838D-C980B2BFE20C}
-          filename_and_path {jpeg/jcparam.c}
+          filename_and_path {src/jpeg/jcparam.c}
         }
         file_ref {jcprepct.c} {
           uuid_Xcode4_BuildFileInSources {0EE2DF13-8D02-4452-937F-466FE950E28E}
           uuid_Xcode4_FileRef {AB617BED-6B47-4FB5-A508-1863A003B94C}
-          filename_and_path {jpeg/jcprepct.c}
+          filename_and_path {src/jpeg/jcprepct.c}
         }
         file_ref {jcsample.c} {
           uuid_Xcode4_BuildFileInSources {09D0B434-E419-45D3-A318-3CF98F43BC80}
           uuid_Xcode4_FileRef {3F3D0C31-0855-4C21-B52C-5BCAFAD53A3B}
-          filename_and_path {jpeg/jcsample.c}
+          filename_and_path {src/jpeg/jcsample.c}
         }
         file_ref {jctrans.c} {
           uuid_Xcode4_BuildFileInSources {A3FBF089-F8D8-4B45-A01A-327B9DD5EE6B}
           uuid_Xcode4_FileRef {7FAFE821-F649-416D-8E37-8EC977BBC5D7}
-          filename_and_path {jpeg/jctrans.c}
+          filename_and_path {src/jpeg/jctrans.c}
         }
         file_ref {jdapimin.c} {
           uuid_Xcode4_BuildFileInSources {E4FCFB26-46D1-447A-9B40-684C9545A0BC}
           uuid_Xcode4_FileRef {41E7F99E-8C2A-4F0B-94A6-487E53DA2B74}
-          filename_and_path {jpeg/jdapimin.c}
+          filename_and_path {src/jpeg/jdapimin.c}
         }
         file_ref {jdapistd.c} {
           uuid_Xcode4_BuildFileInSources {92CBD856-0957-4B06-AFB7-061A10591DCF}
           uuid_Xcode4_FileRef {099D5F00-89A2-4F31-85B7-582F8B06D1D3}
-          filename_and_path {jpeg/jdapistd.c}
+          filename_and_path {src/jpeg/jdapistd.c}
         }
         file_ref {jdatadst.c} {
           uuid_Xcode4_BuildFileInSources {C260A3F6-DA21-498C-902C-127B7AA68F43}
           uuid_Xcode4_FileRef {28554BF1-A500-40A9-9C0D-C0753E806ABE}
-          filename_and_path {jpeg/jdatadst.c}
+          filename_and_path {src/jpeg/jdatadst.c}
         }
         file_ref {jdatasrc.c} {
           uuid_Xcode4_BuildFileInSources {82657390-F3AD-4BE9-88F4-26F8052C9E59}
           uuid_Xcode4_FileRef {4F409781-D1EB-438D-A944-CA0223760086}
-          filename_and_path {jpeg/jdatasrc.c}
+          filename_and_path {src/jpeg/jdatasrc.c}
         }
         file_ref {jdcoefct.c} {
           uuid_Xcode4_BuildFileInSources {47E18E5D-F338-476E-BB7E-92E197AD0F88}
           uuid_Xcode4_FileRef {91142696-4C7D-4CFD-8E03-8903782180FE}
-          filename_and_path {jpeg/jdcoefct.c}
+          filename_and_path {src/jpeg/jdcoefct.c}
         }
         file_ref {jdcolor.c} {
           uuid_Xcode4_BuildFileInSources {FC035B23-6018-4CC1-B6D8-62F11C8C35A7}
           uuid_Xcode4_FileRef {2852C165-F430-489C-855C-FD1C8E9CFA4E}
-          filename_and_path {jpeg/jdcolor.c}
+          filename_and_path {src/jpeg/jdcolor.c}
         }
         file_ref {jddctmgr.c} {
           uuid_Xcode4_BuildFileInSources {6D525695-01BB-4BC7-9504-0E7E6DA74C9C}
           uuid_Xcode4_FileRef {E18222C3-29F7-4230-8753-8E719974FC76}
-          filename_and_path {jpeg/jddctmgr.c}
+          filename_and_path {src/jpeg/jddctmgr.c}
         }
         file_ref {jdhuff.c} {
           uuid_Xcode4_BuildFileInSources {C8159B6A-5C15-4DDF-9065-DB026603F6F2}
           uuid_Xcode4_FileRef {1BF6EF84-B0E4-422D-83B6-DE17AAC7EFB6}
-          filename_and_path {jpeg/jdhuff.c}
+          filename_and_path {src/jpeg/jdhuff.c}
         }
         file_ref {jdinput.c} {
           uuid_Xcode4_BuildFileInSources {9C82F5C6-CC2B-403F-9CDE-B0E8369D567D}
           uuid_Xcode4_FileRef {1C5349FA-F5F6-4E32-AC0B-E1804B1F198C}
-          filename_and_path {jpeg/jdinput.c}
+          filename_and_path {src/jpeg/jdinput.c}
         }
         file_ref {jdmainct.c} {
           uuid_Xcode4_BuildFileInSources {3BE49E90-0599-473C-9234-030B67F86301}
           uuid_Xcode4_FileRef {EEF41328-C9A7-4B03-B31F-D5300498FFF5}
-          filename_and_path {jpeg/jdmainct.c}
+          filename_and_path {src/jpeg/jdmainct.c}
         }
         file_ref {jdmarker.c} {
           uuid_Xcode4_BuildFileInSources {D118BF0A-EED4-4F7D-BA96-B7594BAAA41E}
           uuid_Xcode4_FileRef {636096E6-1DFC-47DB-B620-ED855E766C1C}
-          filename_and_path {jpeg/jdmarker.c}
+          filename_and_path {src/jpeg/jdmarker.c}
         }
         file_ref {jdmaster.c} {
           uuid_Xcode4_BuildFileInSources {AA5963F8-FE1E-4F91-9299-1EEFCF06A4B9}
           uuid_Xcode4_FileRef {25201ED4-CE64-4E14-B3A3-EBA7A50DDF00}
-          filename_and_path {jpeg/jdmaster.c}
+          filename_and_path {src/jpeg/jdmaster.c}
         }
         file_ref {jdmerge.c} {
           uuid_Xcode4_BuildFileInSources {4F69BAC2-C629-40B8-B1D6-5D778B026DF8}
           uuid_Xcode4_FileRef {EFDC5B8F-7BD2-413A-9829-A20F85BBDD2F}
-          filename_and_path {jpeg/jdmerge.c}
+          filename_and_path {src/jpeg/jdmerge.c}
         }
         file_ref {jdpostct.c} {
           uuid_Xcode4_BuildFileInSources {4E084D25-47EC-44E1-8DFE-2A532694836B}
           uuid_Xcode4_FileRef {8AB6F92D-B6E2-4692-BA0E-6B8B3A9600D7}
-          filename_and_path {jpeg/jdpostct.c}
+          filename_and_path {src/jpeg/jdpostct.c}
         }
         file_ref {jdsample.c} {
           uuid_Xcode4_BuildFileInSources {050810E5-F79A-4601-B411-5AFC3093695B}
           uuid_Xcode4_FileRef {84504867-4116-4864-8C1B-9FB5D88C56BE}
-          filename_and_path {jpeg/jdsample.c}
+          filename_and_path {src/jpeg/jdsample.c}
         }
         file_ref {jdtrans.c} {
           uuid_Xcode4_BuildFileInSources {349BA997-C403-4E94-8049-B2E1B0125A5E}
           uuid_Xcode4_FileRef {93CA9E6D-728E-4933-8BF5-356F97BF6F78}
-          filename_and_path {jpeg/jdtrans.c}
+          filename_and_path {src/jpeg/jdtrans.c}
         }
         file_ref {jerror.c} {
           uuid_Xcode4_BuildFileInSources {83B2EC91-3B70-4DA4-8A87-D3C1E60A5FF0}
           uuid_Xcode4_FileRef {A3250EC2-46FD-4400-8B6E-43793D1E74D7}
-          filename_and_path {jpeg/jerror.c}
+          filename_and_path {src/jpeg/jerror.c}
         }
         file_ref {jfdctflt.c} {
           uuid_Xcode4_BuildFileInSources {E62D919A-A84F-4060-9731-E4CABC41F507}
           uuid_Xcode4_FileRef {36A2AB09-889D-4B97-A429-846ACAA94B18}
-          filename_and_path {jpeg/jfdctflt.c}
+          filename_and_path {src/jpeg/jfdctflt.c}
         }
         file_ref {jfdctfst.c} {
           uuid_Xcode4_BuildFileInSources {2ED27EA1-EB53-4523-99B9-CF287496D451}
           uuid_Xcode4_FileRef {30991F7C-8274-4A61-93B1-6B497C8A5EDC}
-          filename_and_path {jpeg/jfdctfst.c}
+          filename_and_path {src/jpeg/jfdctfst.c}
         }
         file_ref {jfdctint.c} {
           uuid_Xcode4_BuildFileInSources {0E6874E5-E419-4706-877C-5963D87E69C7}
           uuid_Xcode4_FileRef {8E3EEE62-F9B3-4A63-97E6-572243D9FDB2}
-          filename_and_path {jpeg/jfdctint.c}
+          filename_and_path {src/jpeg/jfdctint.c}
         }
         file_ref {jidctflt.c} {
           uuid_Xcode4_BuildFileInSources {0DFBF0B0-84F0-40A5-987C-8F8F11D2229E}
           uuid_Xcode4_FileRef {855E6E12-3B27-434A-AFD1-33E0AA064E9E}
-          filename_and_path {jpeg/jidctflt.c}
+          filename_and_path {src/jpeg/jidctflt.c}
         }
         file_ref {jidctfst.c} {
           uuid_Xcode4_BuildFileInSources {262CC4F8-4991-4B80-BC81-F0E8EAD42B40}
           uuid_Xcode4_FileRef {653EB01C-242E-44BD-8223-02DCFCAFCED8}
-          filename_and_path {jpeg/jidctfst.c}
+          filename_and_path {src/jpeg/jidctfst.c}
         }
         file_ref {jidctint.c} {
           uuid_Xcode4_BuildFileInSources {61B2EEBC-B3BB-4263-8E53-54C26CDBEA1B}
           uuid_Xcode4_FileRef {20F81663-325A-4C56-8872-20064248D47D}
-          filename_and_path {jpeg/jidctint.c}
+          filename_and_path {src/jpeg/jidctint.c}
         }
         file_ref {jmemmgr.c} {
           uuid_Xcode4_BuildFileInSources {3746F41F-9750-40F8-992E-E9110A8AB0B3}
           uuid_Xcode4_FileRef {A45DD33A-E77B-4756-8907-4E40501255FA}
-          filename_and_path {jpeg/jmemmgr.c}
+          filename_and_path {src/jpeg/jmemmgr.c}
         }
         file_ref {jmemnobs.c} {
           uuid_Xcode4_BuildFileInSources {1E7CB584-91D0-4135-93A3-B0B2BC5080A3}
           uuid_Xcode4_FileRef {40575E02-FFEC-4B96-9C7D-6B018C90D9D3}
-          filename_and_path {jpeg/jmemnobs.c}
+          filename_and_path {src/jpeg/jmemnobs.c}
         }
         file_ref {jquant1.c} {
           uuid_Xcode4_BuildFileInSources {70DDC391-A770-43E5-80AE-8F2D0A16669C}
           uuid_Xcode4_FileRef {35F258BF-08E3-44B6-9AB9-58BFAEBF105B}
-          filename_and_path {jpeg/jquant1.c}
+          filename_and_path {src/jpeg/jquant1.c}
         }
         file_ref {jquant2.c} {
           uuid_Xcode4_BuildFileInSources {0E9496FF-69CC-4ED0-8F19-2F5A98EE6F32}
           uuid_Xcode4_FileRef {FD5C5068-2930-4FB3-B183-20DD81E4C790}
-          filename_and_path {jpeg/jquant2.c}
+          filename_and_path {src/jpeg/jquant2.c}
         }
         file_ref {jutils.c} {
           uuid_Xcode4_BuildFileInSources {EA4FF7A8-6037-4B5D-8AA2-C7D0AE7EA10A}
           uuid_Xcode4_FileRef {8EAEBE33-4B20-413B-992A-3DB7499DF618}
-          filename_and_path {jpeg/jutils.c}
+          filename_and_path {src/jpeg/jutils.c}
         }
       }
       folder Dependencies {open
         uuid_Xcode4_Group {29DA55EE-F482-49B9-A1C9-98AC7554132B}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {F856DD57-FD89-4FBA-81A4-15FBD9E64F8A}
           uuid_Xcode4_BuildFileInCopyFiles {0E7E9400-D367-4993-8390-88825A44719E}
           uuid_Xcode4_ContainerItemProxy {7BFBB398-8097-4804-A67A-7014D8FEBA3B}
@@ -3062,7 +3063,7 @@
         }
       }
     }
-    lib_target fltk_zlib {
+    lib_target fltk3zlib {
       uuid_Xcode4_FluidBuildRule {123C1072-0C58-4F44-AD82-E57DC97E4F36}
       uuid_Xcode4_ProductFileReference {AFDEBB8C-A6BB-4318-814D-9D4B6586BF8B}
       uuid_Xcode4_FrameworksBuildPhase {DEBCC581-E57F-4C21-8DA4-57A0CC89BBE4}
@@ -3086,83 +3087,83 @@
         file_ref {adler32.c} {
           uuid_Xcode4_BuildFileInSources {A6B3D69F-5F98-4164-B21F-CDBE3994B136}
           uuid_Xcode4_FileRef {E1182D55-8C81-436A-85A9-E2FF90B66495}
-          filename_and_path {zlib/adler32.c}
+          filename_and_path {src/zlib/adler32.c}
         }
         file_ref {compress.c} {
           uuid_Xcode4_BuildFileInSources {18140AB5-6E0C-40FE-9923-027E6C5BF838}
           uuid_Xcode4_FileRef {B451652D-5BE6-4662-8DDA-E876452DBAEF}
-          filename_and_path {zlib/compress.c}
+          filename_and_path {src/zlib/compress.c}
         }
         file_ref {crc32.c} {
           uuid_Xcode4_BuildFileInSources {8A1863E7-13F1-4633-B16F-90F4CBE46510}
           uuid_Xcode4_FileRef {FAF20BD4-44E8-4EF3-BC2F-27E6DCF94A4D}
-          filename_and_path {zlib/crc32.c}
+          filename_and_path {src/zlib/crc32.c}
         }
         file_ref {deflate.c} {
           uuid_Xcode4_BuildFileInSources {03BD549E-8BF4-4DBD-9CB5-9791FDFAFBF2}
           uuid_Xcode4_FileRef {DD77A2FB-0EA6-47D8-90B0-DC70B9156631}
-          filename_and_path {zlib/deflate.c}
+          filename_and_path {src/zlib/deflate.c}
         }
         file_ref {gzclose.c} {
           uuid_Xcode4_BuildFileInSources {43A69EC0-6029-433F-9BE4-52B2CBB68D7C}
           uuid_Xcode4_FileRef {F6A9CA02-FD88-4190-887C-A572801064B6}
-          filename_and_path {zlib/gzclose.c}
+          filename_and_path {src/zlib/gzclose.c}
         }
         file_ref {gzlib.c} {
           uuid_Xcode4_BuildFileInSources {D6265271-B9BA-4FB3-9CB7-33D4AB411E8D}
           uuid_Xcode4_FileRef {A0E49410-B08E-4FF7-9B72-859F478221CC}
-          filename_and_path {zlib/gzlib.c}
+          filename_and_path {src/zlib/gzlib.c}
         }
         file_ref {gzread.c} {
           uuid_Xcode4_BuildFileInSources {BE13FAC5-F083-43D5-93F9-7DEC01DBCBD7}
           uuid_Xcode4_FileRef {17E81DB4-8628-4E36-BFF9-50B2F8B0919D}
-          filename_and_path {zlib/gzread.c}
+          filename_and_path {src/zlib/gzread.c}
         }
         file_ref {gzwrite.c} {
           uuid_Xcode4_BuildFileInSources {D2A47073-B350-440D-BC69-C0138779EC61}
           uuid_Xcode4_FileRef {80D41C84-6225-4050-A3E5-FF529C567637}
-          filename_and_path {zlib/gzwrite.c}
+          filename_and_path {src/zlib/gzwrite.c}
         }
         file_ref {infback.c} {
           uuid_Xcode4_BuildFileInSources {BF7645D6-B1E0-4E9F-82F3-29B88B164125}
           uuid_Xcode4_FileRef {E1A389C8-8BBA-474D-B413-906B25478BDF}
-          filename_and_path {zlib/infback.c}
+          filename_and_path {src/zlib/infback.c}
         }
         file_ref {inffast.c} {
           uuid_Xcode4_BuildFileInSources {B1A53430-A594-41B2-8090-12E6E6EA3267}
           uuid_Xcode4_FileRef {5070B522-9990-4D27-BA5E-58D46F4733D8}
-          filename_and_path {zlib/inffast.c}
+          filename_and_path {src/zlib/inffast.c}
         }
         file_ref {inflate.c} {
           uuid_Xcode4_BuildFileInSources {504287ED-12E0-4372-9C42-C3DF474E89AF}
           uuid_Xcode4_FileRef {6E9D6A15-B44F-4FB7-B629-62CA272DD84A}
-          filename_and_path {zlib/inflate.c}
+          filename_and_path {src/zlib/inflate.c}
         }
         file_ref {inftrees.c} {
           uuid_Xcode4_BuildFileInSources {58F571A0-F678-44A1-94F5-B9902450B459}
           uuid_Xcode4_FileRef {0A153D59-57C7-4602-9AA8-E88C7C91C273}
-          filename_and_path {zlib/inftrees.c}
+          filename_and_path {src/zlib/inftrees.c}
         }
         file_ref {trees.c} {
           uuid_Xcode4_BuildFileInSources {99617D65-49D3-45B3-BA5F-6ED4A61BF18B}
           uuid_Xcode4_FileRef {AE96BB30-45F3-4F9A-A5CF-869BAD219C3D}
-          filename_and_path {zlib/trees.c}
+          filename_and_path {src/zlib/trees.c}
         }
         file_ref {uncompr.c} {
           uuid_Xcode4_BuildFileInSources {26B75986-2376-4B1A-81C4-61203E974AEF}
           uuid_Xcode4_FileRef {D3758527-5F4F-4D42-84D4-DD55D3455099}
-          filename_and_path {zlib/uncompr.c}
+          filename_and_path {src/zlib/uncompr.c}
         }
         file_ref {zutil.c} {
           uuid_Xcode4_BuildFileInSources {267DA6FD-110F-4E38-82D3-E4A01985C8C0}
           uuid_Xcode4_FileRef {58A29655-7720-41B6-87EF-234B66936598}
-          filename_and_path {zlib/zutil.c}
+          filename_and_path {src/zlib/zutil.c}
         }
       }
       folder Dependencies {open
         uuid_Xcode4_Group {C2FA673B-BFDC-4D21-A2B7-3248083B81F0}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {6E43C73F-7148-45DC-B2A4-667D2F5AE901}
           uuid_Xcode4_BuildFileInCopyFiles {2EC24DA9-FD73-42C8-8413-1ED28BF57B2B}
           uuid_Xcode4_ContainerItemProxy {8C9700E2-E6FB-4603-8811-5142A89F69EA}
@@ -3205,7 +3206,7 @@
       folder Dependencies {
         uuid_Xcode4_Group {07C5E7CF-8C74-4EE9-A2D5-81B7DB721D90}
       } {
-        target_dependency fltk {
+        target_dependency fltk3 {
           uuid_Xcode4_BuildFileInFrameworks {03702EFE-F96C-44C2-B844-A8116323CC4F}
           uuid_Xcode4_BuildFileInCopyFiles {63E14856-3AD1-4439-A8ED-7C38F1D08583}
           uuid_Xcode4_ContainerItemProxy {804623D9-7CAC-47B1-A359-2AD0C394DA41}
@@ -3652,7 +3653,7 @@
         uuid_Xcode4_FileRef {3D06E7D8-83DA-4C4E-AB15-601198A70787}
         filename_and_path {test/adjuster.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {DB7E12FC-EF17-4F5C-A8CE-A61078C49DF2}
         uuid_Xcode4_BuildFileInCopyFiles {8D6D8BC6-E27A-417F-8145-71D210799F30}
         uuid_Xcode4_ContainerItemProxy {788DC2BA-6B5F-45E4-8DD3-C257E6FC3234}
@@ -3681,7 +3682,7 @@
         uuid_Xcode4_FileRef {CD16450F-2771-4A56-AF8E-8175F36C2AAF}
         filename_and_path {test/arc.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {D4C0211D-E216-44AC-A372-56E1E8A89E6F}
         uuid_Xcode4_BuildFileInCopyFiles {07C5A242-CFE3-4D2F-879E-6372C117B75C}
         uuid_Xcode4_ContainerItemProxy {199D76DA-B9F6-4F2D-B03A-519CCC1E6402}
@@ -3710,7 +3711,7 @@
         uuid_Xcode4_FileRef {1B3AB21E-8A82-4EBA-8495-58C26304A9AF}
         filename_and_path {test/ask.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {D8046FD1-E35D-46B6-9C41-D465D8A33995}
         uuid_Xcode4_BuildFileInCopyFiles {30161DE3-CC1D-4EA0-8B84-C4169742DB98}
         uuid_Xcode4_ContainerItemProxy {1913C58A-843B-45E5-B9C7-C15DAE7D37E1}
@@ -3739,7 +3740,7 @@
         uuid_Xcode4_FileRef {31FFC13C-2711-4E6F-B93F-D9567E03E76B}
         filename_and_path {test/bitmap.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {981D4712-322B-49CC-BDF2-265BFDFBDBE9}
         uuid_Xcode4_BuildFileInCopyFiles {2BB38AB7-BA64-453B-89ED-12C0D6332DDA}
         uuid_Xcode4_ContainerItemProxy {4B9199EF-8AB5-4884-9B5E-D568E8EC0BFD}
@@ -3768,7 +3769,7 @@
         uuid_Xcode4_FileRef {CE316BB5-C691-4202-8843-AE3C8327B31A}
         filename_and_path {test/blocks.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {F2191AFC-C993-40E9-8669-4AC1400FFCC2}
         uuid_Xcode4_BuildFileInCopyFiles {7AA6A418-70C8-414D-8DC3-120B57A68AA0}
         uuid_Xcode4_ContainerItemProxy {1FD69761-084F-4B59-B3D9-477918A5BE6A}
@@ -3817,7 +3818,7 @@
         uuid_Xcode4_FileRef {1619633D-905A-46C3-9353-6D78F79DB30B}
         filename_and_path {test/boxtype.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {08623FCC-6310-46B4-BD24-875D1111212B}
         uuid_Xcode4_BuildFileInCopyFiles {D2CA36EC-3DAE-4955-8B1C-19E8EB76F99B}
         uuid_Xcode4_ContainerItemProxy {3E8480AC-AA1B-493A-88AD-E0C1617360F7}
@@ -3846,7 +3847,7 @@
         uuid_Xcode4_FileRef {39340B79-AC20-44BF-93AE-4691923AF39E}
         filename_and_path {test/browser.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {9D947952-DDF4-455C-B98E-918EDDD3E937}
         uuid_Xcode4_BuildFileInCopyFiles {25565B0C-2F48-46A6-8023-D2FB782801D5}
         uuid_Xcode4_ContainerItemProxy {4718C675-F09A-447A-81AA-53276ECF45FE}
@@ -3875,7 +3876,7 @@
         uuid_Xcode4_FileRef {952B51EC-BF52-4C4C-A137-F7130A9C143C}
         filename_and_path {test/button.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {EBFC481B-3666-45A6-9C9A-67C1656DD464}
         uuid_Xcode4_BuildFileInCopyFiles {4FE097C8-161C-42C3-8994-4A4837A719D5}
         uuid_Xcode4_ContainerItemProxy {6F97AD0A-6373-4D08-93B0-56FE943B00A1}
@@ -3904,7 +3905,7 @@
         uuid_Xcode4_FileRef {93C6C1CA-BC89-49CE-B494-661BE20F2F98}
         filename_and_path {test/buttons.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {6E9C5B65-B294-4C07-A656-E68F8518978C}
         uuid_Xcode4_BuildFileInCopyFiles {C39FF765-4D50-41A3-9720-ABDD46DF3E73}
         uuid_Xcode4_ContainerItemProxy {4DC77E88-D7FF-4D21-BBD1-3FDC3D431D75}
@@ -3933,7 +3934,7 @@
         uuid_Xcode4_FileRef {76028DAC-9955-4470-8664-A620A1304A6F}
         filename_and_path {test/checkers.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {EB8CF813-B67D-4295-B1EB-006B2355DF62}
         uuid_Xcode4_BuildFileInCopyFiles {C802C253-EF9A-44E1-94B5-B6A592B3B98F}
         uuid_Xcode4_ContainerItemProxy {245828A3-77D8-42E6-A854-BBE6B4FED043}
@@ -3962,7 +3963,7 @@
         uuid_Xcode4_FileRef {20A9B7B7-6591-4C2D-A32A-CE2D1B8914B0}
         filename_and_path {test/clock.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {B2B1BE8E-8A2D-41EC-8451-3BD05B86B1AC}
         uuid_Xcode4_BuildFileInCopyFiles {08FEA870-B89D-4061-AC6C-A60F20E3709D}
         uuid_Xcode4_ContainerItemProxy {379B5984-18C4-41B4-AC2C-EBE0E7BA7ED2}
@@ -3996,7 +3997,7 @@
         uuid_Xcode4_BuildFileInCopyFiles {E1C4BA41-C74B-461C-949F-B8B773AF73AF}
         filename_and_path {test/rgb.txt}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {E987CDD8-5F3F-4769-A738-B4EB040F4B70}
         uuid_Xcode4_BuildFileInCopyFiles {077BF726-9D65-41EA-8A1A-6928D1151174}
         uuid_Xcode4_ContainerItemProxy {35F97728-1925-4ECA-B516-3E8BA2077AD5}
@@ -4025,7 +4026,7 @@
         uuid_Xcode4_FileRef {19450A14-1EC2-4633-B33D-146D1D924635}
         filename_and_path {test/color_chooser.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {7AEAECCF-8FA2-4CCC-8BF8-2D008E3EC6FE}
         uuid_Xcode4_BuildFileInCopyFiles {D62493AF-217F-4848-8A81-B2DC78CEEB59}
         uuid_Xcode4_ContainerItemProxy {DBCD6652-EF8E-4F04-9953-5EE4CE5A1A4D}
@@ -4054,13 +4055,13 @@
         uuid_Xcode4_FileRef {D0D09BC4-88E7-40BE-885C-AC8CFE9C1EDC}
         filename_and_path {test/cube.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {A841F6F0-32F5-4FB9-9DDB-36D938FAA169}
         uuid_Xcode4_BuildFileInCopyFiles {94CADAAB-2DF5-42D0-B898-9753EE1FECA2}
         uuid_Xcode4_ContainerItemProxy {15D7E10D-418F-4999-A061-DB27F176CB2B}
         uuid_Xcode4_TargetDependency {F9665FAB-B238-4137-B22C-2DF8C435184A}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {4D537C8D-79AE-4B99-A107-A86A8CE24F81}
         uuid_Xcode4_BuildFileInCopyFiles {FD537552-B85F-49AC-ABFF-EB5A2D1E7989}
         uuid_Xcode4_ContainerItemProxy {B34DDFE5-6D7E-412C-8C52-E0C647EDF118}
@@ -4140,13 +4141,13 @@
         uuid_Xcode4_BuildFileInSources {0D51A139-5624-4C79-9F25-02E808D92465}
         filename_and_path {test/CubeViewUI.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {2C2E53D3-2087-4216-A68C-15DEB1DD62C2}
         uuid_Xcode4_BuildFileInCopyFiles {104782D1-1BDE-46D7-B440-3C7286E0C347}
         uuid_Xcode4_ContainerItemProxy {CE6CDD8B-055F-4D26-A3C7-FCF2F9B5DB65}
         uuid_Xcode4_TargetDependency {085C7907-9CD7-4D54-AF7B-E6FDD8AA99FE}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {571D49E1-49CB-43F4-A92D-09765BD1F7AF}
         uuid_Xcode4_BuildFileInCopyFiles {FF60AB35-2E52-4ECE-9001-87274CFA1D8A}
         uuid_Xcode4_ContainerItemProxy {F1A6F5BC-F960-4567-B865-B9C19E72E4AA}
@@ -4222,7 +4223,7 @@
         uuid_Xcode4_FileRef {E038E2F6-8246-48AA-8CE7-A59643F2CA2D}
         filename_and_path {test/cursor.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {EBE07599-032E-45CF-AF7F-144D6B41E965}
         uuid_Xcode4_BuildFileInCopyFiles {9EBEA0D4-A85F-4F05-98AE-369D7F2F628A}
         uuid_Xcode4_ContainerItemProxy {3CE9F0FA-D396-481D-91FA-FF0D6ACC20B1}
@@ -4251,7 +4252,7 @@
         uuid_Xcode4_FileRef {FE2E2FF8-0822-4842-B4B2-B204AD098B77}
         filename_and_path {test/curve.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {F0E924E6-49F7-4C35-BC7B-9647E5C45A9D}
         uuid_Xcode4_BuildFileInCopyFiles {669EFE55-8F60-4354-9B07-431CB2540F5C}
         uuid_Xcode4_ContainerItemProxy {52BE3004-FC7C-43C2-9301-F60A763FA3E9}
@@ -4280,31 +4281,31 @@
         uuid_Xcode4_FileRef {C6EE0C83-C290-4C40-ADBA-9F9F5E7ADCE2}
         filename_and_path {test/device.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {3A6AA37D-E7E4-4EA5-81A7-4FA034EAD2B5}
         uuid_Xcode4_BuildFileInCopyFiles {F2D47D4B-48B4-42D4-A564-056B894B4A74}
         uuid_Xcode4_ContainerItemProxy {1C38DF89-4C32-40EF-92B7-B42A04614F9D}
         uuid_Xcode4_TargetDependency {B3189DC8-0EF1-4347-83AB-0ADA50B98124}
       }
-      target_dependency fltk_images {
+      target_dependency fltk3images {
         uuid_Xcode4_BuildFileInFrameworks {E9B29690-4BEE-49DD-9B9C-861306BB8899}
         uuid_Xcode4_BuildFileInCopyFiles {B12D0006-E19C-449C-9FFB-5B22CEA00737}
         uuid_Xcode4_ContainerItemProxy {5B6611B6-7CCA-4167-80F3-632AADA9267D}
         uuid_Xcode4_TargetDependency {915B34B2-E11C-483D-9A00-B91FFFC4D449}
       }
-      target_dependency fltk_png {
+      target_dependency fltk3png {
         uuid_Xcode4_BuildFileInFrameworks {A054E478-76AB-4E90-BAAB-DCD0C4D95CFB}
         uuid_Xcode4_BuildFileInCopyFiles {2F65FA77-7427-434F-8872-692340539F42}
         uuid_Xcode4_ContainerItemProxy {5C9607E0-967B-4CA0-82FA-4C62D1C78A8F}
         uuid_Xcode4_TargetDependency {AC449879-2D99-4B91-897A-601F05164947}
       }
-      target_dependency fltk_jpeg {
+      target_dependency fltk3jpeg {
         uuid_Xcode4_BuildFileInFrameworks {E8124816-3AD2-41C6-B489-E10052866775}
         uuid_Xcode4_BuildFileInCopyFiles {A174D004-D8B1-4EA5-AC9C-5573773D0099}
         uuid_Xcode4_ContainerItemProxy {270E68F0-B12F-4C6F-9B63-248F2908B27F}
         uuid_Xcode4_TargetDependency {AD0FFF9D-B2EA-46DB-9D30-144D1B1D7840}
       }
-      target_dependency fltk_zlib {
+      target_dependency fltk3zlib {
         uuid_Xcode4_BuildFileInFrameworks {AFC1A639-E006-46DB-BDAC-37361985CD16}
         uuid_Xcode4_BuildFileInCopyFiles {9832B164-33E8-4643-A5D0-61E2BFA5AFC7}
         uuid_Xcode4_ContainerItemProxy {466DD509-0CB2-463F-AD19-F1F1B7299187}
@@ -4333,7 +4334,7 @@
         uuid_Xcode4_FileRef {059E297C-C753-4710-B99B-63CC7CA5CCE9}
         filename_and_path {test/doublebuffer.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {609A6618-1016-46B0-9FFF-D27C6E71408D}
         uuid_Xcode4_BuildFileInCopyFiles {F6825229-71E0-4911-BD60-AAB19C80D326}
         uuid_Xcode4_ContainerItemProxy {7AB6CF4F-D446-4C57-8D61-1951C243AB05}
@@ -4362,7 +4363,7 @@
         uuid_Xcode4_FileRef {F4669FEA-4960-4059-890C-2EC26D4B0224}
         filename_and_path {test/editor.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {CC700B10-67D3-4C20-8843-97CBA2F00588}
         uuid_Xcode4_BuildFileInCopyFiles {3120A5BF-8036-4FEA-90FD-695121FC497B}
         uuid_Xcode4_ContainerItemProxy {B8128304-DA10-4CB3-AE2F-D088C4A2925D}
@@ -4391,7 +4392,7 @@
         uuid_Xcode4_BuildFileInSources {5DDB5807-0BED-4A52-965A-5BFD5C84521B}
         filename_and_path {test/fast_slow.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {A4439C00-EA6C-477F-802C-1481FC09491A}
         uuid_Xcode4_BuildFileInCopyFiles {F3E3D5C9-209E-43D4-A395-E3358EB19114}
         uuid_Xcode4_ContainerItemProxy {C3871164-75C3-4F6F-A5E8-4EA6F638DDBF}
@@ -4426,31 +4427,31 @@
         uuid_Xcode4_FileRef {AD3FE6EB-D96E-43FB-8360-96D54B935C14}
         filename_and_path {test/file_chooser.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {C744FA2A-7979-48A9-85AC-CC2849FEDCA1}
         uuid_Xcode4_BuildFileInCopyFiles {3E5C5DA5-DAF3-45E9-BBEE-1C038D0F4A71}
         uuid_Xcode4_ContainerItemProxy {CC3DCFB0-B286-4CE9-A700-7AE10849DDFB}
         uuid_Xcode4_TargetDependency {4C6BC702-3AFB-4DD1-995A-3959FCBE165C}
       }
-      target_dependency fltk_images {
+      target_dependency fltk3images {
         uuid_Xcode4_BuildFileInFrameworks {9EBE574D-2374-400E-8F91-8A0C95FF9E90}
         uuid_Xcode4_BuildFileInCopyFiles {76924521-B590-4D27-A9A9-5BE5E11F158E}
         uuid_Xcode4_ContainerItemProxy {1BCC1587-7E3B-46EA-975E-F84EECB3AC66}
         uuid_Xcode4_TargetDependency {41746EC3-4F80-4692-84F3-B0A06E478F37}
       }
-      target_dependency fltk_png {
+      target_dependency fltk3png {
         uuid_Xcode4_BuildFileInFrameworks {DB178FC2-71EF-4CB8-AD04-08BF3B172761}
         uuid_Xcode4_BuildFileInCopyFiles {79734C5A-D16A-47BC-94DC-0F20CA991A2B}
         uuid_Xcode4_ContainerItemProxy {E5F4B6BA-08E0-4AE3-AA60-873A32CEC5CC}
         uuid_Xcode4_TargetDependency {D821DADC-5C77-4273-A680-2E3377EBD866}
       }
-      target_dependency fltk_jpeg {
+      target_dependency fltk3jpeg {
         uuid_Xcode4_BuildFileInFrameworks {A0E3DDF2-7BE9-4F96-8CA0-45D357287385}
         uuid_Xcode4_BuildFileInCopyFiles {633315B3-37AD-40CC-B6C0-B7452F8DBD41}
         uuid_Xcode4_ContainerItemProxy {A97568E1-4350-4BDB-BCC4-0F5247DAABBE}
         uuid_Xcode4_TargetDependency {B4949039-16F3-4845-A6C2-8CEA978B8ACA}
       }
-      target_dependency fltk_zlib {
+      target_dependency fltk3zlib {
         uuid_Xcode4_BuildFileInFrameworks {B44D7292-DD7B-4347-A4F2-5A74B72F7623}
         uuid_Xcode4_BuildFileInCopyFiles {98F2D9CA-CABF-40CC-875D-D41A827CE104}
         uuid_Xcode4_ContainerItemProxy {09D1B4D4-554D-43E1-866D-1F50F2DF757D}
@@ -4479,7 +4480,7 @@
         uuid_Xcode4_FileRef {7C5102D2-9FE2-4321-A31A-5225B0CA3A02}
         filename_and_path {test/fonts.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {06C745CD-7DFA-411C-990C-998668D1DF1F}
         uuid_Xcode4_BuildFileInCopyFiles {62E9FE14-C77B-491F-AEF2-468095C2D0F3}
         uuid_Xcode4_ContainerItemProxy {28E02E63-9230-4F59-A452-FDC328B3C3EC}
@@ -4513,13 +4514,13 @@
         uuid_Xcode4_FileRef {DB32AB5C-80B3-4D73-82D2-E686C8B6B7D8}
         filename_and_path {test/fracviewer.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {6BBBF8A9-6AE9-4076-9F3B-AA3ACD270510}
         uuid_Xcode4_BuildFileInCopyFiles {3FE2ECDD-3F6F-4989-A5FE-440F485B0A34}
         uuid_Xcode4_ContainerItemProxy {E459F3FB-0862-40DF-84FA-6ADB23E3CC84}
         uuid_Xcode4_TargetDependency {FF75163F-DF83-40AC-BEF3-749B48010FBD}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {6E086496-CBFF-46A4-A936-C509CAD971CC}
         uuid_Xcode4_BuildFileInCopyFiles {E2256E49-5D38-4BD6-8100-E662DC798A3C}
         uuid_Xcode4_ContainerItemProxy {0F4A629B-FE52-49FE-8BD9-5809083C69E4}
@@ -4589,13 +4590,13 @@
         uuid_Xcode4_FileRef {E449265F-4022-4CCE-9532-8CC2312A5E37}
         filename_and_path {test/fullscreen.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {0CAE1A87-9431-4AB6-BA89-0A124825EA0D}
         uuid_Xcode4_BuildFileInCopyFiles {E8DF7FBF-0C1C-4833-9059-D9AFEFC680F2}
         uuid_Xcode4_ContainerItemProxy {EBB65343-BFBA-4039-9E15-C832A3C95BCC}
         uuid_Xcode4_TargetDependency {8DB1E91B-6F73-4D53-8D27-019995582833}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {7A186475-8320-4D53-90A6-763AACBA81F4}
         uuid_Xcode4_BuildFileInCopyFiles {D96ADC43-4F3D-409B-A877-830DCA448604}
         uuid_Xcode4_ContainerItemProxy {5DF3FEB7-2C6F-4078-B563-C6758FED60AE}
@@ -4665,13 +4666,13 @@
         uuid_Xcode4_FileRef {8E78BDB9-551E-4F2B-82F4-F200D93F40F2}
         filename_and_path {test/gl_overlay.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {5E48194D-2A8A-4B05-AC2E-85549CFFF761}
         uuid_Xcode4_BuildFileInCopyFiles {8DE1D7D9-842B-44E8-9361-F82A7436ABFE}
         uuid_Xcode4_ContainerItemProxy {0A00B7C4-AAAA-4824-A9FA-43138425DE17}
         uuid_Xcode4_TargetDependency {F25FBAE3-2722-4193-9257-6B25CFC2728D}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {0B16E780-A267-4836-A9DD-FF920CDA4229}
         uuid_Xcode4_BuildFileInCopyFiles {D33D21E8-2BEC-4D3F-B57B-C3894C287280}
         uuid_Xcode4_ContainerItemProxy {5372B4CA-95F5-4A8C-A3D1-2DC822FD0407}
@@ -4741,13 +4742,13 @@
         uuid_Xcode4_FileRef {E05F987F-6F85-4F29-A408-D03E4B697B07}
         filename_and_path {test/glpuzzle.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {EC0F97FD-F032-44F9-BAA8-79A5CCDE94A5}
         uuid_Xcode4_BuildFileInCopyFiles {A8762C2D-C668-467E-A77A-15ED1F7D2A60}
         uuid_Xcode4_ContainerItemProxy {845975FB-977D-41CB-A292-61DA90791884}
         uuid_Xcode4_TargetDependency {660B6F62-9971-487A-B2C3-609517B90235}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {808870F4-C2F9-483B-ADC6-EC3704C8669A}
         uuid_Xcode4_BuildFileInCopyFiles {906A5A3D-8AE5-4773-A091-7F7C40BC8CFD}
         uuid_Xcode4_ContainerItemProxy {77FC120C-006C-4852-8ED0-0B96F3DA7415}
@@ -4817,7 +4818,7 @@
         uuid_Xcode4_FileRef {25C199DD-4BA2-4CA6-AF98-F2F658407004}
         filename_and_path {test/hello.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {BB6E4BCB-3551-446A-B68C-1121D3B23EDB}
         uuid_Xcode4_BuildFileInCopyFiles {8B697C86-89CC-4E78-9E72-C652150875CF}
         uuid_Xcode4_ContainerItemProxy {36A15A12-B9E5-4611-B895-292247CAF517}
@@ -4846,31 +4847,31 @@
         uuid_Xcode4_FileRef {5DF919E9-EAF9-44AF-AA59-C5118620CA78}
         filename_and_path {test/help.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {5EECA66D-C121-493D-BE1E-9863C54A170B}
         uuid_Xcode4_BuildFileInCopyFiles {FF19AABC-EE2C-4302-AD31-D3190DE840C2}
         uuid_Xcode4_ContainerItemProxy {7176BA30-F6F2-462B-9070-3F02BE68DB4C}
         uuid_Xcode4_TargetDependency {D8AC90BC-33E6-4EAD-9178-7783B7FA3434}
       }
-      target_dependency fltk_images {
+      target_dependency fltk3images {
         uuid_Xcode4_BuildFileInFrameworks {55C0D4C7-3676-4D87-B5D4-F7AD2107BC09}
         uuid_Xcode4_BuildFileInCopyFiles {DCE8BFD2-8039-46C5-AE03-1D260582164C}
         uuid_Xcode4_ContainerItemProxy {3554B5F6-5522-48F3-A6CB-7D48FBA6511D}
         uuid_Xcode4_TargetDependency {665E19C8-EE5D-40EB-818B-E930364DFFA9}
       }
-      target_dependency fltk_png {
+      target_dependency fltk3png {
         uuid_Xcode4_BuildFileInFrameworks {BEEEDBE3-B1E2-46FF-BAD8-705115D11004}
         uuid_Xcode4_BuildFileInCopyFiles {2005318C-0C2E-4D24-98D9-B947C82F60AC}
         uuid_Xcode4_ContainerItemProxy {CA5271A0-6AFC-4C7D-95DD-ECC99D4592D8}
         uuid_Xcode4_TargetDependency {B01A5893-3D0A-4667-B9DE-E2AE0F6C1771}
       }
-      target_dependency fltk_jpeg {
+      target_dependency fltk3jpeg {
         uuid_Xcode4_BuildFileInFrameworks {C852AD6B-968F-494F-98DB-5C4D1BB35F0D}
         uuid_Xcode4_BuildFileInCopyFiles {41D37846-F39A-43D8-939D-CF6B2A442DF1}
         uuid_Xcode4_ContainerItemProxy {7AAB4998-A626-4F2B-BD57-AA917C2670E8}
         uuid_Xcode4_TargetDependency {DD978FFB-799E-4B76-9704-24D7F9858311}
       }
-      target_dependency fltk_zlib {
+      target_dependency fltk3zlib {
         uuid_Xcode4_BuildFileInFrameworks {8CFEC211-54F6-4441-8434-341686076466}
         uuid_Xcode4_BuildFileInCopyFiles {66BDB4B5-2ED7-49B5-9BAB-D55F1193378C}
         uuid_Xcode4_ContainerItemProxy {4BECC4A3-DA5A-4277-8EB2-12A092039220}
@@ -4908,7 +4909,7 @@
         uuid_Xcode4_FileRef {E34FF519-7B5A-4065-82C2-B74CBB45477C}
         filename_and_path {test/iconize.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {EA058632-D4EF-45A8-8FDE-6818A26E3910}
         uuid_Xcode4_BuildFileInCopyFiles {B65A4716-C4E6-47EA-A162-0E26297022BD}
         uuid_Xcode4_ContainerItemProxy {9D0609B4-7E93-4FA4-B643-57F899175D7D}
@@ -4937,7 +4938,7 @@
         uuid_Xcode4_FileRef {04420ABF-636C-4FF6-A93A-DF97D540BFB3}
         filename_and_path {test/image.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {C328C146-6C98-4083-9365-5A922437B45B}
         uuid_Xcode4_BuildFileInCopyFiles {75CC268F-3338-41E8-AD4E-E7272FF84F90}
         uuid_Xcode4_ContainerItemProxy {04181475-D170-48AA-9D82-185D56F1430B}
@@ -4966,7 +4967,7 @@
         uuid_Xcode4_FileRef {295B1BF3-4466-4FF5-9D8E-469FF38E280E}
         filename_and_path {test/inactive.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {7B867E21-4AD4-4F74-B856-AB2397745EB7}
         uuid_Xcode4_BuildFileInCopyFiles {F84B19DF-AD87-4ECB-AE46-0452F9BE1497}
         uuid_Xcode4_ContainerItemProxy {DB0B427C-E88F-4C52-A675-479F1A26865D}
@@ -4995,7 +4996,7 @@
         uuid_Xcode4_FileRef {DBE8F57C-BAA6-4988-A301-F64C590FF812}
         filename_and_path {test/input.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {F1399BFD-8550-4C10-A160-0BF3B6CBF6A4}
         uuid_Xcode4_BuildFileInCopyFiles {F33CC6D1-6CDE-4832-983C-2D08AE4D0BD0}
         uuid_Xcode4_ContainerItemProxy {BB1BE232-DE66-4F4C-8154-C789BA551955}
@@ -5024,7 +5025,7 @@
         uuid_Xcode4_FileRef {BE8CCD78-901E-4160-BC08-1F68DACAD37C}
         filename_and_path {test/input_choice.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {262AB0EE-C30C-42FB-A05C-3C035EAB3268}
         uuid_Xcode4_BuildFileInCopyFiles {CCE10FE3-F7BE-40F3-9F68-D748E0679A1F}
         uuid_Xcode4_ContainerItemProxy {B53D1D2C-0788-482A-86A2-C50CE7C33972}
@@ -5058,7 +5059,7 @@
         uuid_Xcode4_BuildFileInSources {704E917E-45EB-483F-98CF-A08A00F48E72}
         filename_and_path {test/keyboard_ui.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {71477938-0602-40DD-A6D4-245ED051ABE5}
         uuid_Xcode4_BuildFileInCopyFiles {7CD98AB2-3F84-450F-9B3B-A1D2C6028811}
         uuid_Xcode4_ContainerItemProxy {DF2E582A-A93F-4EF2-BCED-A6D9EB52A522}
@@ -5093,7 +5094,7 @@
         uuid_Xcode4_FileRef {548DE129-B842-4DE0-8E7B-E24186B07E9A}
         filename_and_path {test/label.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {D1942689-B3DE-4A86-BAF3-032AD07316AC}
         uuid_Xcode4_BuildFileInCopyFiles {EBC41AC0-40D1-4C79-B11B-09A4C93342AE}
         uuid_Xcode4_ContainerItemProxy {5AD0BF7E-A7B2-494A-8ED0-25C30B993A16}
@@ -5122,7 +5123,7 @@
         uuid_Xcode4_FileRef {1691194C-38B1-42F8-BF73-B98248207877}
         filename_and_path {test/line_style.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {07518481-50CF-49BF-8AE0-48DB31951F7E}
         uuid_Xcode4_BuildFileInCopyFiles {5C420C5A-7A88-4ECF-BBB0-65E53CE86067}
         uuid_Xcode4_ContainerItemProxy {9B5FFB10-3872-4C4B-8EF5-1F4922599C86}
@@ -5151,7 +5152,7 @@
         uuid_Xcode4_FileRef {B93E2240-8A65-479E-B532-E9E2311E4DC2}
         filename_and_path {test/list_visuals.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {42357684-CF8D-4209-8655-4D07F326215E}
         uuid_Xcode4_BuildFileInCopyFiles {5561E0F2-659E-4759-B8B3-DC8F43C39C9B}
         uuid_Xcode4_ContainerItemProxy {F2A9CED6-9DC6-4841-8F28-4E7AF0D3838E}
@@ -5185,7 +5186,7 @@
         uuid_Xcode4_BuildFileInSources {B98174D2-7D3F-4BD9-9289-18958C15B67C}
         filename_and_path {test/mandelbrot_ui.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {49A7EFC5-EFA4-4CC6-A766-BC297EE1E288}
         uuid_Xcode4_BuildFileInCopyFiles {CD4F4625-2493-4DF9-860F-BF5AD12DDFB9}
         uuid_Xcode4_ContainerItemProxy {E20E62D9-66F6-45BC-91B0-03A1FF8EB12A}
@@ -5220,7 +5221,7 @@
         uuid_Xcode4_FileRef {725B9B32-8552-4306-B776-2DE0E3F403D9}
         filename_and_path {test/menubar.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {51B3BF0C-44CB-4C1D-90B7-2614E4F0FBB1}
         uuid_Xcode4_BuildFileInCopyFiles {144825F4-0DB4-4595-B9B3-3D90EFE61084}
         uuid_Xcode4_ContainerItemProxy {0054A598-5D9C-439F-9E11-FBAC7E0A00B1}
@@ -5249,7 +5250,7 @@
         uuid_Xcode4_FileRef {9F2E7F62-BA24-4A04-953F-909D880BACFB}
         filename_and_path {test/message.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {4BCA97BB-74D4-4961-9ACC-F02309A348FD}
         uuid_Xcode4_BuildFileInCopyFiles {20414F40-7897-4DC4-96D0-A197E82F7030}
         uuid_Xcode4_ContainerItemProxy {89252249-6148-42F8-A257-7623CFE3086D}
@@ -5278,7 +5279,7 @@
         uuid_Xcode4_FileRef {E5BC0BE3-D6DA-45CE-A47B-DADF0C501769}
         filename_and_path {test/minimum.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {DED84CBE-83F7-40B1-A6DD-6E034D119906}
         uuid_Xcode4_BuildFileInCopyFiles {039F762C-AA1F-4819-BFC6-52CC6A613E4E}
         uuid_Xcode4_ContainerItemProxy {51B50408-71BB-4AC6-9837-DDFBD6F3E3AB}
@@ -5307,7 +5308,7 @@
         uuid_Xcode4_FileRef {4AE97840-DF2C-4F8C-9A26-D607BF6AE252}
         filename_and_path {test/navigation.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {B6658415-02AE-48D7-AB3A-A6EC9B7E8FA6}
         uuid_Xcode4_BuildFileInCopyFiles {1A1893BC-53EF-453A-8E15-508AC3DCAB12}
         uuid_Xcode4_ContainerItemProxy {1E3800F2-61AC-4B76-801D-238324E4EBFD}
@@ -5336,7 +5337,7 @@
         uuid_Xcode4_FileRef {E3F5E9E7-259F-4B80-BCD1-E312D0AF5F26}
         filename_and_path {test/native-filechooser.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {EA1F5CD8-C9DB-472A-9E75-012EB19F8D1E}
         uuid_Xcode4_BuildFileInCopyFiles {8B45D566-448B-4FD9-B55B-59850EF64591}
         uuid_Xcode4_ContainerItemProxy {0F62A6EA-CFBA-46B3-9295-6EC44F81BF78}
@@ -5365,7 +5366,7 @@
         uuid_Xcode4_FileRef {0433C858-2CA0-4517-8AC1-383F052D803D}
         filename_and_path {test/output.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {BFB851FC-3F18-4DDE-8235-3A4109E4B784}
         uuid_Xcode4_BuildFileInCopyFiles {FECC9CB8-3061-4454-B571-B67D879FB0EF}
         uuid_Xcode4_ContainerItemProxy {AAAFD2FC-0338-4AAB-BA78-FC9D9B097872}
@@ -5394,7 +5395,7 @@
         uuid_Xcode4_FileRef {FA6E3584-A76D-4B92-B390-0F2BCF74F662}
         filename_and_path {test/overlay.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {CB7DEB15-A616-44F8-9004-A718104C42FE}
         uuid_Xcode4_BuildFileInCopyFiles {277CFEBD-07B8-494F-A722-8D36FA9213FE}
         uuid_Xcode4_ContainerItemProxy {4112E6C6-EBCB-4278-AA3C-7FE27F8824C5}
@@ -5423,7 +5424,7 @@
         uuid_Xcode4_FileRef {B94C9434-DEC6-4409-99C2-564D403D2DD0}
         filename_and_path {test/pack.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {24576601-E4B7-4649-ADB5-7BB1A1731E8D}
         uuid_Xcode4_BuildFileInCopyFiles {2FEC0834-E291-4C2A-B0F5-35F45E776937}
         uuid_Xcode4_ContainerItemProxy {D77BDE28-2669-4D70-A5B2-576E195DD96B}
@@ -5452,31 +5453,31 @@
         uuid_Xcode4_FileRef {D10F0CF7-7411-40F7-B130-ED5EE20131D8}
         filename_and_path {test/pixmap_browser.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {D3A4E90D-F2FC-4194-9AEB-6E3E40B91B42}
         uuid_Xcode4_BuildFileInCopyFiles {1174924A-127E-463E-800B-C73D51B9A086}
         uuid_Xcode4_ContainerItemProxy {66D5017C-A6D1-4FBB-B8AC-71D8D7753212}
         uuid_Xcode4_TargetDependency {2C1154AB-BCF5-4BE8-B952-7F36F9911C1B}
       }
-      target_dependency fltk_images {
+      target_dependency fltk3images {
         uuid_Xcode4_BuildFileInFrameworks {F6365FB7-903D-4B53-BA7C-A657DB15AEB6}
         uuid_Xcode4_BuildFileInCopyFiles {D9716327-725F-4D31-818D-51867D51F4F7}
         uuid_Xcode4_ContainerItemProxy {6955C816-CE89-4013-96D0-786FA8119A07}
         uuid_Xcode4_TargetDependency {B8EA6D01-E4E9-4630-895C-0893A2411B26}
       }
-      target_dependency fltk_png {
+      target_dependency fltk3png {
         uuid_Xcode4_BuildFileInFrameworks {2A07E43F-4EBE-494E-966B-999C633D079E}
         uuid_Xcode4_BuildFileInCopyFiles {4BC82B14-1A95-4EB4-9B58-50A4B33630DF}
         uuid_Xcode4_ContainerItemProxy {91B00D3E-7A5C-4A46-989E-626767B35C52}
         uuid_Xcode4_TargetDependency {541466C5-D9F8-423A-917E-D6478C013848}
       }
-      target_dependency fltk_jpeg {
+      target_dependency fltk3jpeg {
         uuid_Xcode4_BuildFileInFrameworks {FB6C7401-7567-4CF4-8527-95CA2E50833E}
         uuid_Xcode4_BuildFileInCopyFiles {74B905D5-1CE7-4832-AAD1-BCEB8CA5DC67}
         uuid_Xcode4_ContainerItemProxy {3DF04926-C0D8-4696-A077-ACEC5745CA60}
         uuid_Xcode4_TargetDependency {17C19DFB-1E41-4DC6-BDF6-F59BB656C7E1}
       }
-      target_dependency fltk_zlib {
+      target_dependency fltk3zlib {
         uuid_Xcode4_BuildFileInFrameworks {65BBE449-A4D4-4167-BFE6-BF27DC85AC6A}
         uuid_Xcode4_BuildFileInCopyFiles {D8AAD7FC-7634-4977-9F1D-875BAD84FFD6}
         uuid_Xcode4_ContainerItemProxy {9177E4D7-B7BB-4BAD-B6C3-16D5A022943F}
@@ -5505,7 +5506,7 @@
         uuid_Xcode4_FileRef {F5C69D2F-FA03-4927-9DD7-A3074A3D422B}
         filename_and_path {test/pixmap.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {62243343-1F86-42FC-8BFE-3951E11FAC17}
         uuid_Xcode4_BuildFileInCopyFiles {C9800385-1575-4D2F-833D-3F0797C1D84B}
         uuid_Xcode4_ContainerItemProxy {168F11AD-1A64-489F-B276-A96FC8786524}
@@ -5534,7 +5535,7 @@
         uuid_Xcode4_BuildFileInSources {19BB117B-5033-44B7-A09F-417BF8BE1C63}
         filename_and_path {test/preferences.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {4F1839C3-9D83-4063-B8BA-C8A6D81571A5}
         uuid_Xcode4_BuildFileInCopyFiles {78AFD340-DF54-4FB5-8950-4D429C1ACD30}
         uuid_Xcode4_ContainerItemProxy {70E9C4A0-4E28-4113-A74B-ACEBF476AD24}
@@ -5569,7 +5570,7 @@
         uuid_Xcode4_BuildFileInSources {704E9EB0-136D-45C1-ACF6-3237D5C05351}
         filename_and_path {test/radio.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {ADFE5AA1-2184-41FD-AE6B-3556DFF96A0D}
         uuid_Xcode4_BuildFileInCopyFiles {257CC57A-9BE4-4367-B2DD-767A841E5452}
         uuid_Xcode4_ContainerItemProxy {853CAB4E-79C4-47E9-85E4-A873AD5A32CE}
@@ -5604,7 +5605,7 @@
         uuid_Xcode4_FileRef {BBD59C52-9636-47E1-95A2-2343DD9695A8}
         filename_and_path {test/resizebox.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {6266CE70-997A-42BB-9EA3-B3422FB9A471}
         uuid_Xcode4_BuildFileInCopyFiles {454A29D5-5091-423E-88AF-21F313416024}
         uuid_Xcode4_ContainerItemProxy {6EDF2799-0FD2-42B0-8CAB-59B6CA9BB812}
@@ -5633,7 +5634,7 @@
         uuid_Xcode4_BuildFileInSources {533D8CCB-375E-415B-8F18-CF85A8E11B44}
         filename_and_path {test/resize.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {8C0A5A62-66D3-45AD-B98A-378F8AD66BD5}
         uuid_Xcode4_BuildFileInCopyFiles {012D264C-CB0B-4E69-A33D-D65EF1182C05}
         uuid_Xcode4_ContainerItemProxy {7F3844D9-54CA-4F28-93EA-0F7EB602C449}
@@ -5668,7 +5669,7 @@
         uuid_Xcode4_FileRef {3B964469-A4BC-4C8C-B25D-0E1C3AF0D5AF}
         filename_and_path {test/rotated_text.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {D6F8969F-0E24-40EE-8BBF-0655356A2655}
         uuid_Xcode4_BuildFileInCopyFiles {E66471FF-6318-44C7-AA0C-9014B55F4C1A}
         uuid_Xcode4_ContainerItemProxy {24B6ADC2-502E-44C4-B772-F3ED5789D9A3}
@@ -5697,7 +5698,7 @@
         uuid_Xcode4_FileRef {15F2668C-A985-4EBB-B000-76D2A5CBC8D6}
         filename_and_path {test/scroll.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {82173261-BF26-4C1E-99A7-E5A2B7C00885}
         uuid_Xcode4_BuildFileInCopyFiles {64AD3B91-64C8-4002-ACC9-E928726F9AB6}
         uuid_Xcode4_ContainerItemProxy {F9129EF8-7D1B-4BBD-A2D9-EABB749AFD35}
@@ -5726,13 +5727,13 @@
         uuid_Xcode4_FileRef {DBE78FC4-2D67-4648-A133-5D5E3A089E55}
         filename_and_path {test/shape.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {C44BB43D-F260-46E9-B4C8-C67025E0EB57}
         uuid_Xcode4_BuildFileInCopyFiles {7D54EC0F-2599-4482-9B30-36736B6F3222}
         uuid_Xcode4_ContainerItemProxy {587428E1-E9BB-4A7A-A329-062F00A706A7}
         uuid_Xcode4_TargetDependency {5F54E43B-F769-4A7F-97A0-BD9874C9458E}
       }
-      target_dependency fltk_gl {
+      target_dependency fltk3gl {
         uuid_Xcode4_BuildFileInFrameworks {5FE67EF4-8004-43FA-A501-07DFDFA39AE2}
         uuid_Xcode4_BuildFileInCopyFiles {D15CD64F-C45E-4111-80BB-796251601A30}
         uuid_Xcode4_ContainerItemProxy {332B0BA6-29BA-48B9-AB34-E5D7494F0F02}
@@ -5802,7 +5803,7 @@
         uuid_Xcode4_FileRef {F86868E8-003C-4C2F-9530-5520C2022020}
         filename_and_path {test/subwindow.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {78408084-B93D-46CC-9E6D-F01EF08849D6}
         uuid_Xcode4_BuildFileInCopyFiles {536A5972-7DAE-49CA-A02E-BCC58D97F026}
         uuid_Xcode4_ContainerItemProxy {488F15B7-E428-46E8-83A1-F439AF2A58FC}
@@ -5831,31 +5832,31 @@
         uuid_Xcode4_FileRef {45B471C7-8D57-4244-BD19-8C230A1A2CB9}
         filename_and_path {test/sudoku.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {4BD59DB6-F11B-4DBC-88BE-F191746C2F44}
         uuid_Xcode4_BuildFileInCopyFiles {1277C42A-BA11-405B-BEF9-5A3B5AD91C8B}
         uuid_Xcode4_ContainerItemProxy {3D1A55EE-4C83-4AF8-93C0-44F5E0D93646}
         uuid_Xcode4_TargetDependency {0E6EB228-6578-4065-91C8-EF43B01991F2}
       }
-      target_dependency fltk_images {
+      target_dependency fltk3images {
         uuid_Xcode4_BuildFileInFrameworks {DF57BE2E-0AF6-4604-80F4-7C340B8D9141}
         uuid_Xcode4_BuildFileInCopyFiles {0D0C53CA-958A-44CD-BCD8-6E23BD960020}
         uuid_Xcode4_ContainerItemProxy {9AA4F2ED-945E-4EE8-AA00-A0A11E333E24}
         uuid_Xcode4_TargetDependency {53FE520F-A4D9-4C8A-8272-543AC64ECEC1}
       }
-      target_dependency fltk_png {
+      target_dependency fltk3png {
         uuid_Xcode4_BuildFileInFrameworks {0A54EEB6-E507-4065-91CF-482E33B69D6F}
         uuid_Xcode4_BuildFileInCopyFiles {02F006EE-785B-43E6-995B-8EF20F460B56}
         uuid_Xcode4_ContainerItemProxy {4F98C824-CCC8-45DF-9408-481E67721EA0}
         uuid_Xcode4_TargetDependency {E7555394-82BD-4398-9A3E-AD53ACE3D8F9}
       }
-      target_dependency fltk_jpeg {
+      target_dependency fltk3jpeg {
         uuid_Xcode4_BuildFileInFrameworks {6C329225-4336-49BF-BEB9-46DBB35700E6}
         uuid_Xcode4_BuildFileInCopyFiles {C3B9CC3B-CB1A-460D-958A-F966E482BD94}
         uuid_Xcode4_ContainerItemProxy {AC25B5F5-E512-4E15-B482-41ABA508B860}
         uuid_Xcode4_TargetDependency {CE1F19EF-85AC-444E-8C8C-EBCFCBE9AC7C}
       }
-      target_dependency fltk_zlib {
+      target_dependency fltk3zlib {
         uuid_Xcode4_BuildFileInFrameworks {7A143F72-B525-4C20-8DD2-C9E8B8146A28}
         uuid_Xcode4_BuildFileInCopyFiles {6ED6E780-2CC9-4D9E-925E-59941518A541}
         uuid_Xcode4_ContainerItemProxy {E964FBEE-0180-463B-BB1E-3BE02DB3EAE6}
@@ -5904,7 +5905,7 @@
         uuid_Xcode4_FileRef {C354D5A0-DED9-4385-A76B-C37930D5586D}
         filename_and_path {test/symbols.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {300B8687-3529-4495-B024-77527B03BD37}
         uuid_Xcode4_BuildFileInCopyFiles {F9C35C0D-49D7-43FA-ACEE-A569755ECC63}
         uuid_Xcode4_ContainerItemProxy {94A8EFB6-BD70-42C3-9152-923661FCD5CD}
@@ -5933,7 +5934,7 @@
         uuid_Xcode4_FileRef {D22BD0BD-29DD-432A-A021-D320E5A0A999}
         filename_and_path {test/table.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {66DA6238-02F5-4763-97DA-339043F71011}
         uuid_Xcode4_BuildFileInCopyFiles {AD35AD13-8C5E-4E5F-925A-619E8400F45F}
         uuid_Xcode4_ContainerItemProxy {0384E187-CD91-44DE-A54F-BE3D0057ECCD}
@@ -5962,7 +5963,7 @@
         uuid_Xcode4_BuildFileInSources {97A367FE-F0FD-47DC-B172-825DE6118BE6}
         filename_and_path {test/tabs.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {F3B05DCE-570C-4B31-9931-615454C46632}
         uuid_Xcode4_BuildFileInCopyFiles {735F2EA0-7E10-4AE1-B7BF-649E672E5046}
         uuid_Xcode4_ContainerItemProxy {87A77570-4D8B-453B-87D5-33A7B967B177}
@@ -5997,7 +5998,7 @@
         uuid_Xcode4_FileRef {7DC4397C-38CA-4084-A223-A51B4BEB4394}
         filename_and_path {test/threads.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {298DFB84-BC8B-4227-8A6B-A8C534B800DC}
         uuid_Xcode4_BuildFileInCopyFiles {8613D5F9-4C2C-4C3A-94B7-15DE7546E877}
         uuid_Xcode4_ContainerItemProxy {39DA3DE4-4255-42FA-8638-847AA3F38AEB}
@@ -6026,7 +6027,7 @@
         uuid_Xcode4_FileRef {ED8CF1CB-EEC8-4192-B488-F1603779CC88}
         filename_and_path {test/tile.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {C517F8E8-6914-490E-8F22-E6485C2F694C}
         uuid_Xcode4_BuildFileInCopyFiles {81C0056B-A4B7-4D26-91D7-934D716A7ACE}
         uuid_Xcode4_ContainerItemProxy {851D31FF-CA6A-4AC3-B961-8990D7A3F3C6}
@@ -6055,31 +6056,31 @@
         uuid_Xcode4_FileRef {99260DC8-B403-43A2-B83E-6873D8300462}
         filename_and_path {test/tiled_image.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {DEBA9070-6C8D-4EAB-87DF-66F1C3FB3909}
         uuid_Xcode4_BuildFileInCopyFiles {D4D36579-7A03-4371-9ABE-52560326AA01}
         uuid_Xcode4_ContainerItemProxy {19372258-33CB-4EA5-88DE-0F212A955D20}
         uuid_Xcode4_TargetDependency {D7AFA5B0-6DD6-40F0-B5FF-76114C71BEB2}
       }
-      target_dependency fltk_images {
+      target_dependency fltk3images {
         uuid_Xcode4_BuildFileInFrameworks {E70C3377-9299-4E31-8AAB-347A8D010ED4}
         uuid_Xcode4_BuildFileInCopyFiles {25B6823C-DE57-4082-B7AB-0B637B35E6B0}
         uuid_Xcode4_ContainerItemProxy {D471C388-A152-4A96-8DBD-B54D82F72A79}
         uuid_Xcode4_TargetDependency {F075F236-3F06-4C15-9AE8-D2D380AB5255}
       }
-      target_dependency fltk_png {
+      target_dependency fltk3png {
         uuid_Xcode4_BuildFileInFrameworks {3CB3EF77-FD55-4829-8330-082AE4B98C8C}
         uuid_Xcode4_BuildFileInCopyFiles {27D4D6D5-4ACE-446A-85DF-0ADD85080738}
         uuid_Xcode4_ContainerItemProxy {37F6B52F-4DC8-47A1-9D5B-287ADAEC14D5}
         uuid_Xcode4_TargetDependency {EC765C5E-235F-4571-AC2B-663AEF6F286D}
       }
-      target_dependency fltk_jpeg {
+      target_dependency fltk3jpeg {
         uuid_Xcode4_BuildFileInFrameworks {0E4AFD10-3C04-44B8-8E86-86DAA105B26F}
         uuid_Xcode4_BuildFileInCopyFiles {B8C293F5-45DC-444B-AEC8-CFF1D802413B}
         uuid_Xcode4_ContainerItemProxy {F5F922B3-C00B-405C-9856-AF2FCE15CAE7}
         uuid_Xcode4_TargetDependency {DCB37FCA-CCD1-48C4-AB03-14D7217F70D6}
       }
-      target_dependency fltk_zlib {
+      target_dependency fltk3zlib {
         uuid_Xcode4_BuildFileInFrameworks {7F5336BC-9352-4C95-89E3-A99160BDA0B9}
         uuid_Xcode4_BuildFileInCopyFiles {210B7CEF-E767-4785-9645-A572330F8950}
         uuid_Xcode4_ContainerItemProxy {8CAC0721-5F98-4D4A-9882-549A4E288064}
@@ -6108,7 +6109,7 @@
         uuid_Xcode4_BuildFileInSources {CAB0D222-F989-40D3-B2AD-0455DEAE45EE}
         filename_and_path {test/tree.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {6B9AB514-B21B-4282-8DD1-88A0B372ECB8}
         uuid_Xcode4_BuildFileInCopyFiles {1660BF6E-2DCA-4890-BABC-9381C55FF987}
         uuid_Xcode4_ContainerItemProxy {55B18FF4-354C-4740-9254-5C4BCDAAA3F1}
@@ -6194,7 +6195,7 @@
         uuid_Xcode4_FileRef {4DDA4319-0910-4380-96D0-CA7616D06987}
         filename_and_path {test/unittest_viewport.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {5BB07519-DDC5-4225-8AB4-9B8A2B541AA2}
         uuid_Xcode4_BuildFileInCopyFiles {60B535BE-3A83-4B7A-AE27-C05684B317A3}
         uuid_Xcode4_ContainerItemProxy {1919671C-4588-4F42-B36D-2FB10A61CCDD}
@@ -6223,7 +6224,7 @@
         uuid_Xcode4_FileRef {24A75B71-B745-4E8B-B7F2-5FE9B809B54D}
         filename_and_path {test/utf8.cxx}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {3B428E37-4AEB-4A5B-932C-A4B2B2751E16}
         uuid_Xcode4_BuildFileInCopyFiles {646340DC-FCF7-42BB-B8A5-B7AF5164FD14}
         uuid_Xcode4_ContainerItemProxy {51855363-63E2-437E-8E8B-50E0FB33AED8}
@@ -6252,7 +6253,7 @@
         uuid_Xcode4_BuildFileInSources {F671D5D7-7150-4116-9C68-92969A3F9E32}
         filename_and_path {test/valuators.fl}
       }
-      target_dependency fltk {
+      target_dependency fltk3 {
         uuid_Xcode4_BuildFileInFrameworks {77A4274D-2AC6-4E31-9745-D943FAB74014}
         uuid_Xcode4_BuildFileInCopyFiles {9CA30044-CE75-413A-B8A3-2A6223D68EE9}
         uuid_Xcode4_ContainerItemProxy {AED96CC1-E203-4DF4-99A7-27005A39BB35}

Modified: branches/branch-3.0/fluid/Fl_Function_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Function_Type.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fl_Function_Type.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -31,7 +31,7 @@
 #include "Fl_Type.h"
 #include <fltk3/ask.h>
 #include <fltk3/FileChooser.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 

Modified: branches/branch-3.0/fluid/Fl_Group_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Group_Type.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fl_Group_Type.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -35,7 +35,7 @@
 #include <fltk3/Table.h>
 #include <fltk3/message.h>
 #include "Fl_Widget_Type.h"
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 
 // Override group's resize behavior to do nothing to children:
 void igroup::resize(int X, int Y, int W, int H) {

Modified: branches/branch-3.0/fluid/Fl_Menu_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Menu_Type.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fl_Menu_Type.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -40,7 +40,7 @@
 #include <fltk3/ValueInput.h>
 #include <fltk3/TextDisplay.h>
 #include <fltk3/Wrapper.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 

Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fl_Type.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -43,7 +43,7 @@
 #include <fltk3/draw.h>
 #include <fltk3/filename.h>
 #include <stdlib.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <stdio.h>
 
 #include "Fl_Type.h"

Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -35,7 +35,7 @@
 #include <fltk3/Slider.h>
 #include <fltk3/Spinner.h>
 #include <fltk3/Window.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 

Modified: branches/branch-3.0/fluid/Fl_Window_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Window_Type.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fl_Window_Type.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -1359,7 +1359,7 @@
 ////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 
 void Fl_Window_Type::write_code1() {
   Fl_Widget_Type::write_code1();

Modified: branches/branch-3.0/fluid/Fluid_Image.cxx
===================================================================
--- branches/branch-3.0/fluid/Fluid_Image.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Fluid_Image.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -29,7 +29,7 @@
 #include <fltk3/Widget.h>
 #include "Fl_Type.h"
 #include "Fluid_Image.h"
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>

Modified: branches/branch-3.0/fluid/Makefile
===================================================================
--- branches/branch-3.0/fluid/Makefile	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/Makefile	2011-08-22 15:21:44 UTC (rev 8991)
@@ -61,12 +61,12 @@
 
 all:	$(FLUID) fluid$(EXEEXT)
 
-fluid$(EXEEXT): $(FLUID_OBJECTS) $(FLTK_LIBNAME) $(FLTK_IMAGES_LIBNAME) $(FLTK_PNG_LIBNAME) $(FLTK_JPEG_LIBNAME) $(FLTK_ZLIB_LIBNAME)
+fluid$(EXEEXT): $(FLUID_OBJECTS) $(FLTK3_LIBNAME) $(FLTK3IMAGES_LIBNAME) $(FLTK3PNG_LIBNAME) $(FLTK3JPEG_LIBNAME) $(FLTK3ZLIB_LIBNAME)
 	echo Linking $@...
-	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLUID_OBJECTS) $(LINK_FLTK_IMAGES) $(LINK_FLTK_PNG) $(LINK_FLTK_JPEG) $(LINK_FLTK_ZLIB) $(LINK_FLTK) $(LDLIBS)
+	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLUID_OBJECTS) $(LINK_FLTK3IMAGES) $(LINK_FLTK3PNG) $(LINK_FLTK3JPEG) $(LINK_FLTK3ZLIB) $(LINK_FLTK3) $(LDLIBS)
 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
 
-fluid-shared$(EXEEXT):	$(FLUID_OBJECTS) ../src/$(FLTK_DSONAME) ../src/$(FLTK_IMAGES_DSONAME) ../src/$(FLTK_PNG_DSONAME) ../src/$(FLTK_JPEG_DSONAME) ../src/$(FLTK_ZLIB_DSONAME)
+fluid-shared$(EXEEXT):	$(FLUID_OBJECTS) ../src/$(FLTK3_DSONAME) ../src/$(FLTK3IMAGES_DSONAME) ../src/$(FLTK3PNG_DSONAME) ../src/$(FLTK3JPEG_DSONAME) ../src/$(FLTK3ZLIB_DSONAME)
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLUID_OBJECTS) $(LINKSHARED) $(LDLIBS)
 

Modified: branches/branch-3.0/fluid/code.cxx
===================================================================
--- branches/branch-3.0/fluid/code.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/code.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <stdarg.h>
 
 #include <fltk3/run.h>

Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/factory.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -39,7 +39,7 @@
 #include <fltk3/Pixmap.h>
 #include <fltk3/Tree.h>
 #include <stdio.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include "undo.h"
 
 #include "Fl_Widget_Type.h"

Modified: branches/branch-3.0/fluid/file.cxx
===================================================================
--- branches/branch-3.0/fluid/file.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/file.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -32,7 +32,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../src/flstring.h"
+// FIXME: either make the interface public or remove this include statement!
+#include "../src/core/flstring.h"
 #include <stdarg.h>
 #include "alignment_panel.h"
 #include "workspace_panel.h"

Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/fluid.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -48,7 +48,7 @@
 #include <sys/stat.h>
 #include <time.h> // time(), localtime(), etc.
 
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include "alignment_panel.h"
 #include "function_panel.h"
 #include "template_panel.h"

Modified: branches/branch-3.0/fluid/makedepend
===================================================================
--- branches/branch-3.0/fluid/makedepend	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/makedepend	2011-08-22 15:21:44 UTC (rev 8991)
@@ -1,112 +1,12 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-CodeEditor.o: CodeEditor.h ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-CodeEditor.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-CodeEditor.o: ../fltk3/TextBuffer.h ../fltk3/TextEditor.h
-CodeEditor.o: ../fltk3/TextDisplay.h ../fltk3/draw.h ../fltk3/x.h
-CodeEditor.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-CodeEditor.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-CodeEditor.o: ../fltk3/Widget.h ../fltk3/enumerations.h ../fltk3/Window.h
-CodeEditor.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Plugin.h
-CodeEditor.o: ../fltk3/Preferences.h ../fltk3/Image.h ../fltk3/Bitmap.h
-CodeEditor.o: ../fltk3/Image.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-CodeEditor.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-CodeEditor.o: ../fltk3/TextBuffer.h
-Fl_Function_Type.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-Fl_Function_Type.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-Fl_Function_Type.o: ../fltk3/Preferences.h ../fltk3/FileChooser.h
-Fl_Function_Type.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h
-Fl_Function_Type.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Rectangle.h
-Fl_Function_Type.o: ../fltk3/Object.h ../fltk3/Wrapper.h ../fltk3/Widget.h
-Fl_Function_Type.o: ../fltk3/Group.h ../fltk3/Choice.h ../fltk3/Menu_.h
-Fl_Function_Type.o: ../fltk3/MenuItem.h ../fltk3/Image.h
-Fl_Function_Type.o: ../fltk3/MenuButton.h ../fltk3/Button.h
-Fl_Function_Type.o: ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h
-Fl_Function_Type.o: ../fltk3/Browser.h ../fltk3/Browser_.h
-Fl_Function_Type.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h
-Fl_Function_Type.o: ../fltk3/Valuator.h ../fltk3/FileIcon.h ../fltk3/run.h
-Fl_Function_Type.o: ../fltk3/filename.h ../fltk3/Box.h ../fltk3/CheckButton.h
-Fl_Function_Type.o: ../fltk3/LightButton.h ../fltk3/Button.h
-Fl_Function_Type.o: ../fltk3/FileInput.h ../fltk3/Input.h ../fltk3/Input_.h
-Fl_Function_Type.o: ../fltk3/ReturnButton.h ../fltk3/ask.h Fl_Type.h
-Fl_Function_Type.o: ../fltk3/Menu.h ../fltk3/Plugin.h Fluid_Image.h
-Fl_Function_Type.o: ../fltk3/SharedImage.h ../fltk3/draw.h ../fltk3/x.h
-Fl_Function_Type.o: ../fltk3/enumerations.h ../fltk3/Window.h
-Fl_Function_Type.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Image.h
-Fl_Function_Type.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-Fl_Function_Type.o: ../fltk3/TabGroup.h ../fltk3/PackedGroup.h
-Fl_Function_Type.o: ../fltk3/WizardGroup.h ../fltk3/Menu_.h
-Fl_Function_Type.o: ../fltk3/InputChoice.h ../fltk3/MenuBar.h
-Fl_Function_Type.o: ../src/flstring.h ../fltk3/Export.h ../config.h
-Fl_Function_Type.o: function_panel.h ../fltk3/LightButton.h
-Fl_Function_Type.o: ../fltk3/TextEditor.h ../fltk3/TextDisplay.h
-Fl_Function_Type.o: ../fltk3/draw.h ../fltk3/TextBuffer.h CodeEditor.h
-Fl_Function_Type.o: ../fltk3/TextBuffer.h comments.h
-Fl_Group_Type.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-Fl_Group_Type.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-Fl_Group_Type.o: ../fltk3/Group.h ../fltk3/Table.h ../fltk3/ScrollGroup.h
-Fl_Group_Type.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Rectangle.h
-Fl_Group_Type.o: ../fltk3/Object.h ../fltk3/Wrapper.h ../fltk3/Widget.h
-Fl_Group_Type.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-Fl_Group_Type.o: ../fltk3/Box.h ../fltk3/Scrollbar.h ../fltk3/message.h
-Fl_Group_Type.o: ../fltk3/ask.h Fl_Widget_Type.h Fl_Type.h
-Fl_Group_Type.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Menu.h
-Fl_Group_Type.o: ../fltk3/MenuItem.h ../fltk3/Image.h ../fltk3/Plugin.h
-Fl_Group_Type.o: ../fltk3/Preferences.h Fluid_Image.h ../fltk3/SharedImage.h
-Fl_Group_Type.o: ../fltk3/draw.h ../fltk3/x.h ../fltk3/enumerations.h
-Fl_Group_Type.o: ../fltk3/Window.h ../fltk3/Device.h ../fltk3/Object.h
-Fl_Group_Type.o: ../fltk3/Image.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
-Fl_Group_Type.o: ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-Fl_Group_Type.o: ../fltk3/PackedGroup.h ../fltk3/WizardGroup.h
-Fl_Group_Type.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-Fl_Group_Type.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-Fl_Group_Type.o: ../fltk3/Input_.h ../fltk3/MenuBar.h ../src/flstring.h
-Fl_Group_Type.o: ../fltk3/Export.h ../config.h
-Fl_Menu_Type.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-Fl_Menu_Type.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-Fl_Menu_Type.o: Fl_Widget_Type.h Fl_Type.h ../fltk3/Widget.h
-Fl_Menu_Type.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-Fl_Menu_Type.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
-Fl_Menu_Type.o: ../fltk3/Wrapper.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-Fl_Menu_Type.o: ../fltk3/Image.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-Fl_Menu_Type.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/draw.h
-Fl_Menu_Type.o: ../fltk3/x.h ../fltk3/enumerations.h ../fltk3/Window.h
-Fl_Menu_Type.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Image.h
-Fl_Menu_Type.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-Fl_Menu_Type.o: ../fltk3/TabGroup.h ../fltk3/PackedGroup.h ../fltk3/Group.h
-Fl_Menu_Type.o: ../fltk3/WizardGroup.h ../fltk3/Menu_.h ../fltk3/MenuButton.h
-Fl_Menu_Type.o: ../fltk3/Menu_.h ../fltk3/Choice.h ../fltk3/InputChoice.h
-Fl_Menu_Type.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/MenuBar.h
-Fl_Menu_Type.o: alignment_panel.h ../fltk3/TextBuffer.h
-Fl_Menu_Type.o: ../fltk3/TextDisplay.h ../fltk3/draw.h ../fltk3/Scrollbar.h
-Fl_Menu_Type.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../fltk3/TextBuffer.h
-Fl_Menu_Type.o: ../fltk3/filename.h ../fltk3/Tooltip.h ../fltk3/Button.h
-Fl_Menu_Type.o: ../fltk3/Box.h ../fltk3/CheckButton.h ../fltk3/LightButton.h
-Fl_Menu_Type.o: ../fltk3/Button.h ../fltk3/IntInput.h ../fltk3/Input.h
-Fl_Menu_Type.o: ../fltk3/Spinner.h ../fltk3/RepeatButton.h ../fltk3/run.h
-Fl_Menu_Type.o: ../fltk3/ReturnButton.h ../fltk3/RoundButton.h
-Fl_Menu_Type.o: ../fltk3/message.h ../fltk3/ask.h ../fltk3/ValueInput.h
-Fl_Menu_Type.o: ../src/flstring.h ../fltk3/Export.h ../config.h
-Fl_Menu_Type.o: ../fltk3/Output.h Shortcut_Button.h
-Fl_Type.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h ../fltk3/types.h
-Fl_Type.o: ../fltk3/Xutf8.h ../fltk3/enumerations.h ../fltk3/ask.h
-Fl_Type.o: ../fltk3/Browser_.h ../fltk3/Group.h ../fltk3/Widget.h
-Fl_Type.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-Fl_Type.o: ../fltk3/Widget.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-Fl_Type.o: ../fltk3/Valuator.h ../fltk3/draw.h ../fltk3/x.h ../fltk3/Window.h
-Fl_Type.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-Fl_Type.o: ../fltk3/Object.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-Fl_Type.o: ../fltk3/Image.h ../fltk3/Bitmap.h ../fltk3/Image.h
-Fl_Type.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/filename.h
-Fl_Type.o: ../src/flstring.h ../fltk3/Export.h ../config.h Fl_Type.h
-Fl_Type.o: ../fltk3/DoubleWindow.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-Fl_Type.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/TabGroup.h
-Fl_Type.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-Fl_Type.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-Fl_Type.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-Fl_Type.o: ../fltk3/Input_.h ../fltk3/MenuBar.h workspace_panel.h
-Fl_Type.o: ../fltk3/MultiLabel.h ../fltk3/Box.h ../fltk3/Button.h
-Fl_Type.o: ../fltk3/ReturnButton.h ../fltk3/Button.h undo.h pixmaps/lock.xpm
+CodeEditor.o: CodeEditor.h
+Fl_Function_Type.o: Fl_Type.h Fluid_Image.h function_panel.h CodeEditor.h
+Fl_Function_Type.o: comments.h
+Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h Fluid_Image.h
+Fl_Menu_Type.o: Fl_Widget_Type.h Fl_Type.h Fluid_Image.h alignment_panel.h
+Fl_Menu_Type.o: Shortcut_Button.h
+Fl_Type.o: Fl_Type.h Fluid_Image.h workspace_panel.h undo.h pixmaps/lock.xpm
 Fl_Type.o: pixmaps/protected.xpm pixmaps/flWindow.xpm pixmaps/flButton.xpm
 Fl_Type.o: pixmaps/flCheckButton.xpm pixmaps/flRoundButton.xpm
 Fl_Type.o: pixmaps/flBox.xpm pixmaps/flGroup.xpm pixmaps/flFunction.xpm
@@ -128,398 +28,37 @@
 Fl_Type.o: pixmaps/flCounter.xpm pixmaps/flDial.xpm pixmaps/flRoller.xpm
 Fl_Type.o: pixmaps/flValueInput.xpm pixmaps/flValueOutput.xpm
 Fl_Type.o: pixmaps/flSpinner.xpm pixmaps/flWidgetClass.xpm pixmaps/flTree.xpm
-Fl_Type.o: pixmaps/flTable.xpm pixmaps/flAppTarget.xpm pixmaps/flFile.xpm
-Fl_Type.o: pixmaps/flFolder.xpm pixmaps/flFluidFile.xpm
-Fl_Type.o: pixmaps/flCodeFile.xpm pixmaps/flMenuNone.xpm
-Fl_Type.o: pixmaps/flMenuMulti.xpm pixmaps/flMenuAll.xpm
-Fl_Widget_Type.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-Fl_Widget_Type.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-Fl_Widget_Type.o: ../fltk3/Group.h ../fltk3/Table.h ../fltk3/ScrollGroup.h
-Fl_Widget_Type.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Rectangle.h
-Fl_Widget_Type.o: ../fltk3/Object.h ../fltk3/Wrapper.h ../fltk3/Widget.h
-Fl_Widget_Type.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-Fl_Widget_Type.o: ../fltk3/Box.h ../fltk3/Scrollbar.h ../fltk3/Input.h
-Fl_Widget_Type.o: ../fltk3/Input_.h Fl_Widget_Type.h Fl_Type.h
-Fl_Widget_Type.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Menu.h
-Fl_Widget_Type.o: ../fltk3/MenuItem.h ../fltk3/Image.h ../fltk3/Plugin.h
-Fl_Widget_Type.o: ../fltk3/Preferences.h Fluid_Image.h ../fltk3/SharedImage.h
-Fl_Widget_Type.o: ../fltk3/draw.h ../fltk3/x.h ../fltk3/enumerations.h
-Fl_Widget_Type.o: ../fltk3/Window.h ../fltk3/Device.h ../fltk3/Object.h
-Fl_Widget_Type.o: ../fltk3/Image.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
-Fl_Widget_Type.o: ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-Fl_Widget_Type.o: ../fltk3/PackedGroup.h ../fltk3/WizardGroup.h
-Fl_Widget_Type.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-Fl_Widget_Type.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/MenuBar.h
-Fl_Widget_Type.o: alignment_panel.h ../fltk3/TextBuffer.h
-Fl_Widget_Type.o: ../fltk3/TextDisplay.h ../fltk3/draw.h
-Fl_Widget_Type.o: ../fltk3/TextBuffer.h ../fltk3/filename.h
-Fl_Widget_Type.o: ../fltk3/Tooltip.h ../fltk3/Button.h ../fltk3/CheckButton.h
-Fl_Widget_Type.o: ../fltk3/LightButton.h ../fltk3/Button.h
-Fl_Widget_Type.o: ../fltk3/IntInput.h ../fltk3/Input.h ../fltk3/Spinner.h
-Fl_Widget_Type.o: ../fltk3/RepeatButton.h ../fltk3/run.h
-Fl_Widget_Type.o: ../fltk3/ReturnButton.h ../fltk3/RoundButton.h
-Fl_Widget_Type.o: ../fltk3/message.h ../fltk3/ask.h ../fltk3/Slider.h
-Fl_Widget_Type.o: ../src/flstring.h ../fltk3/Export.h ../config.h
-Fl_Widget_Type.o: widget_panel.h ../fltk3/ValueInput.h ../fltk3/LightButton.h
-Fl_Widget_Type.o: Shortcut_Button.h CodeEditor.h ../fltk3/TextEditor.h
-Fl_Widget_Type.o: ../fltk3/TextDisplay.h ../fltk3/show_colormap.h
-Fl_Window_Type.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-Fl_Window_Type.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-Fl_Window_Type.o: ../fltk3/OverlayWindow.h ../fltk3/DoubleWindow.h
-Fl_Window_Type.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-Fl_Window_Type.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-Fl_Window_Type.o: ../fltk3/Widget.h ../fltk3/message.h ../fltk3/ask.h
-Fl_Window_Type.o: ../fltk3/draw.h ../fltk3/x.h ../fltk3/enumerations.h
-Fl_Window_Type.o: ../fltk3/Window.h ../fltk3/Device.h ../fltk3/Object.h
-Fl_Window_Type.o: ../fltk3/Plugin.h ../fltk3/Preferences.h ../fltk3/Image.h
-Fl_Window_Type.o: ../fltk3/Bitmap.h ../fltk3/Image.h ../fltk3/Pixmap.h
-Fl_Window_Type.o: ../fltk3/RGBImage.h ../fltk3/MenuItem.h
-Fl_Window_Type.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h
-Fl_Window_Type.o: ../fltk3/Button.h Fl_Widget_Type.h Fl_Type.h
-Fl_Window_Type.o: ../fltk3/DoubleWindow.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-Fl_Window_Type.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/TabGroup.h
-Fl_Window_Type.o: ../fltk3/PackedGroup.h ../fltk3/Group.h
-Fl_Window_Type.o: ../fltk3/WizardGroup.h ../fltk3/Menu_.h
-Fl_Window_Type.o: ../fltk3/MenuButton.h ../fltk3/Menu_.h ../fltk3/Choice.h
-Fl_Window_Type.o: ../fltk3/InputChoice.h ../fltk3/Input.h ../fltk3/Input_.h
-Fl_Window_Type.o: ../fltk3/MenuBar.h undo.h alignment_panel.h
-Fl_Window_Type.o: ../fltk3/TextBuffer.h ../fltk3/TextDisplay.h
-Fl_Window_Type.o: ../fltk3/draw.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-Fl_Window_Type.o: ../fltk3/Valuator.h ../fltk3/TextBuffer.h
-Fl_Window_Type.o: ../fltk3/filename.h ../fltk3/Tooltip.h ../fltk3/Button.h
-Fl_Window_Type.o: ../fltk3/Box.h ../fltk3/CheckButton.h ../fltk3/IntInput.h
-Fl_Window_Type.o: ../fltk3/Input.h ../fltk3/Spinner.h ../fltk3/RepeatButton.h
-Fl_Window_Type.o: ../fltk3/run.h ../fltk3/ReturnButton.h widget_panel.h
-Fl_Window_Type.o: ../fltk3/ValueInput.h ../fltk3/LightButton.h
-Fl_Window_Type.o: Shortcut_Button.h CodeEditor.h ../fltk3/TextEditor.h
-Fl_Window_Type.o: ../fltk3/TextDisplay.h ../src/flstring.h ../fltk3/Export.h
-Fl_Window_Type.o: ../config.h
-Fluid_Image.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-Fluid_Image.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-Fluid_Image.o: ../fltk3/Widget.h Fl_Type.h ../fltk3/DoubleWindow.h
-Fluid_Image.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-Fluid_Image.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-Fluid_Image.o: ../fltk3/Menu.h ../fltk3/MenuItem.h ../fltk3/Image.h
-Fluid_Image.o: ../fltk3/Plugin.h ../fltk3/Preferences.h Fluid_Image.h
-Fluid_Image.o: ../fltk3/SharedImage.h ../fltk3/draw.h ../fltk3/x.h
-Fluid_Image.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-Fluid_Image.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-Fluid_Image.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-Fluid_Image.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-Fluid_Image.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-Fluid_Image.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-Fluid_Image.o: ../fltk3/Input_.h ../fltk3/MenuBar.h ../src/flstring.h
-Fluid_Image.o: ../fltk3/Export.h ../config.h ../fltk3/filename.h
-Fluid_Image.o: ../fltk3/FileChooser.h ../fltk3/Button.h ../fltk3/TiledGroup.h
-Fluid_Image.o: ../fltk3/FileBrowser.h ../fltk3/Browser.h ../fltk3/Browser_.h
-Fluid_Image.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-Fluid_Image.o: ../fltk3/FileIcon.h ../fltk3/run.h ../fltk3/filename.h
-Fluid_Image.o: ../fltk3/Box.h ../fltk3/CheckButton.h ../fltk3/LightButton.h
-Fluid_Image.o: ../fltk3/Button.h ../fltk3/FileInput.h ../fltk3/ReturnButton.h
-Fluid_Image.o: ../fltk3/ask.h
-about_panel.o: about_panel.h ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-about_panel.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-about_panel.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-about_panel.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
-about_panel.o: ../fltk3/Wrapper.h ../fltk3/Widget.h ../fltk3/Box.h
-about_panel.o: ../fltk3/Button.h ../fltk3/ReturnButton.h ../fltk3/Button.h
-about_panel.o: ../fltk3/Pixmap.h ../fltk3/Image.h
-align_widget.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
-align_widget.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-align_widget.o: ../fltk3/Window.h Fl_Widget_Type.h Fl_Type.h
-align_widget.o: ../fltk3/Widget.h ../fltk3/DoubleWindow.h ../fltk3/Window.h
-align_widget.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Rectangle.h
-align_widget.o: ../fltk3/Object.h ../fltk3/Wrapper.h ../fltk3/Menu.h
-align_widget.o: ../fltk3/MenuItem.h ../fltk3/Image.h ../fltk3/Plugin.h
-align_widget.o: ../fltk3/Preferences.h Fluid_Image.h ../fltk3/SharedImage.h
-align_widget.o: ../fltk3/draw.h ../fltk3/x.h ../fltk3/enumerations.h
-align_widget.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Image.h
-align_widget.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-align_widget.o: ../fltk3/TabGroup.h ../fltk3/PackedGroup.h ../fltk3/Group.h
-align_widget.o: ../fltk3/WizardGroup.h ../fltk3/Menu_.h ../fltk3/MenuButton.h
-align_widget.o: ../fltk3/Menu_.h ../fltk3/Choice.h ../fltk3/InputChoice.h
-align_widget.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/MenuBar.h undo.h
-alignment_panel.o: alignment_panel.h ../fltk3/run.h ../fltk3/utf8.h
-alignment_panel.o: ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
-alignment_panel.o: ../fltk3/enumerations.h ../fltk3/TextBuffer.h
-alignment_panel.o: ../fltk3/TextDisplay.h ../fltk3/draw.h ../fltk3/x.h
-alignment_panel.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-alignment_panel.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-alignment_panel.o: ../fltk3/Widget.h ../fltk3/enumerations.h
-alignment_panel.o: ../fltk3/Window.h ../fltk3/Device.h ../fltk3/Object.h
-alignment_panel.o: ../fltk3/Plugin.h ../fltk3/Preferences.h ../fltk3/Image.h
-alignment_panel.o: ../fltk3/Bitmap.h ../fltk3/Image.h ../fltk3/Pixmap.h
-alignment_panel.o: ../fltk3/RGBImage.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-alignment_panel.o: ../fltk3/Valuator.h ../fltk3/TextBuffer.h
-alignment_panel.o: ../fltk3/filename.h ../fltk3/DoubleWindow.h
-alignment_panel.o: ../fltk3/Tooltip.h ../fltk3/Button.h ../fltk3/TabGroup.h
-alignment_panel.o: ../fltk3/Group.h ../fltk3/Box.h ../fltk3/Input.h
-alignment_panel.o: ../fltk3/Input_.h ../fltk3/CheckButton.h
-alignment_panel.o: ../fltk3/LightButton.h ../fltk3/Button.h ../fltk3/Choice.h
-alignment_panel.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/IntInput.h
-alignment_panel.o: ../fltk3/Input.h ../fltk3/Spinner.h
-alignment_panel.o: ../fltk3/RepeatButton.h ../fltk3/run.h
-alignment_panel.o: ../fltk3/ReturnButton.h ../fltk3/RoundButton.h
-alignment_panel.o: ../fltk3/ask.h
-code.o: ../src/flstring.h ../fltk3/Export.h ../config.h ../fltk3/run.h
-code.o: ../fltk3/utf8.h ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
-code.o: ../fltk3/enumerations.h Fl_Type.h ../fltk3/Widget.h
-code.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-code.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
-code.o: ../fltk3/Wrapper.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-code.o: ../fltk3/Image.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-code.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/draw.h ../fltk3/x.h
-code.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-code.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-code.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-code.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-code.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-code.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-code.o: ../fltk3/Input_.h ../fltk3/MenuBar.h alignment_panel.h
-code.o: ../fltk3/TextBuffer.h ../fltk3/TextDisplay.h ../fltk3/draw.h
-code.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-code.o: ../fltk3/TextBuffer.h ../fltk3/filename.h ../fltk3/Tooltip.h
-code.o: ../fltk3/Button.h ../fltk3/Box.h ../fltk3/CheckButton.h
-code.o: ../fltk3/LightButton.h ../fltk3/Button.h ../fltk3/IntInput.h
-code.o: ../fltk3/Input.h ../fltk3/Spinner.h ../fltk3/RepeatButton.h
-code.o: ../fltk3/run.h ../fltk3/ReturnButton.h ../fltk3/RoundButton.h
-factory.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h ../fltk3/types.h
-factory.o: ../fltk3/Xutf8.h ../fltk3/enumerations.h ../fltk3/Group.h
-factory.o: ../fltk3/MenuItem.h ../fltk3/Widget.h ../fltk3/Rectangle.h
-factory.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Pixmap.h
-factory.o: ../fltk3/Tree.h ../fltk3/Scrollbar.h ../fltk3/draw.h ../fltk3/x.h
-factory.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Wrapper.h
-factory.o: ../fltk3/Widget.h ../fltk3/enumerations.h ../fltk3/Window.h
-factory.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Plugin.h
-factory.o: ../fltk3/Preferences.h ../fltk3/Image.h ../fltk3/Bitmap.h
-factory.o: ../fltk3/RGBImage.h ../fltk3/TreeItem.h ../fltk3/TreeItemArray.h
-factory.o: ../fltk3/TreePrefs.h ../src/flstring.h ../fltk3/Export.h
-factory.o: ../config.h undo.h Fl_Widget_Type.h Fl_Type.h
-factory.o: ../fltk3/DoubleWindow.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-factory.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/TabGroup.h
-factory.o: ../fltk3/PackedGroup.h ../fltk3/WizardGroup.h ../fltk3/Menu_.h
-factory.o: ../fltk3/MenuButton.h ../fltk3/Menu_.h ../fltk3/Choice.h
-factory.o: ../fltk3/InputChoice.h ../fltk3/Input.h ../fltk3/Input_.h
-factory.o: ../fltk3/MenuBar.h ../fltk3/Box.h ../fltk3/Button.h
-factory.o: ../fltk3/ReturnButton.h ../fltk3/Button.h ../fltk3/RepeatButton.h
-factory.o: ../fltk3/run.h ../fltk3/LightButton.h ../fltk3/CheckButton.h
-factory.o: ../fltk3/LightButton.h ../fltk3/RoundButton.h ../fltk3/Browser.h
-factory.o: ../fltk3/Browser_.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-factory.o: ../fltk3/Valuator.h ../fltk3/CheckBrowser.h ../fltk3/FileBrowser.h
-factory.o: ../fltk3/Browser.h ../fltk3/FileIcon.h ../fltk3/filename.h
-factory.o: ../fltk3/Counter.h ../fltk3/Spinner.h ../fltk3/FileInput.h
-factory.o: ../fltk3/TextDisplay.h ../fltk3/draw.h ../fltk3/TextBuffer.h
-factory.o: ../fltk3/TextEditor.h ../fltk3/TextDisplay.h ../fltk3/Clock.h
-factory.o: ../fltk3/HelpView.h ../fltk3/SharedImage.h ../fltk3/Progress.h
-factory.o: ../fltk3/Adjuster.h ../fltk3/Dial.h ../fltk3/Roller.h
-factory.o: ../fltk3/Output.h ../fltk3/Input.h ../fltk3/ValueInput.h
-factory.o: ../fltk3/ValueOutput.h ../fltk3/ValueSlider.h
-factory.o: ../fltk3/MultiLabel.h
-file.o: ../src/flstring.h ../fltk3/Export.h ../config.h alignment_panel.h
-file.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h ../fltk3/types.h
-file.o: ../fltk3/Xutf8.h ../fltk3/enumerations.h ../fltk3/TextBuffer.h
-file.o: ../fltk3/TextDisplay.h ../fltk3/draw.h ../fltk3/x.h ../fltk3/Window.h
-file.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Rectangle.h
-file.o: ../fltk3/Object.h ../fltk3/Wrapper.h ../fltk3/Widget.h
-file.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-file.o: ../fltk3/Object.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-file.o: ../fltk3/Image.h ../fltk3/Bitmap.h ../fltk3/Image.h ../fltk3/Pixmap.h
-file.o: ../fltk3/RGBImage.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-file.o: ../fltk3/Valuator.h ../fltk3/TextBuffer.h ../fltk3/filename.h
-file.o: ../fltk3/DoubleWindow.h ../fltk3/Tooltip.h ../fltk3/Button.h
-file.o: ../fltk3/TabGroup.h ../fltk3/Group.h ../fltk3/Box.h ../fltk3/Input.h
-file.o: ../fltk3/Input_.h ../fltk3/CheckButton.h ../fltk3/LightButton.h
-file.o: ../fltk3/Button.h ../fltk3/Choice.h ../fltk3/Menu_.h
-file.o: ../fltk3/MenuItem.h ../fltk3/IntInput.h ../fltk3/Input.h
-file.o: ../fltk3/Spinner.h ../fltk3/RepeatButton.h ../fltk3/run.h
-file.o: ../fltk3/ReturnButton.h ../fltk3/RoundButton.h workspace_panel.h
-file.o: Fl_Type.h ../fltk3/Menu.h Fluid_Image.h ../fltk3/SharedImage.h
-file.o: ../fltk3/draw.h ../fltk3/PackedGroup.h ../fltk3/WizardGroup.h
-file.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/InputChoice.h
-file.o: ../fltk3/MenuBar.h ../fltk3/MultiLabel.h ../fltk3/FileChooser.h
-file.o: ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h ../fltk3/Browser.h
-file.o: ../fltk3/Browser_.h ../fltk3/FileIcon.h ../fltk3/filename.h
-file.o: ../fltk3/FileInput.h ../fltk3/ask.h ../fltk3/message.h ../fltk3/ask.h
+Fl_Type.o: pixmaps/flTable.xpm pixmaps/flAppTarget.xpm
+Fl_Type.o: pixmaps/flLibTarget.xpm pixmaps/flFile.xpm pixmaps/flFolder.xpm
+Fl_Type.o: pixmaps/flFluidFile.xpm pixmaps/flCodeFile.xpm
+Fl_Type.o: pixmaps/flMenuNone.xpm pixmaps/flMenuMulti.xpm
+Fl_Type.o: pixmaps/flMenuAll.xpm pixmaps/flWorkspace.xpm
+Fl_Type.o: pixmaps/flDependency.xpm pixmaps/flOption.xpm
+Fl_Widget_Type.o: Fl_Widget_Type.h Fl_Type.h Fluid_Image.h alignment_panel.h
+Fl_Widget_Type.o: widget_panel.h Shortcut_Button.h CodeEditor.h
+Fl_Window_Type.o: Fl_Widget_Type.h Fl_Type.h Fluid_Image.h undo.h
+Fl_Window_Type.o: alignment_panel.h widget_panel.h Shortcut_Button.h
+Fl_Window_Type.o: CodeEditor.h
+Fluid_Image.o: Fl_Type.h Fluid_Image.h
+about_panel.o: about_panel.h
+align_widget.o: Fl_Widget_Type.h Fl_Type.h Fluid_Image.h undo.h
+alignment_panel.o: alignment_panel.h
+code.o: Fl_Type.h Fluid_Image.h alignment_panel.h
+factory.o: undo.h Fl_Widget_Type.h Fl_Type.h Fluid_Image.h
+file.o: alignment_panel.h workspace_panel.h Fl_Type.h Fluid_Image.h
 file.o: Fl_Widget_Type.h
-file_cmake.o: Fl_Type.h ../fltk3/Widget.h ../fltk3/DoubleWindow.h
-file_cmake.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-file_cmake.o: ../fltk3/enumerations.h ../fltk3/Export.h ../fltk3/types.h
-file_cmake.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-file_cmake.o: ../fltk3/Menu.h ../fltk3/MenuItem.h ../fltk3/Image.h
-file_cmake.o: ../fltk3/Plugin.h ../fltk3/Preferences.h Fluid_Image.h
-file_cmake.o: ../fltk3/SharedImage.h ../fltk3/run.h ../fltk3/utf8.h
-file_cmake.o: ../fltk3/Xutf8.h ../fltk3/draw.h ../fltk3/x.h
-file_cmake.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-file_cmake.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-file_cmake.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-file_cmake.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-file_cmake.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-file_cmake.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-file_cmake.o: ../fltk3/Input_.h ../fltk3/MenuBar.h ../fltk3/filename.h
-file_make.o: Fl_Type.h ../fltk3/Widget.h ../fltk3/DoubleWindow.h
-file_make.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-file_make.o: ../fltk3/enumerations.h ../fltk3/Export.h ../fltk3/types.h
-file_make.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-file_make.o: ../fltk3/Menu.h ../fltk3/MenuItem.h ../fltk3/Image.h
-file_make.o: ../fltk3/Plugin.h ../fltk3/Preferences.h Fluid_Image.h
-file_make.o: ../fltk3/SharedImage.h ../fltk3/run.h ../fltk3/utf8.h
-file_make.o: ../fltk3/Xutf8.h ../fltk3/draw.h ../fltk3/x.h
-file_make.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-file_make.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-file_make.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-file_make.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-file_make.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-file_make.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-file_make.o: ../fltk3/Input_.h ../fltk3/MenuBar.h ../fltk3/filename.h
-file_visualc.o: Fl_Type.h ../fltk3/Widget.h ../fltk3/DoubleWindow.h
-file_visualc.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-file_visualc.o: ../fltk3/enumerations.h ../fltk3/Export.h ../fltk3/types.h
-file_visualc.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-file_visualc.o: ../fltk3/Menu.h ../fltk3/MenuItem.h ../fltk3/Image.h
-file_visualc.o: ../fltk3/Plugin.h ../fltk3/Preferences.h Fluid_Image.h
-file_visualc.o: ../fltk3/SharedImage.h ../fltk3/run.h ../fltk3/utf8.h
-file_visualc.o: ../fltk3/Xutf8.h ../fltk3/draw.h ../fltk3/x.h
-file_visualc.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-file_visualc.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-file_visualc.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-file_visualc.o: ../fltk3/PackedGroup.h ../fltk3/Group.h
-file_visualc.o: ../fltk3/WizardGroup.h ../fltk3/Menu_.h ../fltk3/MenuButton.h
-file_visualc.o: ../fltk3/Menu_.h ../fltk3/Choice.h ../fltk3/InputChoice.h
-file_visualc.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/MenuBar.h
-file_visualc.o: ../fltk3/filename.h
-file_xcode.o: Fl_Type.h ../fltk3/Widget.h ../fltk3/DoubleWindow.h
-file_xcode.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-file_xcode.o: ../fltk3/enumerations.h ../fltk3/Export.h ../fltk3/types.h
-file_xcode.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-file_xcode.o: ../fltk3/Menu.h ../fltk3/MenuItem.h ../fltk3/Image.h
-file_xcode.o: ../fltk3/Plugin.h ../fltk3/Preferences.h Fluid_Image.h
-file_xcode.o: ../fltk3/SharedImage.h ../fltk3/run.h ../fltk3/utf8.h
-file_xcode.o: ../fltk3/Xutf8.h ../fltk3/draw.h ../fltk3/x.h
-file_xcode.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-file_xcode.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-file_xcode.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-file_xcode.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-file_xcode.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-file_xcode.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-file_xcode.o: ../fltk3/Input_.h ../fltk3/MenuBar.h ../fltk3/filename.h
-fluid.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h ../fltk3/types.h
-fluid.o: ../fltk3/Xutf8.h ../fltk3/enumerations.h ../fltk3/DoubleWindow.h
-fluid.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-fluid.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-fluid.o: ../fltk3/Widget.h ../fltk3/Box.h ../fltk3/Button.h
-fluid.o: ../fltk3/FileIcon.h ../fltk3/run.h ../fltk3/HelpDialog.h
-fluid.o: ../fltk3/Group.h ../fltk3/Input.h ../fltk3/Input_.h
-fluid.o: ../fltk3/HelpView.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-fluid.o: ../fltk3/Valuator.h ../fltk3/draw.h ../fltk3/x.h
-fluid.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-fluid.o: ../fltk3/Object.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-fluid.o: ../fltk3/Image.h ../fltk3/Bitmap.h ../fltk3/Image.h
-fluid.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/SharedImage.h
-fluid.o: ../fltk3/filename.h ../fltk3/HoldBrowser.h ../fltk3/Browser.h
-fluid.o: ../fltk3/Browser_.h ../fltk3/MenuBar.h ../fltk3/Menu_.h
-fluid.o: ../fltk3/MenuItem.h ../fltk3/ask.h ../fltk3/draw.h
-fluid.o: ../fltk3/FileChooser.h ../fltk3/Choice.h ../fltk3/MenuButton.h
-fluid.o: ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h ../fltk3/FileIcon.h
-fluid.o: ../fltk3/CheckButton.h ../fltk3/LightButton.h ../fltk3/Button.h
-fluid.o: ../fltk3/FileInput.h ../fltk3/ReturnButton.h ../fltk3/PNGImage.h
-fluid.o: ../fltk3/Printer.h ../fltk3/PagedDevice.h ../fltk3/PostScript.h
-fluid.o: ../fltk3/message.h ../fltk3/ask.h ../fltk3/filename.h
-fluid.o: ../src/flstring.h ../fltk3/Export.h ../config.h alignment_panel.h
-fluid.o: ../fltk3/TextBuffer.h ../fltk3/TextDisplay.h ../fltk3/TextBuffer.h
-fluid.o: ../fltk3/Tooltip.h ../fltk3/TabGroup.h ../fltk3/IntInput.h
-fluid.o: ../fltk3/Input.h ../fltk3/Spinner.h ../fltk3/RepeatButton.h
-fluid.o: ../fltk3/RoundButton.h function_panel.h ../fltk3/LightButton.h
-fluid.o: ../fltk3/TextEditor.h ../fltk3/TextDisplay.h CodeEditor.h
-fluid.o: template_panel.h ../fltk3/Browser.h workspace_panel.h Fl_Type.h
-fluid.o: ../fltk3/Menu.h Fluid_Image.h ../fltk3/SharedImage.h
-fluid.o: ../fltk3/PackedGroup.h ../fltk3/WizardGroup.h ../fltk3/Menu_.h
-fluid.o: ../fltk3/InputChoice.h ../fltk3/MultiLabel.h about_panel.h undo.h
-function_panel.o: function_panel.h ../fltk3/run.h ../fltk3/utf8.h
-function_panel.o: ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
-function_panel.o: ../fltk3/enumerations.h ../fltk3/DoubleWindow.h
-function_panel.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-function_panel.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-function_panel.o: ../fltk3/Widget.h ../fltk3/Group.h ../fltk3/Choice.h
-function_panel.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Image.h
-function_panel.o: ../fltk3/LightButton.h ../fltk3/Box.h ../fltk3/Input.h
-function_panel.o: ../fltk3/Input_.h ../fltk3/ReturnButton.h ../fltk3/Button.h
-function_panel.o: ../fltk3/Button.h ../fltk3/TextEditor.h
-function_panel.o: ../fltk3/TextDisplay.h ../fltk3/draw.h ../fltk3/x.h
-function_panel.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-function_panel.o: ../fltk3/Object.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-function_panel.o: ../fltk3/Image.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
-function_panel.o: ../fltk3/RGBImage.h ../fltk3/Scrollbar.h ../fltk3/Slider.h
-function_panel.o: ../fltk3/Valuator.h ../fltk3/TextBuffer.h CodeEditor.h
-function_panel.o: ../fltk3/TextBuffer.h ../fltk3/MenuButton.h
-function_panel.o: ../fltk3/TabGroup.h Fl_Type.h ../fltk3/Menu.h Fluid_Image.h
-function_panel.o: ../fltk3/SharedImage.h ../fltk3/draw.h
-function_panel.o: ../fltk3/PackedGroup.h ../fltk3/WizardGroup.h
-function_panel.o: ../fltk3/Menu_.h ../fltk3/InputChoice.h ../fltk3/MenuBar.h
+file_cmake.o: Fl_Type.h Fluid_Image.h
+file_make.o: Fl_Type.h Fluid_Image.h
+file_visualc_6.o: Fl_Type.h Fluid_Image.h
+file_visualc_2008.o: Fl_Type.h Fluid_Image.h
+file_visualc_2010.o: Fl_Type.h Fluid_Image.h
+file_xcode.o: Fl_Type.h Fluid_Image.h
+fluid.o: alignment_panel.h function_panel.h CodeEditor.h template_panel.h
+fluid.o: workspace_panel.h Fl_Type.h Fluid_Image.h about_panel.h undo.h
+function_panel.o: function_panel.h CodeEditor.h Fl_Type.h Fluid_Image.h
 function_panel.o: undo.h
-template_panel.o: template_panel.h ../fltk3/run.h ../fltk3/utf8.h
-template_panel.o: ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
-template_panel.o: ../fltk3/enumerations.h ../fltk3/DoubleWindow.h
-template_panel.o: ../fltk3/Window.h ../fltk3/Group.h ../fltk3/Widget.h
-template_panel.o: ../fltk3/Rectangle.h ../fltk3/Object.h ../fltk3/Wrapper.h
-template_panel.o: ../fltk3/Widget.h ../fltk3/Browser.h ../fltk3/Browser_.h
-template_panel.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-template_panel.o: ../fltk3/Image.h ../fltk3/Box.h ../fltk3/Input.h
-template_panel.o: ../fltk3/Input_.h ../fltk3/Group.h ../fltk3/Button.h
-template_panel.o: ../fltk3/ReturnButton.h ../fltk3/Button.h ../src/flstring.h
-template_panel.o: ../fltk3/Export.h ../config.h ../fltk3/filename.h
-template_panel.o: ../fltk3/ask.h ../fltk3/SharedImage.h
-template_panel.o: ../fltk3/Preferences.h
-undo.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h ../fltk3/types.h
-undo.o: ../fltk3/Xutf8.h ../fltk3/enumerations.h Fl_Type.h ../fltk3/Widget.h
-undo.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-undo.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
-undo.o: ../fltk3/Wrapper.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-undo.o: ../fltk3/Image.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-undo.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/draw.h ../fltk3/x.h
-undo.o: ../fltk3/enumerations.h ../fltk3/Window.h ../fltk3/Device.h
-undo.o: ../fltk3/Object.h ../fltk3/Image.h ../fltk3/Bitmap.h
-undo.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/TabGroup.h
-undo.o: ../fltk3/PackedGroup.h ../fltk3/Group.h ../fltk3/WizardGroup.h
-undo.o: ../fltk3/Menu_.h ../fltk3/MenuButton.h ../fltk3/Menu_.h
-undo.o: ../fltk3/Choice.h ../fltk3/InputChoice.h ../fltk3/Input.h
-undo.o: ../fltk3/Input_.h ../fltk3/MenuBar.h undo.h ../fltk3/filename.h
-undo.o: ../src/flstring.h ../fltk3/Export.h ../config.h
-widget_panel.o: widget_panel.h ../fltk3/run.h ../fltk3/utf8.h
-widget_panel.o: ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
-widget_panel.o: ../fltk3/enumerations.h Fl_Type.h ../fltk3/Widget.h
-widget_panel.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-widget_panel.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
-widget_panel.o: ../fltk3/Wrapper.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-widget_panel.o: ../fltk3/Image.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-widget_panel.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/draw.h
-widget_panel.o: ../fltk3/x.h ../fltk3/enumerations.h ../fltk3/Window.h
-widget_panel.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Image.h
-widget_panel.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-widget_panel.o: ../fltk3/TabGroup.h ../fltk3/PackedGroup.h ../fltk3/Group.h
-widget_panel.o: ../fltk3/WizardGroup.h ../fltk3/Menu_.h ../fltk3/MenuButton.h
-widget_panel.o: ../fltk3/Menu_.h ../fltk3/Choice.h ../fltk3/InputChoice.h
-widget_panel.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/MenuBar.h
-widget_panel.o: ../fltk3/Button.h ../fltk3/Box.h ../fltk3/ValueInput.h
-widget_panel.o: ../fltk3/Valuator.h ../fltk3/Input.h ../fltk3/LightButton.h
-widget_panel.o: Shortcut_Button.h CodeEditor.h ../fltk3/TextBuffer.h
-widget_panel.o: ../fltk3/TextEditor.h ../fltk3/TextDisplay.h ../fltk3/draw.h
-widget_panel.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/TextBuffer.h
-widget_panel.o: ../fltk3/ReturnButton.h ../fltk3/Button.h
-workspace_panel.o: workspace_panel.h ../fltk3/run.h ../fltk3/utf8.h
-workspace_panel.o: ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
-workspace_panel.o: ../fltk3/enumerations.h Fl_Type.h ../fltk3/Widget.h
-workspace_panel.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-workspace_panel.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
-workspace_panel.o: ../fltk3/Wrapper.h ../fltk3/Menu.h ../fltk3/MenuItem.h
-workspace_panel.o: ../fltk3/Image.h ../fltk3/Plugin.h ../fltk3/Preferences.h
-workspace_panel.o: Fluid_Image.h ../fltk3/SharedImage.h ../fltk3/draw.h
-workspace_panel.o: ../fltk3/x.h ../fltk3/enumerations.h ../fltk3/Window.h
-workspace_panel.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Image.h
-workspace_panel.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-workspace_panel.o: ../fltk3/TabGroup.h ../fltk3/PackedGroup.h
-workspace_panel.o: ../fltk3/Group.h ../fltk3/WizardGroup.h ../fltk3/Menu_.h
-workspace_panel.o: ../fltk3/MenuButton.h ../fltk3/Menu_.h ../fltk3/Choice.h
-workspace_panel.o: ../fltk3/InputChoice.h ../fltk3/Input.h ../fltk3/Input_.h
-workspace_panel.o: ../fltk3/MenuBar.h ../fltk3/MultiLabel.h ../fltk3/Box.h
-workspace_panel.o: ../fltk3/Button.h ../fltk3/ReturnButton.h
-workspace_panel.o: ../fltk3/Button.h
+template_panel.o: template_panel.h
+undo.o: Fl_Type.h Fluid_Image.h undo.h
+widget_panel.o: widget_panel.h Fl_Type.h Fluid_Image.h Shortcut_Button.h
+widget_panel.o: CodeEditor.h
+workspace_panel.o: workspace_panel.h Fl_Type.h Fluid_Image.h

Modified: branches/branch-3.0/fluid/template_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/template_panel.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/template_panel.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -30,7 +30,7 @@
 #include "template_panel.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #include <errno.h>
 #include <fltk3/filename.h>
 #include <fltk3/ask.h>

Modified: branches/branch-3.0/fluid/undo.cxx
===================================================================
--- branches/branch-3.0/fluid/undo.cxx	2011-08-22 13:59:12 UTC (rev 8990)
+++ branches/branch-3.0/fluid/undo.cxx	2011-08-22 15:21:44 UTC (rev 8991)
@@ -30,7 +30,7 @@
 #include "undo.h"
 #include <fltk3/Preferences.h>
 #include <fltk3/filename.h>
-#include "../src/flstring.h"
+#include "../src/core/flstring.h"
 #if defined(WIN32) && !defined(__CYGWIN__)
 #  include <io.h>
 #  include <windows.h>

Deleted: branches/branch-3.0/ide/VisualC2008/fltk.vcproj

Copied: branches/branch-3.0/ide/VisualC2008/fltk3.vcproj (from rev 8989, branches/branch-3.0/ide/VisualC2008/fltk.vcproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3.vcproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2008/fltk3.vcproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,3616 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fltk"
+	ProjectGUID="{57369729-6B61-4DCD-9289-79E0E2A168E8}"
+	RootNamespace="fltk"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_debug\fltk.pch"
+				AssemblerListingLocation=".\fltk_debug\"
+				ObjectFile=".\fltk_debug\"
+				ProgramDataBaseFileName=".\fltk_debug\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltkd.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_release\fltk.pch"
+				AssemblerListingLocation=".\fltk_release\"
+				ObjectFile=".\fltk_release\"
+				ProgramDataBaseFileName=".\fltk_release\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\Fl.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Adjuster.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Bitmap.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Box.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Browser.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Browser_.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Browser_load.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Chart.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Check_Browser.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Check_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Choice.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Clock.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Color_Chooser.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Counter.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Device.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Dial.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Double_Window.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_File_Browser.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_File_Chooser.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_File_Chooser2.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_File_Icon.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_File_Input.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Group.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Help_View.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Input.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Input_.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Light_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu_.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu_Bar.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu_Window.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu_add.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Menu_global.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Multi_Label.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Native_File_Chooser.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Overlay_Window.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Pack.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Paged_Device.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Pixmap.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Positioner.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Printer.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Preferences.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Progress.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Repeat_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Return_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Roller.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Round_Button.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Scroll.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Scrollbar.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Shared_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Single_Window.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Slider.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Style.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Sys_Menu_Bar.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Table.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Table_Row.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tabs.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Text_Display.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Text_Editor.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tile.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tooltip.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tree.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tree_Item.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tree_Item_Array.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Tree_Prefs.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Valuator.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Value_Input.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Value_Output.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Value_Slider.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Widget.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Window.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Window_iconize.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Wizard.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_XBM_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_XPM_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_abort.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_add_idle.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_arg.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_compose.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_display.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_get_key.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_get_system_colors.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_grab.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_lock.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_own_colormap.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_visual.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_x.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_absolute.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_expand.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_ext.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_isdir.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_list.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_match.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\filename_setext.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_arc.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_arci.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_ask.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_boxtype.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_call_main.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_color.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_cursor.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_curve.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_diamond_box.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_dnd.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_draw.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_draw_image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_draw_pixmap.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_encoding_latin1.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_encoding_mac_roman.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_engraved_label.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_file_dir.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_font.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_gtk.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_labeltype.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_line_style.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_open_uri.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_oval_box.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_overlay.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_overlay_visual.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_plastic.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_read_image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_rect.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_round_box.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_rounded_box.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_scroll_area.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_set_font.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_set_fonts.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_shadow_box.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_shortcut.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_show_colormap.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_symbols.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_utf8.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_utf.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_vertex.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\numericsort.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\ps_image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\scandir.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\screen_xywh.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\flstring.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\vsnprintf.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\xutf8\case.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\xutf8\is_right2left.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\xutf8\is_spacing.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj (from rev 8988, branches/branch-3.0/ide/VisualC2008/fltk_gl.vcproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fltk_gl"
+	ProjectGUID="{F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}"
+	RootNamespace="fltk_gl"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_gl_debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_gl_debug\fltk_gl.pch"
+				AssemblerListingLocation=".\fltk_gl_debug\"
+				ObjectFile=".\fltk_gl_debug\"
+				ProgramDataBaseFileName=".\fltk_gl_debug\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_gld.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_gl_release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_gl_release\fltk_gl.pch"
+				AssemblerListingLocation=".\fltk_gl_release\"
+				ObjectFile=".\fltk_gl_release\"
+				ProgramDataBaseFileName=".\fltk_gl_release\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_gl.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\Fl_Gl_Choice.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Gl_Device_Plugin.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Gl_Overlay.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Gl_Window.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\freeglut_geometry.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\freeglut_stroke_mono_roman.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\freeglut_stroke_roman.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\freeglut_teapot.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\gl_draw.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\glut_compatability.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\glut_font.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj (from rev 8988, branches/branch-3.0/ide/VisualC2008/fltk_images.vcproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fltk_images"
+	ProjectGUID="{9BDDFD0A-6B25-4532-8AAF-897D526A845D}"
+	RootNamespace="fltk_images"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_images_debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_images_debug\fltk_images.pch"
+				AssemblerListingLocation=".\fltk_images_debug\"
+				ObjectFile=".\fltk_images_debug\"
+				ProgramDataBaseFileName=".\fltk_images_debug\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_imagesd.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_images_release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_images_release\fltk_images.pch"
+				AssemblerListingLocation=".\fltk_images_release\"
+				ObjectFile=".\fltk_images_release\"
+				ProgramDataBaseFileName=".\fltk_images_release\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_images.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\Fl_BMP_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_File_Icon2.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_GIF_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Help_Dialog.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_JPEG_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_PNG_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_PNM_Image.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_images_core.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj (from rev 8988, branches/branch-3.0/ide/VisualC2008/fltk_jpeg.vcproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,1224 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fltk_jpeg"
+	ProjectGUID="{417DB0F9-647A-4A36-ADFF-4196F7C1963D}"
+	RootNamespace="fltk_jpeg"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_jpeg_debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_jpeg_debug\fltk_jpeg.pch"
+				AssemblerListingLocation=".\fltk_jpeg_debug\"
+				ObjectFile=".\fltk_jpeg_debug\"
+				ProgramDataBaseFileName=".\fltk_jpeg_debug\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_jpegd.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_jpeg_release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_jpeg_release\fltk_jpeg.pch"
+				AssemblerListingLocation=".\fltk_jpeg_release\"
+				ObjectFile=".\fltk_jpeg_release\"
+				ProgramDataBaseFileName=".\fltk_jpeg_release\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_jpeg.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\jpeg\jaricom.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcarith.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdarith.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcapimin.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcapistd.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jccoefct.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jccolor.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcdctmgr.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jchuff.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcinit.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcmainct.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcmarker.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcmaster.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcomapi.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcparam.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcprepct.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jcsample.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jctrans.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdapimin.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdapistd.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdatadst.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdatasrc.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdcoefct.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdcolor.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jddctmgr.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdhuff.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdinput.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdmainct.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdmarker.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdmaster.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdmerge.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdpostct.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdsample.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jdtrans.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jerror.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jfdctflt.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jfdctfst.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jfdctint.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jidctflt.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jidctfst.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jidctint.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jmemmgr.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jmemnobs.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jquant1.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jquant2.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\jpeg\jutils.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj (from rev 8988, branches/branch-3.0/ide/VisualC2008/fltk_png.vcproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fltk_png"
+	ProjectGUID="{AF7CC2D4-BBC7-4995-B18D-6A590C267527}"
+	RootNamespace="fltk_png"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_png_debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_png_debug\fltk_png.pch"
+				AssemblerListingLocation=".\fltk_png_debug\"
+				ObjectFile=".\fltk_png_debug\"
+				ProgramDataBaseFileName=".\fltk_png_debug\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_pngd.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_png_release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_png_release\fltk_png.pch"
+				AssemblerListingLocation=".\fltk_png_release\"
+				ObjectFile=".\fltk_png_release\"
+				ProgramDataBaseFileName=".\fltk_png_release\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_png.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\png\png.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngerror.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngget.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngmem.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngpread.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngread.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngrio.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngrtran.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngrutil.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngset.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngtrans.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngwio.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngwrite.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngwtran.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\png\pngwutil.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj (from rev 8988, branches/branch-3.0/ide/VisualC2008/fltk_zlib.vcproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fltk_zlib"
+	ProjectGUID="{2F487ADB-AB3A-44B1-A824-D25C00A2D30A}"
+	RootNamespace="fltk_zlib"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_zlib_debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_zlib_debug\fltk_zlib.pch"
+				AssemblerListingLocation=".\fltk_zlib_debug\"
+				ObjectFile=".\fltk_zlib_debug\"
+				ProgramDataBaseFileName=".\fltk_zlib_debug\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_zlibd.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib"
+			IntermediateDirectory=".\fltk_zlib_release"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="2"
+				AdditionalIncludeDirectories=".;..\..;..\..\zlib;..\..\png;..\..\jpeg"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\fltk_zlib_release\fltk_zlib.pch"
+				AssemblerListingLocation=".\fltk_zlib_release\"
+				ObjectFile=".\fltk_zlib_release\"
+				ProgramDataBaseFileName=".\fltk_zlib_release\"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\fltk_zlib.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\zlib\adler32.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\compress.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\crc32.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\deflate.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\gzclose.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\gzlib.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\gzread.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\gzwrite.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\infback.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\inffast.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\inflate.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\inftrees.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\trees.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\uncompr.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\..\zlib\zutil.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Deleted: branches/branch-3.0/ide/VisualC2008/fltk_gl.vcproj

Deleted: branches/branch-3.0/ide/VisualC2008/fltk_images.vcproj

Deleted: branches/branch-3.0/ide/VisualC2008/fltk_jpeg.vcproj

Deleted: branches/branch-3.0/ide/VisualC2008/fltk_png.vcproj

Deleted: branches/branch-3.0/ide/VisualC2008/fltk_zlib.vcproj

Deleted: branches/branch-3.0/ide/VisualC2010/fltk.vcxproj

Copied: branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj (from rev 8989, branches/branch-3.0/ide/VisualC2010/fltk.vcxproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,1150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>fltk</ProjectName>
+    <ProjectGuid>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</ProjectGuid>
+    <RootNamespace>fltk</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(ProjectName)_debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(ProjectName)_release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltkd.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\Fl.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Adjuster.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Bitmap.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Box.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Browser.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Browser_.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Browser_load.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Chart.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Check_Browser.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Check_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Choice.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Clock.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Color_Chooser.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Counter.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Device.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Dial.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Double_Window.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_File_Browser.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_File_Chooser.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_File_Chooser2.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_File_Icon.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_File_Input.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Group.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Help_View.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Input.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Input_.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Light_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu_.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu_Bar.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu_Window.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu_add.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Menu_global.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Multi_Label.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Native_File_Chooser.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Overlay_Window.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Pack.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Paged_Device.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Pixmap.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Positioner.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Printer.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Preferences.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Progress.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Repeat_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Return_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Roller.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Round_Button.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Scroll.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Scrollbar.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Shared_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Single_Window.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Slider.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Style.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Sys_Menu_Bar.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Table.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Table_Row.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tabs.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Text_Buffer.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Text_Display.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Text_Editor.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tile.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tiled_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tooltip.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tree.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tree_Item.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tree_Item_Array.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Tree_Prefs.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Valuator.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Value_Input.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Value_Output.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Value_Slider.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Widget.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Window.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Window_fullscreen.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Window_hotspot.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Window_iconize.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Wizard.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_XBM_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_XPM_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_abort.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_add_idle.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_arg.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_compose.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_display.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_get_key.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_get_system_colors.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_grab.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_lock.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_own_colormap.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_visual.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_x.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_absolute.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_expand.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_ext.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_isdir.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_list.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_match.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filename_setext.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_arc.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_arci.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_ask.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_boxtype.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_call_main.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_color.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_cursor.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_curve.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_diamond_box.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_dnd.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_draw.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_draw_image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_draw_pixmap.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_encoding_latin1.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_encoding_mac_roman.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_engraved_label.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_file_dir.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_font.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_gtk.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_labeltype.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_line_style.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_open_uri.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_oval_box.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_overlay.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_overlay_visual.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_plastic.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_read_image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_rect.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_round_box.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_rounded_box.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_scroll_area.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_set_font.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_set_fonts.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_shadow_box.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_shortcut.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_show_colormap.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_symbols.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_utf8.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_utf.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_vertex.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\numericsort.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ps_image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\scandir.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\screen_xywh.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\flstring.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\vsnprintf.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xutf8\case.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xutf8\is_right2left.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xutf8\is_spacing.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj (from rev 8988, branches/branch-3.0/ide/VisualC2010/fltk_gl.vcxproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>fltk_gl</ProjectName>
+    <ProjectGuid>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</ProjectGuid>
+    <RootNamespace>fltk_gl</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(ProjectName)_debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(ProjectName)_release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_gld.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_gl.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\Fl_Gl_Choice.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Gl_Device_Plugin.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Gl_Overlay.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Gl_Window.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\freeglut_geometry.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\freeglut_stroke_mono_roman.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\freeglut_stroke_roman.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\freeglut_teapot.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gl_draw.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\glut_compatability.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\glut_font.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="fltk.vcxproj">
+      <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj (from rev 8988, branches/branch-3.0/ide/VisualC2010/fltk_images.vcxproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>fltk_images</ProjectName>
+    <ProjectGuid>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</ProjectGuid>
+    <RootNamespace>fltk_images</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(ProjectName)_debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(ProjectName)_release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_imagesd.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_images.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\Fl_BMP_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_File_Icon2.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_GIF_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Help_Dialog.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_JPEG_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_PNG_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Fl_PNM_Image.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fl_images_core.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="fltk.vcxproj">
+      <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="fltk_png.vcxproj">
+      <Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="fltk_jpeg.vcxproj">
+      <Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj (from rev 8988, branches/branch-3.0/ide/VisualC2010/fltk_jpeg.vcxproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>fltk_jpeg</ProjectName>
+    <ProjectGuid>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</ProjectGuid>
+    <RootNamespace>fltk_jpeg</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(ProjectName)_debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(ProjectName)_release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_jpegd.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_jpeg.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\jpeg\jaricom.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcarith.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdarith.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcapimin.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcapistd.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jccoefct.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jccolor.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcdctmgr.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jchuff.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcinit.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcmainct.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcmarker.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcmaster.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcomapi.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcparam.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcprepct.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jcsample.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jctrans.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdapimin.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdapistd.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdatadst.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdatasrc.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdcoefct.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdcolor.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jddctmgr.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdhuff.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdinput.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdmainct.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdmarker.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdmaster.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdmerge.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdpostct.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdsample.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jdtrans.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jerror.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jfdctflt.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jfdctfst.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jfdctint.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jidctflt.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jidctfst.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jidctint.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jmemmgr.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jmemnobs.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jquant1.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jquant2.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jutils.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="fltk.vcxproj">
+      <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj (from rev 8988, branches/branch-3.0/ide/VisualC2010/fltk_png.vcxproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>fltk_png</ProjectName>
+    <ProjectGuid>{A6556097-732F-4D5C-9763-96A896DA0F8F}</ProjectGuid>
+    <RootNamespace>fltk_png</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(ProjectName)_debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(ProjectName)_release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_pngd.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_png.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\png\png.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngerror.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngget.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngmem.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngpread.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngread.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngrio.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngrtran.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngrutil.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngset.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngtrans.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngwio.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngwrite.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngwtran.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\png\pngwutil.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="fltk.vcxproj">
+      <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="fltk_zlib.vcxproj">
+      <Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj (from rev 8988, branches/branch-3.0/ide/VisualC2010/fltk_zlib.vcxproj)
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>fltk_zlib</ProjectName>
+    <ProjectGuid>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</ProjectGuid>
+    <RootNamespace>fltk_zlib</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(ProjectName)_debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(ProjectName)_release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_zlibd.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+<BrowseInformation>true</BrowseInformation>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+    <OutputFile>..\..\lib\fltk_zlib.lib</OutputFile>
+    <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\zlib\adler32.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\compress.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\crc32.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\deflate.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\gzclose.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\gzlib.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\gzread.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\gzwrite.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\infback.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\inffast.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\inflate.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\inftrees.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\trees.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\uncompr.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zutil.c">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="fltk.vcxproj">
+      <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Deleted: branches/branch-3.0/ide/VisualC2010/fltk_gl.vcxproj

Deleted: branches/branch-3.0/ide/VisualC2010/fltk_images.vcxproj

Deleted: branches/branch-3.0/ide/VisualC2010/fltk_jpeg.vcxproj

Deleted: branches/branch-3.0/ide/VisualC2010/fltk_png.vcxproj

Deleted: branches/branch-3.0/ide/VisualC2010/fltk_zlib.vcxproj

Deleted: branches/branch-3.0/ide/VisualC6/fltk.dsp

Copied: branches/branch-3.0/ide/VisualC6/fltk3.dsp (from rev 8989, branches/branch-3.0/ide/VisualC6/fltk.dsp)
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3.dsp	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC6/fltk3.dsp	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,685 @@
+# Microsoft Developer Studio Project File - Name="fltk" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk.mak" CFG="fltk - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fltk - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release\fltk"
+# PROP BASE Intermediate_Dir "Release\fltk"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\fltk"
+# PROP Intermediate_Dir "Release\fltk"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk.lib"
+
+!ELSEIF  "$(CFG)" == "fltk - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug\fltk"
+# PROP BASE Intermediate_Dir "Debug\fltk"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\fltk"
+# PROP Intermediate_Dir "Debug\fltk"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltkd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk - Win32 Release"
+# Name "fltk - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\src\Fl.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Adjuster.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Bitmap.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Box.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Browser.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Browser_.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Browser_load.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Chart.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Check_Browser.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Check_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Choice.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Clock.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Color_Chooser.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Counter.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Device.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Dial.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Double_Window.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Browser.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Chooser.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Chooser2.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Icon.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Input.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Group.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Help_View.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Input.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Input_.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Light_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_Bar.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_Window.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_add.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Menu_global.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Multi_Label.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Native_File_Chooser.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Overlay_Window.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Pack.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Paged_Device.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Pixmap.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Positioner.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Printer.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Preferences.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Progress.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Repeat_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Return_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Roller.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Round_Button.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Scroll.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Scrollbar.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Shared_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Single_Window.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Slider.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Style.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Sys_Menu_Bar.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Table.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Table_Row.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tabs.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Text_Buffer.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Text_Display.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Text_Editor.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tile.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tiled_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tooltip.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tree.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tree_Item.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tree_Item_Array.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Tree_Prefs.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Valuator.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Value_Input.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Value_Output.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Value_Slider.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Widget.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window_fullscreen.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window_hotspot.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Window_iconize.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Wizard.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_XBM_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_XPM_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_abort.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_add_idle.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_arg.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_compose.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_display.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_get_key.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_get_system_colors.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_grab.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_lock.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_own_colormap.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_visual.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_x.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_absolute.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_expand.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_ext.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_isdir.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_list.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_match.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filename_setext.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_arc.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_arci.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_ask.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_boxtype.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_call_main.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_color.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_cursor.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_curve.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_diamond_box.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_dnd.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_draw.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_draw_image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_draw_pixmap.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_encoding_latin1.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_encoding_mac_roman.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_engraved_label.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_file_dir.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_font.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_gtk.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_labeltype.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_line_style.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_open_uri.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_oval_box.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_overlay.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_overlay_visual.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_plastic.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_read_image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_rect.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_round_box.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_rounded_box.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_scroll_area.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_set_font.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_set_fonts.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_shadow_box.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_shortcut.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_show_colormap.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_symbols.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_utf8.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_utf.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_vertex.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\numericsort.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ps_image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\scandir.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\screen_xywh.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\flstring.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\vsnprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xutf8\case.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xutf8\is_right2left.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xutf8\is_spacing.c
+# End Source File
+# End Target
+# End Project

Copied: branches/branch-3.0/ide/VisualC6/fltk3gl.dsp (from rev 8988, branches/branch-3.0/ide/VisualC6/fltk_gl.dsp)
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3gl.dsp	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC6/fltk3gl.dsp	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,129 @@
+# Microsoft Developer Studio Project File - Name="fltk_gl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk_gl - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_gl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_gl.mak" CFG="fltk_gl - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_gl - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_gl - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fltk_gl - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release\fltk_gl"
+# PROP BASE Intermediate_Dir "Release\fltk_gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\fltk_gl"
+# PROP Intermediate_Dir "Release\fltk_gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_gl.lib"
+
+!ELSEIF  "$(CFG)" == "fltk_gl - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug\fltk_gl"
+# PROP BASE Intermediate_Dir "Debug\fltk_gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\fltk_gl"
+# PROP Intermediate_Dir "Debug\fltk_gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_gld.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_gl - Win32 Release"
+# Name "fltk_gl - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Choice.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Device_Plugin.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Overlay.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Gl_Window.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_geometry.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_stroke_mono_roman.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_stroke_roman.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\freeglut_teapot.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gl_draw.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\glut_compatability.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\glut_font.cxx
+# End Source File
+# End Target
+# End Project

Copied: branches/branch-3.0/ide/VisualC6/fltk3images.dsp (from rev 8988, branches/branch-3.0/ide/VisualC6/fltk_images.dsp)
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3images.dsp	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC6/fltk3images.dsp	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,117 @@
+# Microsoft Developer Studio Project File - Name="fltk_images" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk_images - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_images.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_images.mak" CFG="fltk_images - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_images - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_images - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fltk_images - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release\fltk_images"
+# PROP BASE Intermediate_Dir "Release\fltk_images"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\fltk_images"
+# PROP Intermediate_Dir "Release\fltk_images"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_images.lib"
+
+!ELSEIF  "$(CFG)" == "fltk_images - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug\fltk_images"
+# PROP BASE Intermediate_Dir "Debug\fltk_images"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\fltk_images"
+# PROP Intermediate_Dir "Debug\fltk_images"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_imagesd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_images - Win32 Release"
+# Name "fltk_images - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\src\Fl_BMP_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_File_Icon2.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_GIF_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_Help_Dialog.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_JPEG_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_PNG_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Fl_PNM_Image.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fl_images_core.cxx
+# End Source File
+# End Target
+# End Project

Copied: branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp (from rev 8988, branches/branch-3.0/ide/VisualC6/fltk_jpeg.dsp)
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,269 @@
+# Microsoft Developer Studio Project File - Name="fltk_jpeg" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk_jpeg - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_jpeg.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_jpeg.mak" CFG="fltk_jpeg - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_jpeg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_jpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fltk_jpeg - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release\fltk_jpeg"
+# PROP BASE Intermediate_Dir "Release\fltk_jpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\fltk_jpeg"
+# PROP Intermediate_Dir "Release\fltk_jpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_jpeg.lib"
+
+!ELSEIF  "$(CFG)" == "fltk_jpeg - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug\fltk_jpeg"
+# PROP BASE Intermediate_Dir "Debug\fltk_jpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\fltk_jpeg"
+# PROP Intermediate_Dir "Debug\fltk_jpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_jpegd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_jpeg - Win32 Release"
+# Name "fltk_jpeg - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\jpeg\jaricom.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcarith.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdarith.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcapimin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcapistd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jccoefct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jccolor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcdctmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jchuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcmainct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcmarker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcmaster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcomapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcparam.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcprepct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jcsample.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jctrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdapimin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdapistd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdatadst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdatasrc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdcoefct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdcolor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jddctmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdhuff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdinput.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdmainct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdmarker.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdmaster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdmerge.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdpostct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdsample.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jdtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jfdctflt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jfdctfst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jfdctint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jidctflt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jidctfst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jidctint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jmemmgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jmemnobs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jquant1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jquant2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jpeg\jutils.c
+# End Source File
+# End Target
+# End Project

Copied: branches/branch-3.0/ide/VisualC6/fltk3png.dsp (from rev 8988, branches/branch-3.0/ide/VisualC6/fltk_png.dsp)
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3png.dsp	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC6/fltk3png.dsp	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,145 @@
+# Microsoft Developer Studio Project File - Name="fltk_png" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk_png - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_png.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_png.mak" CFG="fltk_png - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_png - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_png - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fltk_png - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release\fltk_png"
+# PROP BASE Intermediate_Dir "Release\fltk_png"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\fltk_png"
+# PROP Intermediate_Dir "Release\fltk_png"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_png.lib"
+
+!ELSEIF  "$(CFG)" == "fltk_png - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug\fltk_png"
+# PROP BASE Intermediate_Dir "Debug\fltk_png"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\fltk_png"
+# PROP Intermediate_Dir "Debug\fltk_png"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_pngd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_png - Win32 Release"
+# Name "fltk_png - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\png\png.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngget.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngpread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngrio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngrtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngrutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngwio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngwtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\png\pngwutil.c
+# End Source File
+# End Target
+# End Project

Copied: branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp (from rev 8988, branches/branch-3.0/ide/VisualC6/fltk_zlib.dsp)
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp	                        (rev 0)
+++ branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,145 @@
+# Microsoft Developer Studio Project File - Name="fltk_zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=fltk_zlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_zlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fltk_zlib.mak" CFG="fltk_zlib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fltk_zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk_zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fltk_zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release\fltk_zlib"
+# PROP BASE Intermediate_Dir "Release\fltk_zlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release\fltk_zlib"
+# PROP Intermediate_Dir "Release\fltk_zlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# SUBTRACT CPP /Os
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_zlib.lib"
+
+!ELSEIF  "$(CFG)" == "fltk_zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug\fltk_zlib"
+# PROP BASE Intermediate_Dir "Debug\fltk_zlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug\fltk_zlib"
+# PROP Intermediate_Dir "Debug\fltk_zlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\fltk_zlibd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fltk_zlib - Win32 Release"
+# Name "fltk_zlib - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\..\zlib\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\gzclose.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\gzlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\gzread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\gzwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\infback.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\zlib\zutil.c
+# End Source File
+# End Target
+# End Project

Deleted: branches/branch-3.0/ide/VisualC6/fltk_gl.dsp

Deleted: branches/branch-3.0/ide/VisualC6/fltk_images.dsp

Deleted: branches/branch-3.0/ide/VisualC6/fltk_jpeg.dsp

Deleted: branches/branch-3.0/ide/VisualC6/fltk_png.dsp

Deleted: branches/branch-3.0/ide/VisualC6/fltk_zlib.dsp

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk-Info.plist

Copied: branches/branch-3.0/ide/Xcode4/plists/fltk3-Info.plist (from rev 8988, branches/branch-3.0/ide/Xcode4/plists/fltk-Info.plist)
===================================================================
--- branches/branch-3.0/ide/Xcode4/plists/fltk3-Info.plist	                        (rev 0)
+++ branches/branch-3.0/ide/Xcode4/plists/fltk3-Info.plist	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fltk</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Part of the FLTK library. Please visit www.fltk.org.</string>
+</dict>
+	</plist>

Copied: branches/branch-3.0/ide/Xcode4/plists/fltk3gl-Info.plist (from rev 8988, branches/branch-3.0/ide/Xcode4/plists/fltk_gl-Info.plist)
===================================================================
--- branches/branch-3.0/ide/Xcode4/plists/fltk3gl-Info.plist	                        (rev 0)
+++ branches/branch-3.0/ide/Xcode4/plists/fltk3gl-Info.plist	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fltk_gl</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Part of the FLTK library. Please visit www.fltk.org.</string>
+</dict>
+	</plist>

Copied: branches/branch-3.0/ide/Xcode4/plists/fltk3images-Info.plist (from rev 8988, branches/branch-3.0/ide/Xcode4/plists/fltk_images-Info.plist)
===================================================================
--- branches/branch-3.0/ide/Xcode4/plists/fltk3images-Info.plist	                        (rev 0)
+++ branches/branch-3.0/ide/Xcode4/plists/fltk3images-Info.plist	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fltk_images</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Part of the FLTK library. Please visit www.fltk.org.</string>
+</dict>
+	</plist>

Copied: branches/branch-3.0/ide/Xcode4/plists/fltk3jpeg-Info.plist (from rev 8988, branches/branch-3.0/ide/Xcode4/plists/fltk_jpeg-Info.plist)
===================================================================
--- branches/branch-3.0/ide/Xcode4/plists/fltk3jpeg-Info.plist	                        (rev 0)
+++ branches/branch-3.0/ide/Xcode4/plists/fltk3jpeg-Info.plist	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fltk_jpeg</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Part of the FLTK library. Please visit www.fltk.org.</string>
+</dict>
+	</plist>

Copied: branches/branch-3.0/ide/Xcode4/plists/fltk3png-Info.plist (from rev 8988, branches/branch-3.0/ide/Xcode4/plists/fltk_png-Info.plist)
===================================================================
--- branches/branch-3.0/ide/Xcode4/plists/fltk3png-Info.plist	                        (rev 0)
+++ branches/branch-3.0/ide/Xcode4/plists/fltk3png-Info.plist	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fltk_png</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Part of the FLTK library. Please visit www.fltk.org.</string>
+</dict>
+	</plist>

Copied: branches/branch-3.0/ide/Xcode4/plists/fltk3zlib-Info.plist (from rev 8988, branches/branch-3.0/ide/Xcode4/plists/fltk_zlib-Info.plist)
===================================================================
--- branches/branch-3.0/ide/Xcode4/plists/fltk3zlib-Info.plist	                        (rev 0)
+++ branches/branch-3.0/ide/Xcode4/plists/fltk3zlib-Info.plist	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fltk_zlib</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2010 by Bill Spitzak and others.</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Part of the FLTK library. Please visit www.fltk.org.</string>
+</dict>
+	</plist>

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk_forms-Info.plist

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk_gl-Info.plist

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk_images-Info.plist

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk_jpeg-Info.plist

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk_png-Info.plist

Deleted: branches/branch-3.0/ide/Xcode4/plists/fltk_zlib-Info.plist

Copied: branches/branch-3.0/include/FL (from rev 8987, branches/branch-3.0/FL)

Copied: branches/branch-3.0/include/GL (from rev 8987, branches/branch-3.0/GL)

Copied: branches/branch-3.0/include/fltk (from rev 8987, branches/branch-3.0/fltk)

Copied: branches/branch-3.0/include/fltk3 (from rev 8987, branches/branch-3.0/fltk3)

Deleted: branches/branch-3.0/include/fltk3/Browser_.h

Copied: branches/branch-3.0/include/fltk3/Browser_.h (from rev 8988, branches/branch-3.0/fltk3/Browser_.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Browser_.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Browser_.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,352 @@
+//
+// "$Id: Browser_.h 8275 2011-01-13 22:07:31Z manolo $"
+//
+// Common browser header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Browser_ widget . */
+
+#ifndef Fltk3_Browser__H
+#define Fltk3_Browser__H
+
+#include "Group.h"
+#include "Scrollbar.h"
+#include <fltk3/run.h>		// fltk3::scrollbar_size()
+
+class Fl_Browser_;
+
+namespace fltk3 {
+  
+  const uchar NORMAL_BROWSER	= 0;	/**< type() of fltk3::Browser */
+  const uchar SELECT_BROWSER	= 1;	/**< type() of fltk3::SelectBrowser */
+  const uchar HOLD_BROWSER	= 2;	/**< type() of fltk3::HoldBrowser */
+  const uchar MULTI_BROWSER	= 3;	/**< type() of fltk3::MultiBrowser */
+  
+  const uchar SORT_ASCENDING	= 0;	/**< sort browser items in ascending alphabetic order. */
+  const uchar SORT_DESCENDING	= 1;	/**< sort in descending order */
+  
+  /**
+   This is the base class for browsers.  To be useful it must be
+   subclassed and several virtual functions defined.  The Forms-compatible
+   browser and the file chooser's browser are subclassed off of this.
+   
+   This has been designed so that the subclass has complete control
+   over the storage of the data, although because next() and 
+   prev() functions are used to index, it works best as a linked list
+   or as a large block of characters in which the line breaks must be
+   searched for.
+   
+   A great deal of work has been done so that the "height" of a data
+   object does not need to be determined until it is drawn.  This is
+   useful if actually figuring out the size of an object requires
+   accessing image data or doing stat() on a file or doing some
+   other slow operation.
+   */
+  class FLTK3_EXPORT Browser_ : public fltk3::Group {
+
+    friend class ::Fl_Browser_;
+
+    int position_;	// where user wants it scrolled to
+    int real_position_;	// the current vertical scrolling position
+    int hposition_;	// where user wants it panned to
+    int real_hposition_;	// the current horizontal scrolling position
+    int offset_;		// how far down top_ item the real_position is
+    int max_width;	// widest object seen so far
+    uchar has_scrollbar_;	// which scrollbars are enabled
+    void* top_;		// which item scrolling position is in
+    void* selection_;	// which is selected (except for fltk3::MULTI_BROWSER)
+    void *redraw1,*redraw2; // minimal update pointers
+    void* max_width_item;	// which item has max_width_
+    int scrollbar_size_;	// size of scrollbar trough
+    
+    void update_top();
+    
+  protected:
+    
+    // All of the following must be supplied by the subclass:
+    /**
+     This method must be provided by the subclass 
+     to return the first item in the list.
+     \see item_first(), item_next(), item_last(), item_prev()
+     */
+    virtual void *item_first() const;
+    /**
+     This method must be provided by the subclass
+     to return the item in the list after \p item.
+     \see item_first(), item_next(), item_last(), item_prev()
+     */
+    virtual void *item_next(void *item) const;
+    /**
+     This method must be provided by the subclass
+     to return the item in the list before \p item.
+     \see item_first(), item_next(), item_last(), item_prev()
+     */
+    virtual void *item_prev(void *item) const;
+    /**
+     This method must be provided by the subclass
+     to return the last item in the list.
+     \see item_first(), item_next(), item_last(), item_prev()
+     */
+    virtual void *item_last() const;
+    /** 
+     This method must be provided by the subclass to return 
+     the height of \p item in pixels.
+     Allow for two additional pixels for the list selection box.
+     \param[in] item The item whose height is returned.
+     \returns The height of the specified \p item in pixels.
+     \see item_height(), item_width(), item_quick_height()
+     */
+    virtual int item_height(void *item) const;
+    /**
+     This method must be provided by the subclass to return the width of the
+     \p item in pixels.  Allow for two additional pixels for the list
+     selection box.
+     \param[in] item The item whose width is returned.
+     \returns The width of the item in pixels.
+     */
+    virtual int item_width(void *item) const;
+    virtual int item_quick_height(void *item) const ;
+    /**
+     This method must be provided by the subclass to draw the \p item
+     in the area indicated by \p X, \p Y, \p W, \p H.
+     */
+    virtual void item_draw(void *item,int X,int Y,int W,int H) const;
+    /**
+     This optional method returns a string (label) that may be used for sorting. 
+     \param[in] item The item whose label text is returned.
+     \returns The item's text label. (Can be NULL if blank)
+     */
+    virtual const char *item_text(void *item) const;
+    /**
+     This optional method should be provided by the subclass 
+     to efficiently swap browser items \p a and \p b, such as for sorting.
+     \param[in] a,b The two items to be swapped.
+     */
+    virtual void item_swap(void *a,void *b);
+    /**
+     This method must be provided by the subclass 
+     to return the item for the specified \p index. 
+     \param[in] index The \p index of the item to be returned
+     \returns The item at the specified \p index.
+     */
+    virtual void *item_at(int index) const;
+    // you don't have to provide these but it may help speed it up:
+    virtual int full_width() const ;	// current width of all items
+    virtual int full_height() const ;	// current height of all items
+    virtual int incr_height() const ;	// average height of an item
+                                        // These only need to be done by subclass if you want a multi-browser:
+    virtual void item_select(void *item,int val=1);
+    virtual int item_selected(void *item) const ;
+    
+    // things the subclass may want to call:
+    /**
+     Returns the item that appears at the top of the list.
+     */
+    void *top() const { return top_; }
+    /**
+     Returns the item currently selected, or NULL if there is no selection.
+     
+     For multiple selection browsers this call returns the currently focused item,
+     even if it is not selected. To find all selected items, call 
+     fltk3::MultiBrowser::selected() for every item in question.
+     */
+    void *selection() const { return selection_; }
+    void new_list(); // completely clobber all data, as though list replaced
+    void deleting(void *item); // get rid of any pointers to item
+    void replacing(void *a,void *b); // change a pointers to b
+    void swapping(void *a,void *b); // exchange pointers a and b
+    void inserting(void *a,void *b); // insert b near a
+    int displayed(void *item) const ; // true if this item is visible
+    void redraw_line(void *item); // minimal update, no change in size
+    /**
+     This method will cause the entire list to be redrawn.
+     \see redraw_lines(), redraw_line()
+     */
+    void redraw_lines() { damage(fltk3::DAMAGE_SCROLL); } // redraw all of them
+    void bbox(int &X,int &Y,int &W,int &H) const;
+    int leftedge() const;	// x position after scrollbar & border
+    void *find_item(int ypos); // item under mouse
+    
+    void draw();
+    Browser_(int X,int Y,int W,int H,const char *L=0);
+    
+  public:
+    
+    /**
+     Vertical scrollbar. Public, so that it can be accessed directly.
+     */
+    fltk3::Scrollbar scrollbar;
+    /**
+     Horizontal scrollbar. Public, so that it can be accessed directly.
+     */
+    fltk3::Scrollbar hscrollbar;
+    
+    int handle(int event);
+    void resize(int X,int Y,int W,int H);
+    
+    int select(void *item,int val=1,int docallbacks=0);
+    int select_only(void *item,int docallbacks=0);
+    int deselect(int docallbacks=0);
+    /**
+     Gets the vertical scroll position of the list as a pixel position \p pos.
+     The position returned is how many pixels of the list are scrolled off the top edge
+     of the screen.  Example: A position of '3' indicates the top 3 pixels of 
+     the list are scrolled off the top edge of the screen.
+     \see position(), hposition()
+     */
+    int position() const { return position_; }
+    void position(int pos); // scroll to here
+    /**
+     Gets the horizontal scroll position of the list as a pixel position \p pos.
+     The position returned is how many pixels of the list are scrolled off the left edge
+     of the screen. Example: A position of '18' indicates the left 18 pixels of
+     the list are scrolled off the left edge of the screen.
+     \see position(), hposition()
+     */
+    int hposition() const { return hposition_; }
+    void hposition(int); // pan to here
+    void display(void *item); // scroll so this item is shown
+    
+    /**
+     Values for has_scrollbar().
+     */
+    /** Anonymous enum bit flags for has_scrollbar().
+     -  bit 0: horizontal
+     -  bit 1: vertical
+     -  bit 2: 'always' (to be combined with bits 0 and 1)
+     -  bit 3-31: reserved for future use
+     */
+    enum { // values for has_scrollbar()
+      HORIZONTAL = 1,		///< Only show horizontal scrollbar.
+      VERTICAL = 2,		///< Only show vertical scrollbar.
+      BOTH = 3,			///< Show both scrollbars. (default)
+      ALWAYS_ON = 4,		///< Specified scrollbar(s) should 'always' be shown (to be used with HORIZONTAL/VERTICAL)
+      HORIZONTAL_ALWAYS = 5,	///< Horizontal scrollbar always on.
+      VERTICAL_ALWAYS = 6,	///< Vertical scrollbar always on.
+      BOTH_ALWAYS = 7		///< Both scrollbars always on.
+    };
+    /**
+     Returns the current scrollbar mode, see fltk3::Browser_::has_scrollbar(uchar)
+     */
+    uchar has_scrollbar() const { return has_scrollbar_; }
+    /**
+     Sets whether the widget should have scrollbars or not (default fltk3::Browser_::BOTH).
+     By default you can scroll in both directions, and the scrollbars
+     disappear if the data will fit in the widget.  
+     has_scrollbar() changes this based on the value of \p mode:
+     
+     - 0 - No scrollbars.
+     
+     - fltk3::Browser_::HORIZONTAL - Only a horizontal scrollbar.
+     
+     - fltk3::Browser_::VERTICAL - Only a vertical scrollbar.
+     
+     - fltk3::Browser_::BOTH - The default is both scrollbars.
+     
+     - fltk3::Browser_::HORIZONTAL_ALWAYS - Horizontal scrollbar always on,
+     vertical always off.
+     
+     - fltk3::Browser_::VERTICAL_ALWAYS - Vertical scrollbar always on,
+     horizontal always off.
+     
+     - fltk3::Browser_::BOTH_ALWAYS - Both always on.
+     */
+    void has_scrollbar(uchar mode) { has_scrollbar_ = mode; }
+    
+    /**
+     Gets the current size of the scrollbars' troughs, in pixels.
+     
+     If this value is zero (default), this widget will use the 
+     fltk3::scrollbar_size() value as the scrollbar's width.
+     
+     \returns Scrollbar size in pixels, or 0 if the global fltk3::scrollsize() is being used.
+     \see fltk3::scrollbar_size(int)
+     */
+    int scrollbar_size() const {
+      return(scrollbar_size_);
+    }
+    /**
+     Sets the pixel size of the scrollbars' troughs to the \p size, in pixels.
+     
+     Normally you should not need this method, and should use
+     fltk3::scrollbar_size(int) instead to manage the size of ALL 
+     your widgets' scrollbars. This ensures your application 
+     has a consistent UI, is the default behavior, and is normally
+     what you want.
+     
+     Only use THIS method if you really need to override the global
+     scrollbar size. The need for this should be rare.
+     
+     Setting \p size to the special value of 0 causes the widget to
+     track the global fltk3::scrollbar_size(), which is the default.
+     
+     \param[in] size Sets the scrollbar size in pixels.\n
+     If 0 (default), scrollbar size tracks the global fltk3::scrollbar_size()
+     \see fltk3::scrollbar_size()
+     */
+    void scrollbar_size(int size) {
+      scrollbar_size_ = size;
+    }   
+    /**
+     This method has been deprecated, existing for backwards compatibility only.
+     Use scrollbar_size() instead.
+     This method always returns the global value fltk3::scrollbar_size().
+     \returns Always returns the global value fltk3::scrollbar_size().
+     \todo This method should eventually be removed in 1.4+
+     */
+    int scrollbar_width() const {
+      return(fltk3::scrollbar_size());
+    }
+    /**
+     This method has been deprecated, existing for backwards compatibility only.
+     Use scrollbar_size(int) instead.
+     This method sets the global fltk3::scrollbar_size(), and forces this
+     instance of the widget to use it.
+     \todo This method should eventually be removed in 1.4+
+     */
+    void scrollbar_width(int width) {
+      fltk3::scrollbar_size(width);
+      scrollbar_size_ = 0;
+    }
+    /**
+     Moves the vertical scrollbar to the righthand side of the list.
+     For back compatibility.
+     */
+    void scrollbar_right() { scrollbar.align(fltk3::ALIGN_RIGHT); }
+    /**
+     Moves the vertical scrollbar to the lefthand side of the list.
+     For back compatibility.
+     */
+    void scrollbar_left() { scrollbar.align(fltk3::ALIGN_LEFT); }
+    void sort(int flags=0);
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: Browser_.h 8275 2011-01-13 22:07:31Z manolo $".
+//

Deleted: branches/branch-3.0/include/fltk3/Button.h

Copied: branches/branch-3.0/include/fltk3/Button.h (from rev 8988, branches/branch-3.0/fltk3/Button.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Button.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Button.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,187 @@
+//
+// "$Id: Button.h 7903 2010-11-28 21:06:39Z matt $"
+//
+// Button header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Button widget . */
+
+#ifndef FLTK3_BUTTON_H
+#define FLTK3_BUTTON_H
+
+#include "Widget.h"
+#include <fltk3/Wrapper.h>
+
+class Fl_Button;
+
+
+namespace fltk3 {
+  // values for type()
+  const uchar NORMAL_BUTTON = 0;   /**< value() will be set to 1 during the press of the button and 
+                                    reverts back to 0 when the button is released */
+  const uchar TOGGLE_BUTTON = 1;   ///< value() toggles between 0 and 1 at every click of the button
+  const uchar RADIO_BUTTON = RESERVED_TYPE+2; /**< is set to 1 at button press, and all other
+                                               buttons in the same group with <tt>type() == fltk3::RADIO_BUTTON</tt>
+                                               are set to zero.*/
+  const uchar HIDDEN_BUTTON = 3;   ///< for Forms compatibility
+  
+  extern FLTK3_EXPORT fltk3::Shortcut old_shortcut(const char*);
+  
+  class WidgetTracker;
+  
+  /**
+   \class fltk3::Button
+   \brief Buttons generate callbacks when they are clicked by the user.
+   
+   You control exactly when and how by changing the values for type() and
+   when().  Buttons can also generate callbacks in response to \c fltk3::SHORTCUT
+   events.  The button can either have an explicit shortcut(int s) value or a
+   letter shortcut can be indicated in the label() with an '\&' character
+   before it.  For the label shortcut it does not matter if \e Alt is held
+   down, but if you have an input field in the same window, the user will have
+   to hold down the \e Alt key so that the input field does not eat the event
+   first as an \c fltk3::KEYBOARD event.
+   
+   \todo Refactor the doxygen comments for fltk3::Button type() documentation.
+   
+   For an fltk3::Button object, the type() call returns one of:
+   \li \c fltk3::NORMAL_BUTTON (0): value() remains unchanged after button press.
+   \li \c fltk3::TOGGLE_BUTTON: value() is inverted after button press.
+   \li \c fltk3::RADIO_BUTTON: value() is set to 1 after button press, and all other
+   buttons in the current group with <tt>type() == fltk3::RADIO_BUTTON</tt>
+   are set to zero.
+   
+   \todo Refactor the doxygen comments for fltk3::Button when() documentation.
+   
+   For an fltk3::Button object, the following when() values are useful, the default
+   being \c fltk3::WHEN_RELEASE:
+   \li \c 0: The callback is not done, instead changed() is turned on.
+   \li \c fltk3::WHEN_RELEASE: The callback is done after the user successfully
+   clicks the button, or when a shortcut is typed.
+   \li \c fltk3::WHEN_CHANGED: The callback is done each time the value() changes
+   (when the user pushes and releases the button, and as the mouse is
+   dragged around in and out of the button).
+   */
+  class FLTK3_EXPORT Button : public Widget {
+    
+    friend class ::Fl_Button;
+    
+    unsigned int shortcut_;
+    char value_;
+    char oldval;
+    uchar down_box_;
+    
+  protected:
+    
+    static fltk3::WidgetTracker *key_release_tracker;
+    static void key_release_timeout(void*);
+    void simulate_key_action();
+    
+    virtual void draw();
+    
+  public:
+    
+    virtual int handle(int);
+    
+    Button(int X, int Y, int W, int H, const char *L = 0);
+    
+    int value(int v);
+    
+    /**
+     Returns the current value of the button (0 or 1).
+     */
+    char value() const {return value_;}
+    
+    /**
+     Same as \c value(1).
+     \see value(int v)
+     */
+    int set() {return value(1);}
+    
+    /**
+     Same as \c value(0).
+     \see value(int v)
+     */
+    int clear() {return value(0);}
+    
+    void setonly(); // this should only be called on fltk3::RADIO_BUTTONs
+    
+    /**
+     Returns the current shortcut key for the button.
+     \retval int
+     */
+    unsigned int shortcut() const {return shortcut_;}
+    
+    /**
+     Sets the shortcut key to \c s.
+     Setting this overrides the use of '\&' in the label().
+     The value is a bitwise OR of a key and a set of shift flags, for example:
+     <tt>fltk3::ALT | 'a'</tt>, or
+     <tt>fltk3::ALT | (fltk3::FKey + 10)</tt>, or just
+     <tt>'a'</tt>.
+     A value of 0 disables the shortcut.
+     
+     The key can be any value returned by fltk3::event_key(), but will usually be
+     an ASCII letter.  Use a lower-case letter unless you require the shift key
+     to be held down.
+     
+     The shift flags can be any set of values accepted by fltk3::event_state().
+     If the bit is on, that shift key must be pushed.  Meta, Alt, Ctrl, and
+     Shift must be off if they are not in the shift flags (zero for the other
+     bits indicates a "don't care" setting).
+     \param[in] s bitwise OR of key and shift flags
+     */
+    void shortcut(unsigned int s) {shortcut_ = s;}
+    
+    /**
+     Returns the current down box type, which is drawn when value() is non-zero.
+     \retval fltk3::Boxtype
+     */
+    Boxtype down_box() const {return (fltk3::Boxtype)down_box_;}
+    
+    /**
+     Sets the down box type. The default value of 0 causes FLTK to figure out
+     the correct matching down version of box().
+     \param[in] b down box type
+     */
+    void down_box(fltk3::Boxtype b) {down_box_ = b;}
+    
+    /// (for backwards compatibility)
+    void shortcut(const char *s) {shortcut(fltk3::old_shortcut(s));}
+    
+    /// (for backwards compatibility)
+    Color down_color() const {return selection_color();}
+    
+    /// (for backwards compatibility)
+    void down_color(unsigned c) {selection_color(c);}
+  };
+  
+} // namespace
+
+#endif
+
+//
+// End of "$Id: Button.h 7903 2010-11-28 21:06:39Z matt $".
+//

Deleted: branches/branch-3.0/include/fltk3/Chart.h

Copied: branches/branch-3.0/include/fltk3/Chart.h (from rev 8988, branches/branch-3.0/fltk3/Chart.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Chart.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Chart.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,145 @@
+//
+// "$Id: Chart.h 7981 2010-12-08 23:53:04Z greg.ercolano $"
+//
+// Forms chart header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Chart widget . */
+
+#ifndef Fltk3_Chart_H
+#define Fltk3_Chart_H
+
+#include "Widget.h"
+#include <fltk3/Wrapper.h>
+
+namespace fltk3 {
+  
+  // values for type()
+  const uchar BAR_CHART		= 0;	/**< type() for Bar Chart variant */
+  const uchar HORBAR_CHART	= 1;	/**< type() for Horizontal Bar Chart variant */
+  const uchar LINE_CHART	= 2;	/**< type() for Line Chart variant */
+  const uchar FILL_CHART	= 3;	/**< type() for Fill Line Chart variant */
+  const uchar SPIKE_CHART	= 4;	/**< type() for Spike Chart variant */
+  const uchar PIE_CHART		= 5;	/**< type() for Pie Chart variant */
+  const uchar SPECIALPIE_CHART	= 6;	/**< type() for Special Pie Chart variant */
+  
+  const uchar FILLED_CHART      = FILL_CHART;	/**< for compatibility */
+  
+  const int CHART_MAX		= 128;	/**< max entries per chart */
+  const int CHART_LABEL_MAX	= 18;	/**< max label length for entry */
+  
+  /** For internal use only */
+  struct CHART_ENTRY {
+    float val;				/**< For internal use only. */
+    unsigned col;			/**< For internal use only. */
+    char str[fltk3::CHART_LABEL_MAX+1];	/**< For internal use only. */
+  };
+  
+  /**
+   \class fltk3::Chart
+   \brief fltk3::Chart displays simple charts.
+   It is provided for Forms compatibility.
+   
+   \image html charts.png  
+   \image latex charts.png  "fltk3::Chart" width=10cm
+   \todo Refactor fltk3::Chart::type() information.
+   
+   The type of an fltk3::Chart object can be set using type(uchar t) to:
+   \li \c fltk3::BAR_CHART: Each sample value is drawn as a vertical bar.
+   \li \c fltk3::FILLED_CHART: The chart is filled from the bottom of the graph
+   to the sample values.
+   \li \c fltk3::HORBAR_CHART: Each sample value is drawn as a horizontal bar.
+   \li \c fltk3::LINE_CHART: The chart is drawn as a polyline with vertices at
+   each sample value.
+   \li \c fltk3::PIE_CHART: A pie chart is drawn with each sample value being
+   drawn as a proportionate slice in the circle.
+   \li \c fltk3::SPECIALPIE_CHART: Like \c fltk3::PIE_CHART, but the first slice is
+   separated from the pie.
+   \li \c fltk3::SPIKE_CHART: Each sample value is drawn as a vertical line.
+   */
+  class FLTK3_EXPORT Chart : public fltk3::Widget {
+    int numb;
+    int maxnumb;
+    int sizenumb;
+    fltk3::CHART_ENTRY *entries;
+    double min,max;
+    uchar autosize_;
+  protected:
+    void draw();
+  public:
+    Chart(int X, int Y, int W, int H, const char *L = 0);
+    
+    ~Chart();
+    
+    void clear();
+    
+    void add(double val, const char *str = 0, unsigned col = 0);
+    
+    void insert(int ind, double val, const char *str = 0, unsigned col = 0);
+    
+    void replace(int ind, double val, const char *str = 0, unsigned col = 0);
+    
+    /**
+     Gets the lower and upper bounds of the chart values.
+     \param[out] a, b are set to lower, upper
+     */
+    void bounds(double *a,double *b) const {*a = min; *b = max;}
+    
+    void bounds(double a,double b);
+    
+    /**
+     Returns the number of data values in the chart.
+     */
+    int size() const {return numb;}
+    
+    void size(int W, int H) { Widget::size(W, H); }
+    
+    /**
+     Gets the maximum number of data values for a chart.
+     */
+    int maxsize() const {return maxnumb;}
+    
+    void maxsize(int m);
+    
+    /**
+     Get whether the chart will automatically adjust the bounds of the chart.
+     \returns non-zero if auto-sizing is enabled and zero if disabled.
+     */
+    uchar autosize() const {return autosize_;}
+    
+    /**
+     Set whether the chart will automatically adjust the bounds of the chart.
+     \param[in] n non-zero to enable automatic resizing, zero to disable.
+     */
+    void autosize(uchar n) {autosize_ = n;}
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: Chart.h 7981 2010-12-08 23:53:04Z greg.ercolano $".
+//

Deleted: branches/branch-3.0/include/fltk3/Counter.h

Copied: branches/branch-3.0/include/fltk3/Counter.h (from rev 8988, branches/branch-3.0/fltk3/Counter.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Counter.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Counter.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,112 @@
+//
+// "$Id: Counter.h 7981 2010-12-08 23:53:04Z greg.ercolano $"
+//
+// Counter header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Counter widget . */
+
+// A numerical value with up/down step buttons.  From Forms.
+
+#ifndef Fltk3_Counter_H
+#define Fltk3_Counter_H
+
+#include "Valuator.h"
+#include <fltk3/Wrapper.h>
+
+class Fl_Counter;
+
+namespace fltk3 {
+  
+  // values for type():
+  const uchar NORMAL_COUNTER	= 0;	/**< type() for counter with fast buttons */
+  const uchar SIMPLE_COUNTER	= 1;	/**< type() for counter without fast buttons */
+  
+  /**
+   Controls a single floating point value with button (or keyboard) arrows.
+   Double arrows buttons achieve larger steps than simple arrows.
+   \see fltk3::Spinner for value input with vertical step arrows.
+   <P align=center>\image html counter.png</P>
+   \image latex counter.png "fltk3::Counter" width=4cm
+   
+   \todo Refactor the doxygen comments for fltk3::Counter type() documentation.
+   
+   The type of an fltk3::Counter object can be set using type(uchar t) to:
+   \li \c fltk3::NORMAL_COUNTER: Displays a counter with 4 arrow buttons.
+   \li \c fltk3::SIMPLE_COUNTER: Displays a counter with only 2 arrow buttons.
+   */
+  class FLTK3_EXPORT Counter : public fltk3::Valuator {
+
+    friend class ::Fl_Counter;
+    
+    double lstep_;
+    uchar mouseobj;
+    static void repeat_callback(void *);
+    int calc_mouseobj();
+    void increment_cb();
+    
+  protected:
+    
+    void draw();
+    
+  public:
+    
+    int handle(int);
+    
+    Counter(int X, int Y, int W, int H, const char* L = 0);
+    ~Counter();
+    
+    /**
+     Sets the increment for the large step buttons.
+     The default value is 1.0.
+     \param[in] a large step increment.
+     */
+    void lstep(double a) {lstep_ = a;}
+    
+    /**
+     Sets the increments for the normal and large step buttons.
+     \param[in] a, b normal and large step increments.
+     */
+    void step(double a,double b) {Valuator::step(a); lstep_ = b;}
+    
+    /**
+     Sets the increment for the normal step buttons.
+     \param[in] a normal step increment.
+     */
+    void step(double a) {Valuator::step(a);}
+    
+    /**
+     Returns the increment for normal step buttons.
+     */
+    double step() const {return Valuator::step();}    
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: Counter.h 7981 2010-12-08 23:53:04Z greg.ercolano $".
+//

Deleted: branches/branch-3.0/include/fltk3/HelpView.h

Copied: branches/branch-3.0/include/fltk3/HelpView.h (from rev 8988, branches/branch-3.0/fltk3/HelpView.h)
===================================================================
--- branches/branch-3.0/include/fltk3/HelpView.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/HelpView.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,405 @@
+//
+// "$Id: HelpView.h 8306 2011-01-24 17:04:22Z matt $"
+//
+// Help Viewer widget definitions.
+//
+// Copyright 1997-2010 by Easy Software Products.
+// Image support by Matthias Melcher, Copyright 2000-2009.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::HelpView widget . */
+
+#ifndef Fltk3_Help_View_H
+#  define Fltk3_Help_View_H
+
+//
+// Include necessary header files...
+//
+
+#  include <stdio.h>
+#  include "run.h"
+#  include "Group.h"
+#  include "Scrollbar.h"
+#  include "draw.h"
+#  include "SharedImage.h"
+#  include "filename.h"
+
+namespace fltk3 {
+  
+  //
+  // fltk3::HelpFunc type - link callback function for files...
+  //
+  
+  
+  typedef const char *(HelpFunc)(fltk3::Widget *, const char *);
+  
+  
+  //
+  // fltk3::HelpBlock structure...
+  //
+  
+  struct HelpBlock {
+    const char	*start,		// Start of text
+    *end;		// End of text
+    uchar		border;		// Draw border?
+    fltk3::Color	bgcolor;	// Background color
+    int		x,		// Indentation/starting X coordinate
+    y,		// Starting Y coordinate
+    w,		// Width
+    h;		// Height
+    int		line[32];	// Left starting position for each line
+  };
+  
+  //
+  // fltk3::HelpLink structure...
+  //
+  /** Definition of a link for the html viewer. */
+  struct HelpLink {
+    char		filename[192],	///< Reference filename
+    name[32];	///< Link target (blank if none)
+    int		x,		///< X offset of link text
+    y,		///< Y offset of link text
+    w,		///< Width of link text
+    h;		///< Height of link text
+  };
+  
+  /*
+   * fltk3::HelpView font stack opaque implementation
+   */
+  
+  /** fltk3::HelpView font stack element definition. */
+  struct FLTK3_EXPORT HelpFontStyle {
+    fltk3::Font      f;  ///< Font
+    fltk3::Fontsize  s;  ///< Font Size
+    fltk3::Color     c;  ///< Font Color
+    void get(fltk3::Font &afont, fltk3::Fontsize &asize, fltk3::Color &acolor) {afont=f; asize=s; acolor=c;} ///< Gets current font attributes
+    void set(fltk3::Font afont, fltk3::Fontsize asize, fltk3::Color acolor) {f=afont; s=asize; c=acolor;} ///< Sets current font attributes
+    HelpFontStyle(fltk3::Font afont, fltk3::Fontsize asize, fltk3::Color acolor) {set(afont, asize, acolor);}
+    HelpFontStyle(){} // For in table use
+  };
+  
+  /** fltk3::HelpView font stack definition. */
+  const size_t MAX_FL_HELP_FS_ELTS = 100;
+  
+  struct FLTK3_EXPORT HelpFontStack {
+    /** font stack construction, initialize attributes. */
+    HelpFontStack() {
+      nfonts_ = 0;
+    }
+    
+    void init(fltk3::Font f, fltk3::Fontsize s, fltk3::Color c) { 
+      nfonts_ = 0;
+      elts_[nfonts_].set(f, s, c);
+      fltk3::font(f, s); 
+      fltk3::color(c);
+    }
+    /** Gets the top (current) element on the stack. */
+    void top(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) { elts_[nfonts_].get(f, s, c); }
+    /** Pushes the font style triplet on the stack, also calls fltk3::font() & fltk3::color() adequately */
+    void push(fltk3::Font f, fltk3::Fontsize s, fltk3::Color c) { 
+      if (nfonts_ <  MAX_FL_HELP_FS_ELTS-1) nfonts_ ++;
+      elts_[nfonts_].set(f, s, c);
+      fltk3::font(f, s); fltk3::color(c); 
+    }
+    /** Pops from the stack the font style triplet and calls fltk3::font() & fltk3::color() adequately */
+    void pop(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) { 
+      if (nfonts_ > 0) nfonts_ --;
+      top(f, s, c);
+      fltk3::font(f, s); fltk3::color(c);
+    }
+    /** Gets the current count of font style elements in the stack. */
+    size_t count() const {return nfonts_;} // Gets the current number of fonts in the stack
+    
+  protected:
+    size_t nfonts_;		///< current number of fonts in stack
+    fltk3::HelpFontStyle elts_[100]; ///< font elements
+  };
+  
+  /** fltk3::HelpTarget structure */
+  
+  struct HelpTarget {
+    char		name[32];	///< Target name
+    int		y;		///< Y offset of target
+  };
+  
+  /**
+   The fltk3::HelpView widget displays HTML text. Most HTML 2.0
+   elements are supported, as well as a primitive implementation of tables.
+   GIF, JPEG, and PNG images are displayed inline.
+   
+   Supported HTML tags:
+   - A: HREF/NAME
+   - B
+   - BODY: BGCOLOR/TEXT/LINK
+   - BR
+   - CENTER
+   - CODE
+   - DD
+   - DL
+   - DT
+   - EM
+   - FONT: COLOR/SIZE/FACE=(helvetica/arial/sans/times/serif/symbol/courier)
+   - H1/H2/H3/H4/H5/H6
+   - HEAD
+   - HR
+   - I
+   - IMG: SRC/WIDTH/HEIGHT/ALT
+   - KBD
+   - LI
+   - OL
+   - P
+   - PRE
+   - STRONG
+   - TABLE: TH/TD/TR/BORDER/BGCOLOR/COLSPAN/ALIGN=CENTER|RIGHT|LEFT
+   - TITLE
+   - TT
+   - U
+   - UL
+   - VAR
+   
+   Supported color names:
+   - black,red,green,yellow,blue,magenta,fuchsia,cyan,aqua,white,gray,grey,lime,maroon,navy,olive,purple,silver,teal.
+   
+   Supported urls:
+   - Internal: file:
+   - External: http: ftp: https: ipp: mailto: news:
+   
+   Quoted char names:
+   - Aacute aacute Acirc acirc acute AElig aelig Agrave agrave amp Aring aring Atilde atilde Auml auml
+   - brvbar bull
+   - Ccedil ccedil cedil cent copy curren
+   - deg divide
+   - Eacute eacute Ecirc ecirc Egrave egrave ETH eth Euml euml euro
+   - frac12 frac14 frac34
+   - gt
+   - Iacute iacute Icirc icirc iexcl Igrave igrave iquest Iuml iuml
+   - laquo lt
+   - macr micro middot
+   - nbsp not Ntilde ntilde
+   - Oacute oacute Ocirc ocirc Ograve ograve ordf ordm Oslash oslash Otilde otilde Ouml ouml
+   - para premil plusmn pound
+   - quot
+   - raquo reg
+   - sect shy sup1 sup2 sup3 szlig
+   - THORN thorn times trade
+   - Uacute uacute Ucirc ucirc Ugrave ugrave uml Uuml uuml
+   - Yacute yacute
+   - yen Yuml yuml
+   
+   */
+  class FLTK3_EXPORT HelpView : public fltk3::Group {	// Help viewer widget
+    
+    enum { RIGHT = -1, CENTER, LEFT };	///< Alignments
+    
+    char		title_[1024];		///< Title string
+    fltk3::Color	defcolor_,		///< Default text color
+    bgcolor_,		///< Background color
+    textcolor_,		///< Text color
+    linkcolor_;		///< Link color
+    fltk3::Font       textfont_;		///< Default font for text
+    fltk3::Fontsize  textsize_;		///< Default font size
+    const char	*value_;		///< HTML text value
+    fltk3::HelpFontStack fstack_;		///< font stack management
+    int		nblocks_,		///< Number of blocks/paragraphs
+    ablocks_;		///< Allocated blocks
+    fltk3::HelpBlock	*blocks_;		///< Blocks
+    
+    fltk3::HelpFunc	*link_;			///< Link transform function
+    
+    int		nlinks_,		///< Number of links
+    alinks_;		///< Allocated links
+    fltk3::HelpLink	*links_;		///< Links
+    
+    int		ntargets_,		///< Number of targets
+    atargets_;		///< Allocated targets
+    fltk3::HelpTarget *targets_;		///< Targets
+    
+    char		directory_[FLTK3_PATH_MAX];///< Directory for current file
+    char		filename_[FLTK3_PATH_MAX];	///< Current filename
+    int		topline_,		///< Top line in document
+    leftline_,		///< Lefthand position
+    size_,			///< Total document length
+    hsize_,			///< Maximum document width
+    scrollbar_size_;	///< Size for both scrollbars
+    fltk3::Scrollbar	scrollbar_,		///< Vertical scrollbar for document
+    hscrollbar_;		///< Horizontal scrollbar
+    
+    static int    selection_first;
+    static int    selection_last;
+    static int    selection_push_first;
+    static int    selection_push_last;
+    static int    selection_drag_first;
+    static int    selection_drag_last;
+    static int    selected;
+    static int    draw_mode;
+    static int    mouse_x;
+    static int    mouse_y;
+    static int    current_pos;
+    static fltk3::HelpView *current_view;
+    static fltk3::Color hv_selection_color;
+    static fltk3::Color hv_selection_text_color;
+    
+    
+    void initfont(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) { f = textfont_; s = textsize_; c = textcolor_; fstack_.init(f, s, c); }
+    void pushfont(fltk3::Font f, fltk3::Fontsize s) {fstack_.push(f, s, textcolor_);}
+    void pushfont(fltk3::Font f, fltk3::Fontsize s, fltk3::Color c) {fstack_.push(f, s, c);}
+    void popfont(fltk3::Font &f, fltk3::Fontsize &s, fltk3::Color &c) {fstack_.pop(f, s, c);}
+    
+    fltk3::HelpBlock	*add_block(const char *s, int xx, int yy, int ww, int hh, uchar border = 0);
+    void		add_link(const char *n, int xx, int yy, int ww, int hh);
+    void		add_target(const char *n, int yy);
+    static int	compare_targets(const fltk3::HelpTarget *t0, const fltk3::HelpTarget *t1);
+    int		do_align(fltk3::HelpBlock *block, int line, int xx, int a, int &l);
+    void		draw();
+    void		format();
+    void		format_table(int *table_width, int *columns, const char *table);
+    void		free_data();
+    int		get_align(const char *p, int a);
+    const char	*get_attr(const char *p, const char *n, char *buf, int bufsize);
+    fltk3::Color	get_color(const char *n, fltk3::Color c);
+    fltk3::SharedImage *get_image(const char *name, int W, int H);
+    int		get_length(const char *l);
+    int		handle(int);
+    
+    void          hv_draw(const char *t, int x, int y);
+    char          begin_selection();
+    char          extend_selection();
+    void          end_selection(int c=0);
+    void          clear_global_selection();
+    fltk3::HelpLink  *find_link(int, int);
+    void          follow_link(fltk3::HelpLink*);
+    
+  public:
+    
+    HelpView(int xx, int yy, int ww, int hh, const char *l = 0);
+    ~HelpView();
+    /** Returns the current directory for the text in the buffer. */
+    const char	*directory() const { if (directory_[0]) return (directory_);
+      else return ((const char *)0); }
+    /** Returns the current filename for the text in the buffer. */
+    const char	*filename() const { if (filename_[0]) return (filename_);
+      else return ((const char *)0); }
+    int		find(const char *s, int p = 0);
+    /**
+     This method assigns a callback function to use when a link is
+     followed or a file is loaded (via fltk3::HelpView::load()) that
+     requires a different file or path.
+     
+     The callback function receives a pointer to the fltk3::HelpView
+     widget and the URI or full pathname for the file in question.
+     It must return a pathname that can be opened as a local file or NULL:
+     
+     \code
+     const char *fn(fltk3::Widget *w, const char *uri);
+     \endcode
+     
+     The link function can be used to retrieve remote or virtual
+     documents, returning a temporary file that contains the actual
+     data. If the link function returns NULL, the value of
+     the fltk3::HelpView widget will remain unchanged.
+     
+     If the link callback cannot handle the URI scheme, it should
+     return the uri value unchanged or set the value() of the widget
+     before returning NULL.
+     */
+    void		link(fltk3::HelpFunc *fn) { link_ = fn; }
+    int		load(const char *f);
+    void		resize(int,int,int,int);
+    /** Gets the size of the help view. */
+    int		size() const { return (size_); }
+    void		size(int W, int H) { Widget::size(W, H); }
+    /** Sets the default text color.
+     \todo this call overrides Widget::textcolor. That is bad!
+     */
+    void		textcolor(fltk3::Color c) { if (textcolor_ == defcolor_) textcolor_ = c; defcolor_ = c; }
+    /** Returns the current default text color. */
+    fltk3::Color	textcolor() const { return (defcolor_); }
+    /** Sets the default text font. 
+     \todo this call overrides Widget::textfont. That is bad!
+     */
+    void		textfont(fltk3::Font f) { textfont_ = f; format(); }
+    /** Returns the current default text font. */
+    fltk3::Font       textfont() const { return (textfont_); }
+    /** Sets the default text size. 
+     \todo this call overrides Widget::textsize. That is bad!
+     */
+    void		textsize(fltk3::Fontsize s) { textsize_ = s; format(); }
+    /** Gets the default text size. */
+    fltk3::Fontsize  textsize() const { return (textsize_); }
+    /** Returns the current document title, or NULL if there is no title. */
+    const char	*title() { return (title_); }
+    void		topline(const char *n);
+    void		topline(int);
+    /** Returns the current top line in pixels. */
+    int		topline() const { return (topline_); }
+    void		leftline(int);
+    /** Gets the left position in pixels. */
+    int		leftline() const { return (leftline_); }
+    void		value(const char *val);
+    /** Returns the current buffer contents. */
+    const char	*value() const { return (value_); }
+    void          clear_selection();
+    void          select_all();
+    /**
+     Gets the current size of the scrollbars' troughs, in pixels.
+     
+     If this value is zero (default), this widget will use the 
+     fltk3::scrollbar_size() value as the scrollbar's width.
+     
+     \returns Scrollbar size in pixels, or 0 if the global fltk3::scrollbar_size() is being used.
+     \see fltk3::scrollbar_size(int)
+     */
+    int scrollbar_size() const {
+      return(scrollbar_size_);
+    }
+    /**
+     Sets the pixel size of the scrollbars' troughs to the \p size, in pixels.
+     
+     Normally you should not need this method, and should use
+     fltk3::scrollbar_size(int) instead to manage the size of ALL 
+     your widgets' scrollbars. This ensures your application 
+     has a consistent UI, is the default behavior, and is normally
+     what you want.
+     
+     Only use THIS method if you really need to override the global
+     scrollbar size. The need for this should be rare.
+     
+     Setting \p size to the special value of 0 causes the widget to
+     track the global fltk3::scrollbar_size(), which is the default.
+     
+     \param[in] size Sets the scrollbar size in pixels.\n
+     If 0 (default), scrollbar size tracks the global fltk3::scrollbar_size()
+     \see fltk3::scrollbar_size()
+     */
+    void scrollbar_size(int size) {
+      scrollbar_size_ = size;
+    }   
+  };
+  
+}
+
+#endif // !Fltk3_Help_View_H
+
+//
+// End of "$Id: HelpView.h 8306 2011-01-24 17:04:22Z matt $".
+//

Deleted: branches/branch-3.0/include/fltk3/Input_.h

Copied: branches/branch-3.0/include/fltk3/Input_.h (from rev 8988, branches/branch-3.0/fltk3/Input_.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Input_.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Input_.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,467 @@
+//
+// "$Id: Input_.h 8068 2010-12-20 07:48:59Z greg.ercolano $"
+//
+// Input base class header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Input_ widget . */
+
+#ifndef Fltk3_Input__H
+#define Fltk3_Input__H
+
+#include "Widget.h"
+
+
+class Fl_Input_;
+
+
+namespace fltk3 {
+  
+  const uchar NORMAL_INPUT	= 0;
+  const uchar FLOAT_INPUT	= 1;
+  const uchar INT_INPUT		= 2;
+  const uchar HIDDEN_INPUT	= 3;
+  const uchar MULTILINE_INPUT	= 4;
+  const uchar SECRET_INPUT	= 5;
+  const uchar INPUT_TYPE	= 7;
+  const uchar INPUT_READONLY	= 8;
+  const uchar NORMAL_OUTPUT	= (fltk3::NORMAL_INPUT | fltk3::INPUT_READONLY);
+  const uchar MULTILINE_OUTPUT	= (fltk3::MULTILINE_INPUT | fltk3::INPUT_READONLY);
+  const uchar INPUT_WRAP	= 16;
+  const uchar MULTILINE_INPUT_WRAP = (fltk3::MULTILINE_INPUT | fltk3::INPUT_WRAP);
+  const uchar MULTILINE_OUTPUT_WRAP = (fltk3::MULTILINE_INPUT | fltk3::INPUT_READONLY | fltk3::INPUT_WRAP);
+  
+  /**
+   This class provides a low-overhead text input field.
+   
+   This is a virtual base class below fltk3::Input. It has all
+   the same interfaces, but lacks the handle() and
+   draw() method. You may want to subclass it if you are
+   one of those people who likes to change how the editing keys
+   work. It may also be useful for adding scrollbars
+   to the input field.
+   
+   This can act like any of the subclasses of fltk3::Input, by
+   setting type() to one of the following values:
+   
+   \code
+   #define fltk3::NORMAL_INPUT	   0
+   #define fltk3::FLOAT_INPUT	   1
+   #define fltk3::INT_INPUT		   2
+   #define fltk3::MULTILINE_INPUT	   4
+   #define fltk3::SECRET_INPUT	   5
+   #define fltk3::INPUT_TYPE		   7
+   #define fltk3::INPUT_READONLY	   8
+   #define fltk3::NORMAL_OUTPUT	   (fltk3::NORMAL_INPUT | fltk3::INPUT_READONLY)
+   #define fltk3::MULTILINE_OUTPUT	   (fltk3::MULTILINE_INPUT | fltk3::INPUT_READONLY)
+   #define fltk3::INPUT_WRAP		   16
+   #define fltk3::MULTILINE_INPUT_WRAP  (fltk3::MULTILINE_INPUT | fltk3::INPUT_WRAP)
+   #define fltk3::MULTILINE_OUTPUT_WRAP (fltk3::MULTILINE_INPUT | fltk3::INPUT_READONLY | fltk3::INPUT_WRAP)
+   \endcode
+   
+   All variables that represent an index into a text buffer are byte-oriented,
+   not character oriented. Since UTF-8 characters can be up to six bytes long,
+   simply incrementing such an index will not reliably advance to the next character
+   in the text buffer.
+   
+   Indices and pointers into the text buffer should always point at a 7 bit ASCII
+   character or the beginning of a UTF-8 character sequence. Behavior for false
+   UTF-8 sequences and pointers into the middle of a sequence are undefined.
+   
+   \see fltk3::TextDisplay, fltk3::TextEditor for more powerful text handling widgets
+   
+   \internal
+   When porting this widget from ASCII to UTF-8, previously legal pointers into
+   the text of this widget can become illegal by pointing into the middle of
+   a UTF-8 sequence. This is not a big problem for fltk3::Input_ because all code
+   in this module is quite tolerant. It could be problematic though when deriving
+   from this class because no feedback for illegal pointers is given. Additionally,
+   a careless "copy" call can put partial UTF-8 sequences into the clipboard.
+   
+   None of these issues should be disastrous. Nevertheless, we should
+   discuss how FLTK should handle false UTF-8 sequences and pointers.
+   */
+  class FLTK3_EXPORT Input_ : public fltk3::Widget {
+   
+    friend class ::Fl_Input_;
+ 
+    /** \internal Storage for the text field. */
+    const char* value_;
+    
+    /** \internal Buffer memory for expanded text. \see expand() */
+    char* buffer;
+    
+    /** \internal Size of text in bytes in the \p value_ field. */
+    int size_;
+    
+    /** \internal \todo Please document me! */
+    int bufsize;
+    
+    /** \internal Position of the cursor in the document. */
+    int position_;
+    
+    /** \internal Position of the other end of the selected text. If \p position_ equals 
+     \p mark_, no text is selected */
+    int mark_;
+    
+    /** \internal Behavior of Tab key in multiline input widget. 
+     If enabled (default) Tab causes focus nav, otherwise Tab is inserted 
+     as a character. */
+    int tab_nav_;
+    
+    /** \internal Offset to text origin within widget bounds */
+    int xscroll_, yscroll_;
+    
+    /** \internal Minimal update pointer. Display requires redraw from here to the end
+     of the buffer. */
+    int mu_p;
+    
+    /** \internal Maximum size of buffer. \todo Is this really needed? */
+    int maximum_size_;
+    
+    /** \internal Shortcut key that will fetch focus for this widget. */
+    unsigned int shortcut_;
+    
+    /** \internal This is set if no text but only the cursor needs updating. */
+    uchar erase_cursor_only;
+    
+    /** \internal color of the text cursor */
+    fltk3::Color cursor_color_;
+    
+    /** \internal Horizontal cursor position in pixels while moving up or down. */
+    static double up_down_pos;
+    
+    /** \internal Flag to remember last cursor move. */
+    static int was_up_down;
+    
+    /* Convert a given text segment into the text that will be rendered on screen. */
+    const char* expand(const char*, char*) const;
+    
+    /* Calculates the width in pixels of part of a text buffer. */
+    double expandpos(const char*, const char*, const char*, int*) const;
+    
+    /* Mark a range of characters for update. */
+    void minimal_update(int, int);
+    
+    /* Mark a range of characters for update. */
+    void minimal_update(int p);
+    
+    /* Copy the value from a possibly static entry into the internal buffer. */
+    void put_in_buffer(int newsize);
+    
+    /* Set the current font and font size. */
+    void setfont() const;
+    
+  protected:
+    
+    /* Find the start of a word. */
+    int word_start(int i) const;
+    
+    /* Find the end of a word. */
+    int word_end(int i) const;
+    
+    /* Find the start of a line. */
+    int line_start(int i) const;
+    
+    /* Find the end of a line. */
+    int line_end(int i) const;
+    
+    /* Draw the text in the passed bounding box. */
+    void drawtext(int, int, int, int);
+    
+    /* Move the cursor to the column given by up_down_pos. */
+    int up_down_position(int, int keepmark=0);
+    
+    /* Handle mouse clicks and mouse moves. */
+    void handle_mouse(int, int, int, int, int keepmark=0);
+    
+    /* Handle all kinds of text field related events. */
+    int handletext(int e, int, int, int, int);
+    
+    /* Check the when() field and do a callback if indicated. */
+    void maybe_do_callback();
+    
+    /** \internal Horizontal offset of text to left edge of widget. */
+    int xscroll() const {return xscroll_;}
+    
+    /** \internal Vertical offset of text to top edge of widget. */
+    int yscroll() const {return yscroll_;}
+    void yscroll(int y) { yscroll_ = y; damage(fltk3::DAMAGE_EXPOSE);}
+    
+    /* Return the number of lines displayed on a single page.  */
+    int linesPerPage();
+    
+  public:
+    
+    /* Change the size of the widget. */
+    void resize(int, int, int, int);
+    
+    /* Constructor */
+    Input_(int, int, int, int, const char* = 0);
+    
+    /* Destructor */
+    ~Input_();
+    
+    /* Changes the widget text. */
+    int value(const char*);
+    
+    /* Changes the widget text. */
+    int value(const char*, int);
+    
+    /* Changes the widget text. */
+    int static_value(const char*);
+    
+    /* Changes the widget text. */
+    int static_value(const char*, int);
+    
+    /**
+     Returns the text displayed in the widget.
+     
+     This function returns the current value, which is a pointer
+     to the internal buffer and is valid only until the next event is
+     handled.
+     
+     \return pointer to an internal buffer - do not free() this    
+     \see fltk3::Input_::value(const char*)
+     */
+    const char* value() const {return value_;}
+    
+    /* Returns the character at index \p i. */
+    fltk3::Char index(int i) const;
+    
+    /**
+     Returns the number of bytes in value(). 
+     
+     This may be greater than <tt>strlen(value())</tt> if there are 
+     \c nul characters in the text.
+     
+     \return number of bytes in the text
+     */
+    int size() const {return size_;}
+    
+    /** Sets the width and height of this widget.
+     \param [in] W, H new width and height
+     \see fltk3::Widget::size(int, int) */
+    void size(int W, int H) { Widget::size(W, H); }
+    
+    /** Gets the maximum length of the input field.  
+     \todo It is not clear if this function is actually required */
+    int maximum_size() const {return maximum_size_;}
+    
+    /** Sets the maximum length of the input field. 
+     \todo It is not clear if this function is actually required */
+    void maximum_size(int m) {maximum_size_ = m;}
+    
+    /** Gets the position of the text cursor.
+     \return the cursor position as an index
+     \see position(int, int)
+     */
+    int position() const {return position_;}
+    
+    /** Gets the current selection mark. 
+     \return index into the text */
+    int mark() const {return mark_;}
+    
+    /* Sets the index for the cursor and mark. */
+    int position(int p, int m);
+    
+    /** Set the cursor position and mark.
+     position(n) is the same as <tt>position(n, n)</tt>.
+     \param p new index for cursor and mark
+     \return 0 if no positions changed
+     \see position(int, int), position(), mark(int)
+     */
+    int position(int p) {return position(p, p);}
+    
+    /** Sets the current selection mark. 
+     mark(n) is the same as <tt>position(position(),n)</tt>.
+     \param m new index of the mark 
+     \return 0 if the mark did not change
+     \see position(), position(int, int) */
+    int mark(int m) {return position(position(), m);}
+    
+    /* Deletes text from b to e and inserts the new string text. */
+    int replace(int, int, const char*, int=0);
+    
+    /**
+     Deletes the current selection.
+     
+     This function deletes the currently selected text
+     \e without storing it in the clipboard. To use the clipboard,
+     you may call copy() first or copy_cuts() after
+     this call.
+     
+     \return 0 if no data was copied
+     */
+    int cut() {return replace(position(), mark(), 0);}
+    
+    /**
+     Deletes the next \p n bytes rounded to characters before or after the cursor.
+     
+     This function deletes the currently selected text
+     \e without storing it in the clipboard. To use the clipboard,
+     you may call copy() first or copy_cuts() after
+     this call.
+     
+     \param n number of bytes rounded to full characters and clamped to the buffer.
+     A negative number will cut characters to the left of the cursor.
+     \return 0 if no data was copied
+     */
+    int cut(int n) {return replace(position(), position()+n, 0);}
+    
+    /**
+     Deletes all characters between index \p a and \p b.
+     
+     This function deletes the currently selected text
+     \e without storing it in the clipboard. To use the clipboard,
+     you may call copy() first or copy_cuts() after
+     this call.
+     
+     \param a, b range of bytes rounded to full characters and clamped to the buffer
+     \return 0 if no data was copied
+     */
+    int cut(int a, int b) {return replace(a, b, 0);}
+    
+    /**
+     Inserts text at the cursor position.
+     
+     This function inserts the string in \p t at the cursor
+     position() and moves the new position and mark to
+     the end of the inserted text.
+     
+     \param [in] t text that will be inserted
+     \param [in] l length of text, or 0 if the string is terminated by \c nul.
+     \return 0 if no text was inserted
+     */
+    int insert(const char* t, int l=0){return replace(position_, mark_, t, l);}
+    
+    /* Put the current selection into the clipboard. */
+    int copy(int clipboard);
+    
+    /* Undo previous changes to the text buffer. */
+    int undo();
+    
+    /* Copy the yank buffer to the clipboard. */
+    int copy_cuts();
+    
+    /** Return the shortcut key associated with this widget.
+     \return shortcut keystroke
+     \see fltk3::Button::shortcut() */
+    unsigned int shortcut() const {return shortcut_;}
+    
+    /** 
+     Sets the shortcut key associated with this widget.
+     Pressing the shortcut key gives text editing focus to this widget.
+     \param [in] s new shortcut keystroke 
+     \see fltk3::Button::shortcut() 
+     */
+    void shortcut(unsigned int s) {shortcut_ = s;}
+    
+    /** Gets the color of the cursor.  
+     \return the current cursor color */
+    fltk3::Color cursor_color() const {return cursor_color_;}
+    
+    /** Sets the color of the cursor.  
+     The default color for the cursor is \c fltk3::BLACK.
+     \param [in] n the new cursor color */
+    void cursor_color(fltk3::Color n) {cursor_color_ = n;}
+    
+    /** Gets the input field type. 
+     \return the current input type */
+    int input_type() const {return type() & fltk3::INPUT_TYPE; }
+    
+    /** Sets the input field type. 
+     A redraw() is required to reformat the input field.
+     \param [in] t new input type */
+    void input_type(int t) { type((uchar)(t | readonly())); }
+    
+    /** Gets the read-only state of the input field.  
+     \return non-zero if this widget is read-only */
+    int readonly() const { return type() & fltk3::INPUT_READONLY; }
+    
+    /** Sets the read-only state of the input field.  
+     \param [in] b if \p b is 0, the text in this widget can be edited by the user */
+    void readonly(int b) { if (b) type((uchar)(type() | fltk3::INPUT_READONLY));
+      else type((uchar)(type() & ~fltk3::INPUT_READONLY)); }
+    
+    /**
+     Gets  the word wrapping state of the input field. 
+     Word wrap is only functional with multi-line input fields.
+     */
+    int wrap() const { return type() & fltk3::INPUT_WRAP; }
+    
+    /**
+     Sets the word wrapping state of the input field. 
+     Word wrap is only functional with multi-line input fields.
+     */
+    void wrap(int b) { if (b) type((uchar)(type() | fltk3::INPUT_WRAP));
+      else type((uchar)(type() & ~fltk3::INPUT_WRAP)); }
+    
+    /**
+     Sets whether the Tab key does focus navigation, 
+     or inserts tab characters into fltk3::MultilineInput.
+     
+     By default this flag is enabled to provide the 'normal' behavior 
+     most users expect; Tab navigates focus to the next widget. 
+     To inserting an actual Tab character, users can use Ctrl-I
+     or copy/paste.
+     
+     Disabling this flag gives the old FLTK behavior where Tab
+     inserts a tab character into the text field, in which case
+     only the mouse can be used to navigate to the next field.
+     
+     History: This flag was provided for backwards support of FLTK's old 1.1.x
+     behavior where Tab inserts a tab character instead of navigating 
+     focus to the next widget. This behavior was unique to fltk3::MultilineInput. 
+     With the advent of fltk3::TextEditor, this old behavior has been deprecated.
+     
+     \param [in] val If \p val is 1, Tab advances focus (default).<BR>
+     If \p val is 0, Tab inserts a tab character (old FLTK behavior).
+     */
+    void tab_nav(int val) {
+      tab_nav_ = val;
+    }
+    
+    /**
+     Gets whether the Tab key causes focus navigation in multiline input fields or not.
+     
+     If enabled (default), hitting Tab causes focus navigation to the next widget.
+     
+     If disabled, hitting Tab inserts a tab character into the text field.
+     \returns 1 if Tab advances focus (default), 0 if Tab inserts tab characters.
+     \see tab_nav(int)
+     */
+    int tab_nav() const {
+      return tab_nav_;
+    }
+  };
+  
+}
+
+#endif 
+
+//
+// End of "$Id: Input_.h 8068 2010-12-20 07:48:59Z greg.ercolano $".
+//

Deleted: branches/branch-3.0/include/fltk3/MenuItem.h

Copied: branches/branch-3.0/include/fltk3/MenuItem.h (from rev 8988, branches/branch-3.0/fltk3/MenuItem.h)
===================================================================
--- branches/branch-3.0/include/fltk3/MenuItem.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/MenuItem.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,433 @@
+//
+// "$Id: MenuItem.h 7983 2010-12-09 00:04:06Z AlbrechtS $"
+//
+// Menu item header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#ifndef Fltk3_Menu_Item_H
+#define Fltk3_Menu_Item_H
+
+#  include "Widget.h"
+#  include "Image.h"
+
+#  if defined(__APPLE__) && defined(check)
+#    undef check
+#  endif
+
+
+namespace fltk3 {
+  
+  class Menu_;
+  
+  enum { // values for flags:
+    MENU_INACTIVE = 1,		///< Deactivate menu item (gray out)
+    MENU_TOGGLE= 2,		///< Item is a checkbox toggle (shows checkbox for on/off state)
+    MENU_VALUE = 4,		///< The on/off state for checkbox/radio buttons (if set, state is 'on')
+    MENU_RADIO = 8,		///< Item is a radio button (one checkbox of many can be on)
+    MENU_INVISIBLE = 0x10,	///< Item will not show up (shortcut will work)
+    SUBMENU_POINTER = 0x20,	///< Indicates user_data() is a pointer to another menu array
+    SUBMENU = 0x40,		///< This item is a submenu to other items
+    MENU_DIVIDER = 0x80,	///< Creates divider line below this item. Also ends a group of radio buttons.
+    MENU_HORIZONTAL = 0x100	///< ??? -- reserved
+  };
+  
+  extern FLTK3_EXPORT fltk3::Shortcut old_shortcut(const char*);
+    
+  /**
+   The fltk3::MenuItem structure defines a single menu item that
+   is used by the fltk3::Menu_ class.  
+   \code
+   struct fltk3::MenuItem {
+   const char*		text;     // label()
+   ulong		shortcut_;
+   fltk3::Callback*		callback_;
+   void*		user_data_;
+   int			flags;
+   uchar		labeltype_;
+   uchar		labelfont_;
+   uchar		labelsize_;
+   uchar		labelcolor_;
+   };
+   
+   enum { // values for flags:
+   fltk3::MENU_INACTIVE	= 1,      // Deactivate menu item (gray out)
+   fltk3::MENU_TOGGLE	= 2,      // Item is a checkbox toggle (shows checkbox for on/off state)
+   fltk3::MENU_VALUE	= 4,      // The on/off state for checkbox/radio buttons (if set, state is 'on')
+   fltk3::MENU_RADIO	= 8,      // Item is a radio button (one checkbox of many can be on)
+   fltk3::MENU_INVISIBLE	= 0x10,   // Item will not show up (shortcut will work)
+   fltk3::SUBMENU_POINTER	= 0x20,   // Indicates user_data() is a pointer to another menu array
+   fltk3::SUBMENU		= 0x40,   // This item is a submenu to other items
+   fltk3::MENU_DIVIDER	= 0x80,   // Creates divider line below this item. Also ends a group of radio buttons.
+   fltk3::MENU_HORIZONTAL	= 0x100   // ??? -- reserved
+   };
+   \endcode
+   Typically menu items are statically defined; for example:
+   \code
+   fltk3::MenuItem popup[] = {
+   {"&alpha",   fltk3::ALT+'a', the_cb, (void*)1},
+   {"&beta",    fltk3::ALT+'b', the_cb, (void*)2},
+   {"gamma",    fltk3::ALT+'c', the_cb, (void*)3, fltk3::MENU_DIVIDER},
+   {"&strange",  0,   strange_cb},
+   {"&charm",    0,   charm_cb},
+   {"&truth",    0,   truth_cb},
+   {"b&eauty",   0,   beauty_cb},
+   {"sub&menu",  0,   0, 0, fltk3::SUBMENU},
+   {"one"},
+   {"two"},
+   {"three"},
+   {0},
+   {"inactive", fltk3::ALT+'i', 0, 0, fltk3::MENU_INACTIVE|fltk3::MENU_DIVIDER},
+   {"invisible",fltk3::ALT+'i', 0, 0, fltk3::MENU_INVISIBLE},
+   {"check",    fltk3::ALT+'i', 0, 0, fltk3::MENU_TOGGLE|fltk3::MENU_VALUE},
+   {"box",      fltk3::ALT+'i', 0, 0, fltk3::MENU_TOGGLE},
+   {0}};
+   \endcode
+   produces:
+   
+   \image html   menu.png
+   \image latex  menu.png "menu" width=10cm
+   
+   A submenu title is identified by the bit fltk3::SUBMENU in the 
+   flags field, and ends with a label() that is NULL.
+   You can nest menus to any depth.  A pointer to the first item in the
+   submenu can be treated as an fltk3::Menu array itself.  It is also
+   possible to make separate submenu arrays with fltk3::SUBMENU_POINTER flags.
+   
+   You should use the method functions to access structure members and
+   not access them directly to avoid compatibility problems with future
+   releases of FLTK.
+   */
+  struct FLTK3_EXPORT MenuItem {
+    const char *text;	    ///< menu item text, returned by label()
+    unsigned int shortcut_;	    ///< menu item shortcut
+    fltk3::Callback *callback_;   ///< menu item callback
+    void *user_data_;	    ///< menu item user_data for the menu's callback
+    int flags;		    ///< menu item flags like fltk3::MENU_TOGGLE, fltk3::MENU_RADIO
+    uchar labeltype_;	    ///< how the menu item text looks like
+    fltk3::Font labelfont_;	    ///< which font for this menu item text
+    fltk3::Fontsize labelsize_;   ///< size of menu item text
+    fltk3::Color labelcolor_;	    ///< menu item text color
+    
+    // advance N items, skipping submenus:
+    const fltk3::MenuItem *next(int=1) const;
+    
+    /**
+     Advances a pointer by n items through a menu array, skipping
+     the contents of submenus and invisible items. There are two calls so
+     that you can advance through const and non-const data.
+     */
+    fltk3::MenuItem *next(int i=1) {
+      return (fltk3::MenuItem*)(((const fltk3::MenuItem*)this)->next(i));}
+    
+    /** Returns the first menu item, same as next(0). */
+    const fltk3::MenuItem *first() const { return next(0); }
+    
+    /** Returns the first menu item, same as next(0). */
+    fltk3::MenuItem *first() { return next(0); }
+    
+    // methods on menu items:
+    /**
+     Returns the title of the item.
+     A NULL here indicates the end of the menu (or of a submenu).
+     A '&' in the item will print an underscore under the next letter,
+     and if the menu is popped up that letter will be a "shortcut" to pick
+     that item.  To get a real '&' put two in a row.
+     */
+    const char* label() const {return text;}
+    
+    /**    See const char* fltk3::MenuItem::label() const   */
+    void label(const char* a) {text=a;}
+    
+    /**    See const char* fltk3::MenuItem::label() const   */
+    void label(fltk3::Labeltype a,const char* b) {labeltype_ = a; text = b;}
+    
+    /**
+     Returns the menu item's labeltype.
+     A labeltype identifies a routine that draws the label of the
+     widget.  This can be used for special effects such as emboss, or to use
+     the label() pointer as another form of data such as a bitmap.
+     The value fltk3::NORMAL_LABEL prints the label as text.
+     */
+    fltk3::Labeltype labeltype() const {return (fltk3::Labeltype)labeltype_;}
+    
+    /**
+     Sets the menu item's labeltype.
+     A labeltype identifies a routine that draws the label of the
+     widget.  This can be used for special effects such as emboss, or to use
+     the label() pointer as another form of data such as a bitmap.
+     The value fltk3::NORMAL_LABEL prints the label as text.
+     */
+    void labeltype(fltk3::Labeltype a) {labeltype_ = a;}
+    
+    /**
+     Gets the menu item's label color.
+     This color is passed to the labeltype routine, and is typically the
+     color of the label text.  This defaults to fltk3::BLACK.  If this
+     color is not black fltk will \b not use overlay bitplanes to draw
+     the menu - this is so that images put in the menu draw correctly.
+     */
+    fltk3::Color labelcolor() const {return labelcolor_;}
+    
+    /**
+     Sets the menu item's label color.
+     \see fltk3::Color fltk3::MenuItem::labelcolor() const
+     */
+    void labelcolor(fltk3::Color a) {labelcolor_ = a;}
+    /**
+     Gets the menu item's label font.
+     Fonts are identified by small 8-bit indexes into a table. See the
+     enumeration list for predefined fonts. The default value is a
+     Helvetica font. The function fltk3::set_font() can define new fonts.
+     */
+    fltk3::Font labelfont() const {return labelfont_;}
+    
+    /**
+     Sets the menu item's label font.
+     Fonts are identified by small 8-bit indexes into a table. See the
+     enumeration list for predefined fonts. The default value is a
+     Helvetica font.  The function fltk3::set_font() can define new fonts.
+     */
+    void labelfont(fltk3::Font a) {labelfont_ = a;}
+    
+    /** Gets the label font pixel size/height. */
+    fltk3::Fontsize labelsize() const {return labelsize_;}
+    
+    /** Sets the label font pixel size/height.*/
+    void labelsize(fltk3::Fontsize a) {labelsize_ = a;}
+    
+    /**
+     Returns the callback function that is set for the menu item.
+     Each item has space for a callback function and an argument for that
+     function. Due to back compatibility, the fltk3::MenuItem itself
+     is not passed to the callback, instead you have to get it by calling
+     ((fltk3::Menu_*)w)->mvalue() where w is the widget argument.
+     */
+    fltk3::CallbackPtr callback() const {return callback_;}
+    
+    /**
+     Sets the menu item's callback function and userdata() argument.
+     \see fltk3::CallbackPtr fltk3::MenuItem::callback() const
+     */
+    void callback(fltk3::Callback* c, void* p) {callback_=c; user_data_=p;}
+    
+    /**
+     Sets the menu item's callback function.
+     This method does not set the userdata() argument.
+     \see fltk3::CallbackPtr fltk3::MenuItem::callback() const
+     */
+    void callback(fltk3::Callback* c) {callback_=c;}
+    
+    /**
+     Sets the menu item's callback function.
+     This method does not set the userdata() argument.
+     \see fltk3::CallbackPtr fltk3::MenuItem::callback() const
+     */
+    void callback(fltk3::Callback0*c) {callback_=(fltk3::Callback*)c;}
+    
+    /**
+     Sets the menu item's callback function and userdata() argument.
+     This method does not set the userdata() argument.
+     The argument \p is cast to void* and stored as the userdata()
+     for the menu item's callback function.
+     \see fltk3::CallbackPtr fltk3::MenuItem::callback() const
+     */
+    void callback(fltk3::Callback1*c, long p=0) {callback_=(fltk3::Callback*)c; user_data_=(void*)p;}
+    
+    /**
+     Gets the user_data() argument that is sent to the callback function.
+     */
+    void* user_data() const {return user_data_;}
+    /**
+     Sets the user_data() argument that is sent to the callback function.
+     */
+    void user_data(void* v) {user_data_ = v;}
+    /**
+     Gets the user_data() argument that is sent to the callback function.
+     For convenience you can also define the callback as taking a long
+     argument.  This method casts the stored userdata() argument to long
+     and returns it as a \e long value.
+     */
+    long argument() const {return (long)(fl_intptr_t)user_data_;}
+    /**
+     Sets the user_data() argument that is sent to the callback function.
+     For convenience you can also define the callback as taking a long
+     argument.  This method casts the given argument \p v to void*
+     and stores it in the menu item's userdata() member.
+     This may not be portable to some machines.
+     */
+    void argument(long v) {user_data_ = (void*)v;}
+    
+    /** Gets what key combination shortcut will trigger the menu item. */
+    unsigned int shortcut() const {return shortcut_;}
+    
+    /**
+     Sets exactly what key combination will trigger the menu item.  The
+     value is a logical 'or' of a key and a set of shift flags, for instance 
+     fltk3::ALT+'a' or fltk3::ALT+fltk3::FKey+10 or just 'a'.  A value of
+     zero disables the shortcut.
+     
+     The key can be any value returned by fltk3::event_key(), but will usually 
+     be an ASCII letter. Use a lower-case letter unless you require the shift 
+     key to be held down.
+     
+     The shift flags can be any set of values accepted by fltk3::event_state().
+     If the bit is on that shift key must be pushed.  Meta, Alt, Ctrl, 
+     and Shift must be off if they are not in the shift flags (zero for the 
+     other bits indicates a "don't care" setting).
+     */
+    void shortcut(unsigned int s) {shortcut_ = s;}
+    /**
+     Returns true if either fltk3::SUBMENU or fltk3::SUBMENU_POINTER
+     is on in the flags. fltk3::SUBMENU indicates an embedded submenu
+     that goes from the next item through the next one with a NULL
+     label(). fltk3::SUBMENU_POINTER indicates that user_data()
+     is a pointer to another menu array.
+     */
+    int submenu() const {return flags&(SUBMENU|SUBMENU_POINTER);}
+    /**
+     Returns true if a checkbox will be drawn next to this item.
+     This is true if fltk3::MENU_TOGGLE or fltk3::MENU_RADIO is set in the flags.
+     */
+    int checkbox() const {return flags&MENU_TOGGLE;}
+    /**
+     Returns true if this item is a radio item.
+     When a radio button is selected all "adjacent" radio buttons are
+     turned off.  A set of radio items is delimited by an item that has
+     radio() false, or by an item with fltk3::MENU_DIVIDER turned on.
+     */
+    int radio() const {return flags&MENU_RADIO;}
+    /** Returns the current value of the check or radio item. */
+    int value() const {return flags&MENU_VALUE;}
+    /**
+     Turns the check or radio item "on" for the menu item. Note that this
+     does not turn off any adjacent radio items like set_only() does.
+     */
+    void set() {flags |= MENU_VALUE;}
+    
+    /** Turns the check or radio item "off" for the menu item. */
+    void clear() {flags &= ~MENU_VALUE;}
+    
+    void setonly();
+    
+    /** Gets the visibility of an item. */
+    int visible() const {return !(flags&MENU_INVISIBLE);}
+    
+    /** Makes an item visible in the menu. */
+    void show() {flags &= ~MENU_INVISIBLE;}
+    
+    /** Hides an item in the menu. */
+    void hide() {flags |= MENU_INVISIBLE;}
+    
+    /** Gets whether or not the item can be picked. */
+    int active() const {return !(flags&MENU_INACTIVE);}
+    
+    /** Allows a menu item to be picked. */
+    void activate() {flags &= ~MENU_INACTIVE;}
+    /**
+     Prevents a menu item from being picked. Note that this will also cause
+     the menu item to appear grayed-out.
+     */
+    void deactivate() {flags |= MENU_INACTIVE;}
+    /** Returns non 0 if fltk3::INACTIVE and fltk3::INVISIBLE are cleared, 0 otherwise. */
+    int activevisible() const {return !(flags & (MENU_INACTIVE|MENU_INVISIBLE));}
+    
+    // compatibility for FLUID so it can set the image of a menu item...
+    
+    /** compatibility api for FLUID, same as a->label(this) */
+    void image(fltk3::Image* a) {a->label(this);}
+    
+    /** compatibility api for FLUID, same as a.label(this) */
+    void image(fltk3::Image& a) {a.label(this);}
+    
+    // used by menubar:
+    int measure(int* h, const fltk3::Menu_*) const;
+    void draw(int x, int y, int w, int h, const fltk3::Menu_*, int t=0) const;
+    
+    // popup menus without using an fltk3::Menu_ widget:
+    const fltk3::MenuItem* popup(
+                                 int X, int Y,
+                                 const char *title = 0,
+                                 const fltk3::MenuItem* picked=0,
+                                 const fltk3::Menu_* = 0) const;
+    const fltk3::MenuItem* pulldown(
+                                    int X, int Y, int W, int H,
+                                    const fltk3::MenuItem* picked = 0,
+                                    const fltk3::Menu_* = 0,
+                                    const fltk3::MenuItem* title = 0,
+                                    int menubar=0) const;
+    const fltk3::MenuItem* test_shortcut() const;
+    const fltk3::MenuItem* find_shortcut(int *ip=0, const bool require_alt = false) const;
+    
+    /**
+     Calls the fltk3::MenuItem item's callback, and provides the fltk3::Widget argument.
+     The callback is called with the stored user_data() as its second argument.
+     You must first check that callback() is non-zero before calling this.
+     */
+    void do_callback(fltk3::Widget* o) const {callback_(o, user_data_);}
+    
+    /**
+     Calls the fltk3::MenuItem item's callback, and provides the fltk3::Widget argument.
+     This call overrides the callback's second argument with the given value \p arg.
+     You must first check that callback() is non-zero before calling this.
+     */
+    void do_callback(fltk3::Widget* o,void* arg) const {callback_(o, arg);}
+    
+    /**
+     Calls the fltk3::MenuItem item's callback, and provides the fltk3::Widget argument.
+     This call overrides the callback's second argument with the
+     given value \p arg. long \p arg is cast to void* when calling
+     the callback.
+     You must first check that callback() is non-zero before calling this.
+     */
+    void do_callback(fltk3::Widget* o,long arg) const {callback_(o, (void*)arg);}
+    
+    // back-compatibility, do not use:
+    
+    /** back compatibility only \deprecated. */
+    int checked() const {return flags&MENU_VALUE;}
+    
+    /** back compatibility only \deprecated. */
+    void check() {flags |= MENU_VALUE;}
+    
+    /** back compatibility only \deprecated. */
+    void uncheck() {flags &= ~MENU_VALUE;}
+    
+    int insert(int,const char*,int,fltk3::Callback*,void* =0, int =0);
+    int add(const char*, unsigned int shortcut, fltk3::Callback*, void* =0, int = 0);
+    
+    /** See int add(const char*, unsigned int shortcut, fltk3::Callback*, void*, int) */
+    int add(const char*a, const char* b, fltk3::Callback* c,
+            void* d = 0, int e = 0) {
+      return add(a,fltk3::old_shortcut(b),c,d,e);}
+    
+    int size() const ;
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: MenuItem.h 7983 2010-12-09 00:04:06Z AlbrechtS $".
+//

Deleted: branches/branch-3.0/include/fltk3/Menu_.h

Copied: branches/branch-3.0/include/fltk3/Menu_.h (from rev 8988, branches/branch-3.0/fltk3/Menu_.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Menu_.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Menu_.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,156 @@
+//
+// "$Id: Menu_.h 7903 2010-11-28 21:06:39Z matt $"
+//
+// Menu base class header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Menu_ widget . */
+
+#ifndef Fltk3_Menu__H
+#define Fltk3_Menu__H
+
+#include "Widget.h"
+#include "MenuItem.h"
+
+
+namespace fltk3 {
+  
+  
+  /**
+   Base class of all widgets that have a menu in FLTK.
+   Currently FLTK provides you with 
+   fltk3::MenuButton, fltk3::MenuBar, and fltk3::Choice.
+   
+   <P>The class contains a pointer to an array of structures of type  fltk3::MenuItem.  The
+   array may either be supplied directly by the user program, or it may
+   be "private": a dynamically allocated array managed by the fltk3::Menu_.
+   */
+  class FLTK3_EXPORT Menu_ : public fltk3::Widget {
+    
+    fltk3::MenuItem *menu_;
+    const fltk3::MenuItem *value_;
+    
+  protected:
+    
+    uchar alloc;			// flag indicates if menu_ is a dynamic copy (=1) or not (=0)
+    uchar down_box_;
+    
+  public:
+    Menu_(int,int,int,int,const char * =0);
+    ~Menu_();
+    
+    int item_pathname(char *name, int namelen, const fltk3::MenuItem *finditem=0) const;
+    const fltk3::MenuItem* picked(const fltk3::MenuItem*);
+    const fltk3::MenuItem* find_item(const char *name);
+    const fltk3::MenuItem* find_item(fltk3::Callback*);
+    int find_index(const char *name) const;
+    int find_index(const fltk3::MenuItem *item) const;
+    int find_index(fltk3::Callback *cb) const;
+    
+    /**
+     Returns the menu item with the entered shortcut (key value).
+     
+     This searches the complete menu() for a shortcut that matches the
+     entered key value.  It must be called for a fltk3::KEYBOARD or fltk3::SHORTCUT
+     event.
+     
+     If a match is found, the menu's callback will be called.
+     
+     \return matched fltk3::MenuItem or NULL.
+     */
+    const fltk3::MenuItem* test_shortcut() {return picked(menu()->test_shortcut());}
+    void global();
+    
+    /**
+     Returns a pointer to the array of fltk3::MenuItems.  This will either be
+     the value passed to menu(value) or the private copy.
+     */  
+    const fltk3::MenuItem *menu() const {return menu_;}
+    void menu(const fltk3::MenuItem *m);
+    void copy(const fltk3::MenuItem *m, void* user_data = 0);
+    int insert(int index, const char*, unsigned int shortcut, fltk3::Callback*, void* = 0, int = 0);
+    int  add(const char*, unsigned int shortcut, fltk3::Callback*, void* = 0, int = 0);
+    /** See int fltk3::Menu_::add(const char* label, unsigned int shortcut, fltk3::Callback*, void *user_data=0, int flags=0) */
+    int  add(const char* a, const char* b, fltk3::Callback* c, void* d = 0, int e = 0) {
+      return add(a,fltk3::old_shortcut(b),c,d,e);
+    }
+    /** See int fltk3::Menu_::insert(const char* label, unsigned int shortcut, fltk3::Callback*, void *user_data=0, int flags=0) */
+    int insert(int index, const char* a, const char* b, fltk3::Callback* c, void* d = 0, int e = 0) {
+      return insert(index,a,fltk3::old_shortcut(b),c,d,e);
+    }
+    int  add(const char *);
+    int  size() const ;
+    void size(int W, int H) { Widget::size(W, H); }
+    void clear();
+    int clear_submenu(int index);
+    void replace(int,const char *);
+    void remove(int);
+    /** Changes the shortcut of item i to n.  */
+    void shortcut(int i, unsigned int s) {menu_[i].shortcut(s);}
+    /** Sets the flags of item i.  For a list of the flags, see fltk3::MenuItem.  */
+    void mode(int i,int fl) {menu_[i].flags = fl;}
+    /** Gets the flags of item i.  For a list of the flags, see fltk3::MenuItem.  */
+    int  mode(int i) const {return menu_[i].flags;}
+    
+    /** Returns a pointer to the last menu item that was picked.  */
+    const fltk3::MenuItem *mvalue() const {return value_;}
+    /** Returns the index into menu() of the last item chosen by the user.  It is zero initially. */
+    int value() const {return value_ ? (int)(value_-menu_) : -1;}
+    int value(const fltk3::MenuItem*);
+    /**
+     The value is the index into menu() of the last item chosen by
+     the user.  It is zero initially.  You can set it as an integer, or set
+     it with a pointer to a menu item.  The set routines return non-zero if
+     the new value is different than the old one.
+     */
+    int value(int i) {return value(menu_+i);}
+    /** Returns the title of the last item chosen.  */
+    const char *text() const {return value_ ? value_->text : 0;}
+    /** Returns the title of item i.  */
+    const char *text(int i) const {return menu_[i].text;}
+    
+    /**
+     This box type is used to surround the currently-selected items in the
+     menus.  If this is fltk3::NO_BOX then it acts like 
+     fltk3::THIN_UP_BOX and selection_color() acts like 
+     fltk3::WHITE, for back compatibility.    
+     */
+    fltk3::Boxtype down_box() const {return (fltk3::Boxtype)down_box_;}
+    /**    See fltk3::Boxtype fltk3::Menu_::down_box() const   */
+    void down_box(fltk3::Boxtype b) {down_box_ = b;}
+    
+    /** For back compatibility, same as selection_color() */
+    fltk3::Color down_color() const {return selection_color();}
+    /** For back compatibility, same as selection_color() */
+    void down_color(unsigned c) {selection_color(c);}
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: Menu_.h 7903 2010-11-28 21:06:39Z matt $".
+//

Copied: branches/branch-3.0/include/fltk3/Style.h (from rev 8989, branches/branch-3.0/fltk3/Style.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Style.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Style.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,39 @@
+//
+// "$Id: Style.h 8623 2011-04-24 17:09:41Z AlbrechtS $"
+//
+// Style header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/** \file
+ fltk3::Style class . */
+
+#ifndef FLTK3_STYLE_H
+#define FLTK3_STYLE_H
+
+
+#endif
+
+//
+// End of "$Id: Style.h 8623 2011-04-24 17:09:41Z AlbrechtS $".
+//

Deleted: branches/branch-3.0/include/fltk3/SysMenuBar.h

Copied: branches/branch-3.0/include/fltk3/SysMenuBar.h (from rev 8988, branches/branch-3.0/fltk3/SysMenuBar.h)
===================================================================
--- branches/branch-3.0/include/fltk3/SysMenuBar.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/SysMenuBar.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,89 @@
+//
+// "$Id: SysMenuBar.h 7903 2010-11-28 21:06:39Z matt $"
+//
+// MacOS system menu bar header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#ifndef Fltk3_Sys_Menu_Bar_H
+#define Fltk3_Sys_Menu_Bar_H
+
+#include "MenuBar.h"
+#include "x.h"
+
+class Fl_Sys_Menu_Bar;
+
+namespace fltk3 {
+  
+#if defined(__APPLE__) || defined(FLTK3_DOXYGEN)
+  
+  /**
+   @brief A class to create, modify and delete menus that appear on Mac OS X in the menu bar at the top of the screen.
+   *
+   * On other than Mac OS X platforms, fltk3::SysMenuBar is a synonym of class fltk3::MenuBar.
+   */
+  class FLTK3_EXPORT SysMenuBar : public fltk3::MenuBar {
+
+    friend class ::Fl_Sys_Menu_Bar;
+
+  protected:
+    void draw();
+  public:
+    /**
+     @brief The constructor.
+     *
+     * On Mac OS X, all arguments are unused. On other platforms they are used as by fltk3::MenuBar::fltk3::MenuBar().
+     */
+    SysMenuBar(int x,int y,int w,int h,const char *l=0)
+    : fltk3::MenuBar(x,y,w,h,l) {
+      deactivate();			// don't let the old area take events
+      fltk3::sys_menu_bar = this;
+    }
+    void menu(const fltk3::MenuItem *m);
+    int add(const char* label, unsigned int shortcut, fltk3::Callback*, void *user_data=0, int flags=0);
+    int insert(int index, const char* label, unsigned int shortcut, fltk3::Callback *cb, void *user_data=0, int flags=0);
+    void remove(int n);
+    void replace(int rank, const char *name);
+    void clear();
+    int clear_submenu(int index);
+#if ! defined(FLTK3_DOXYGEN)
+    enum menuOrItemOperation { itemAtIndex, setKeyEquivalent, setKeyEquivalentModifierMask, setState, initWithTitle,
+      numberOfItems, setSubmenu, setEnabled, addSeparatorItem, setTitle, removeItem, addNewItem, renameItem };
+    // function doMenuOrItemOperation is in file F|_cocoa.mm because it contains objective-c code
+    static void *doMenuOrItemOperation( menuOrItemOperation operation, ...);
+#endif
+  };
+  
+#else
+  
+  typedef MenuBar SysMenuBar;
+  
+#endif // defined(__APPLE__) || defined(FLTK3_DOXYGEN)
+  
+}
+
+#endif // Fltk3_Sys_Menu_Bar_H
+
+//
+// End of "$Id: SysMenuBar.h 7903 2010-11-28 21:06:39Z matt $".
+//

Deleted: branches/branch-3.0/include/fltk3/TextDisplay.h

Copied: branches/branch-3.0/include/fltk3/TextDisplay.h (from rev 8988, branches/branch-3.0/fltk3/TextDisplay.h)
===================================================================
--- branches/branch-3.0/include/fltk3/TextDisplay.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/TextDisplay.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,466 @@
+//
+// "$Id: TextDisplay.h 8306 2011-01-24 17:04:22Z matt $"
+//
+// Header file for fltk3::TextDisplay class.
+//
+// Copyright 2001-2010 by Bill Spitzak and others.
+// Original code Copyright Mark Edel.  Permission to distribute under
+// the LGPL for the FLTK library granted by Mark Edel.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::TextDisplay widget . */
+
+#ifndef FLtk3_TEXT_DISPLAY_H
+#define FLtk3_TEXT_DISPLAY_H
+
+#include "draw.h"
+#include "Group.h"
+#include "Widget.h"
+#include "Scrollbar.h"
+#include "TextBuffer.h"
+
+
+class Fl_Text_Display;
+
+
+namespace fltk3 {
+  
+/**
+ \brief Rich text display widget.
+ 
+ This is the FLTK text display widget. It allows the user to view multiple lines
+ of text and supports highlighting and scrolling. The buffer that is displayed 
+ in the widget is managed by the fltk3::TextBuffer class. A single Text Buffer
+ can be displayed by multiple Text Displays.
+ */
+class FLTK3_EXPORT TextDisplay: public fltk3::Group {
+
+friend class ::Fl_Text_Display;
+
+public:
+  
+  /** 
+   text display cursor shapes enumeration 
+   */
+  enum {
+    NORMAL_CURSOR,    /**< I-beam */
+    CARET_CURSOR,     /**< caret under the text */
+    DIM_CURSOR,       /**< dim I-beam */
+    BLOCK_CURSOR,     /**< unfille box under the current character */
+    HEAVY_CURSOR      /**< thick I-beam */
+  };
+  
+  /**
+   the character position is the left edge of a character, whereas 
+   the cursor is thought to be between the centers of two consecutive
+   characters.
+   */
+  enum {
+    CURSOR_POS, 
+    CHARACTER_POS
+  };
+  
+  /** 
+   drag types - they match fltk3::event_clicks() so that single clicking to
+   start a collection selects by character, double clicking selects by
+   word and triple clicking selects by line.
+   */
+  enum {
+    DRAG_NONE = -2,
+    DRAG_START_DND = -1,
+    DRAG_CHAR = 0, 
+    DRAG_WORD = 1, 
+    DRAG_LINE = 2
+  };
+  
+  /**
+   wrap types - used in wrap_mode()
+   */
+  enum {
+    WRAP_NONE,      /**< don't wrap text at all */
+    WRAP_AT_COLUMN, /**< wrap text at the given text column */
+    WRAP_AT_PIXEL,  /**< wrap text at a pixel position */
+    WRAP_AT_BOUNDS  /**< wrap text so that it fits into the widget width */
+  };    
+  
+  friend void text_drag_me(int pos, fltk3::TextDisplay* d);
+  
+  typedef void (*UnfinishedStyleCb)(int, void *);
+  
+  /** 
+   This structure associates the color, font, andsize of a string to draw
+   with an attribute mask matching attr
+   */
+  struct StyleTableEntry {
+    fltk3::Color    color;
+    fltk3::Font     font;
+    fltk3::Fontsize size;
+    unsigned    attr;
+  };
+  
+  TextDisplay(int X, int Y, int W, int H, const char *l = 0);
+  ~TextDisplay();
+  
+  virtual int handle(int e);
+  
+  void buffer(fltk3::TextBuffer* buf);
+  
+  /**
+   Sets the current text buffer associated with the text widget.
+   Multiple text widgets can be associated with the same text buffer.
+   \param buf new text buffer
+   */
+  void buffer(fltk3::TextBuffer& buf) { buffer(&buf); }
+  
+  /**
+   Gets the current text buffer associated with the text widget.
+   Multiple text widgets can be associated with the same text buffer.
+   \return current text buffer
+   */
+  fltk3::TextBuffer* buffer() const { return mBuffer; }
+  
+  void redisplay_range(int start, int end);
+  void scroll(int topLineNum, int horizOffset);
+  void insert(const char* text);
+  void overstrike(const char* text);
+  void insert_position(int newPos);
+  
+  /** 
+   Gets the position of the text insertion cursor for text display.
+   \return insert position index into text buffer 
+   */
+  int insert_position() const { return mCursorPos; }
+  int position_to_xy(int pos, int* x, int* y) const;
+
+  int in_selection(int x, int y) const;
+  void show_insert_position();
+  
+  int move_right();
+  int move_left();
+  int move_up();  
+  int move_down();
+  int count_lines(int start, int end, bool start_pos_is_line_start) const;
+  int line_start(int pos) const;
+  int line_end(int startPos, bool startPosIsLineStart) const;
+  int skip_lines(int startPos, int nLines, bool startPosIsLineStart);
+  int rewind_lines(int startPos, int nLines);
+  void next_word(void);
+  void previous_word(void);
+  
+  void show_cursor(int b = 1);
+  
+  /**
+   Hides the text cursor.
+   */
+  void hide_cursor() { show_cursor(0); }
+  
+  void cursor_style(int style);
+  
+  /**
+   Gets the text cursor color.  
+   \return cursor color
+   */
+  fltk3::Color cursor_color() const {return mCursor_color;}
+  
+  /**    
+   Sets the text cursor color.
+   \param n new cursor color
+   */
+  void cursor_color(fltk3::Color n) {mCursor_color = n;}
+  
+  /**   
+   Gets the width/height of the scrollbars.
+   /return width of scrollbars
+   */
+  int scrollbar_width() const { return scrollbar_width_; }
+  
+  /**
+   Sets the width/height of the scrollbars.
+   \param W width of scrollbars
+   */
+  void scrollbar_width(int W) { scrollbar_width_ = W; }
+  
+  /**
+   Gets the scrollbar alignment type.
+   \return scrollbar alignment
+   */
+  fltk3::Align scrollbar_align() const { return scrollbar_align_; }
+  
+  /**
+   Sets the scrollbar alignment type.
+   \param a new scrollbar alignment
+   */
+  void scrollbar_align(fltk3::Align a) { scrollbar_align_ = a; }
+  
+  /**
+   Moves the insert position to the beginning of the current word.
+   \param pos start calculation at this index
+   \return beginning of the words
+   */
+  int word_start(int pos) const { return buffer()->word_start(pos); }
+  
+  /** 
+   Moves the insert position to the end of the current word.
+   \param pos start calculation at this index
+   \return index of first character after the end of the word
+   */
+  int word_end(int pos) const { return buffer()->word_end(pos); }
+  
+  
+  void highlight_data(fltk3::TextBuffer *styleBuffer,
+                      const StyleTableEntry *styleTable,
+                      int nStyles, char unfinishedStyle,
+                      UnfinishedStyleCb unfinishedHighlightCB,
+                      void *cbArg);
+  
+  int position_style(int lineStartPos, int lineLen, int lineIndex) const;
+  
+  /** 
+   \todo FIXME : get set methods pointing on shortcut_ 
+   have no effects as shortcut_ is unused in this class and derived! 
+   \return the current shortcut key
+   */
+  unsigned int shortcut() const {return shortcut_;}
+  
+  /**
+   \todo FIXME : get set methods pointing on shortcut_ 
+   have no effects as shortcut_ is unused in this class and derived! 
+   \param s the new shortcut key
+   */
+  void shortcut(unsigned int s) {shortcut_ = s;}
+  
+  /**
+   Sets the default font used when drawing text in the widget.
+   \param s default text font face
+   \todo textfont is a method of Widget and should not have this side effect
+   */
+  void textfont(fltk3::Font s) {Widget::textfont(s); mColumnScale = 0;}
+  
+  /**
+   Sets the default size of text in the widget.
+   \param s new text size
+   \todo textsize is a method of Widget and should not have this side effect
+   */
+  void textsize(fltk3::Fontsize s) {Widget::textsize(s); mColumnScale = 0;}
+  fltk3::Font textfont() const {return Widget::textfont();}
+  fltk3::Fontsize textsize() const {return Widget::textsize();}
+  
+  int wrapped_column(int row, int column) const;
+  int wrapped_row(int row) const;
+  void wrap_mode(int wrap, int wrap_margin);
+  
+  virtual void resize(int X, int Y, int W, int H);
+
+  /**
+   Convert an x pixel position into a column number.
+   \param x number of pixels from the left margin
+   \return an approximate column number based on the main font
+   */
+  double x_to_col(double x) const;
+  
+  /**
+   Convert a column number into an x pixel position.
+   \param col an approximate column number based on the main font
+   \return number of pixels from the left margin to the left of an
+	   average sized character
+   */
+  double col_to_x(double col) const;
+  
+protected:
+  // Most (all?) of this stuff should only be called from resize() or
+  // draw().
+  // Anything with "vline" indicates thats it deals with currently
+  // visible lines.
+  
+  virtual void draw();
+  void draw_text(int X, int Y, int W, int H);
+  void draw_range(int start, int end);
+  void draw_cursor(int, int);
+  
+  void draw_string(int style, int x, int y, int toX, const char *string,
+                   int nChars) const;
+  
+  void draw_vline(int visLineNum, int leftClip, int rightClip,
+                  int leftCharIndex, int rightCharIndex);
+  
+  int find_x(const char *s, int len, int style, int x) const;
+  
+  enum { 
+    DRAW_LINE, 
+    FIND_INDEX,
+    FIND_INDEX_FROM_ZERO,
+    GET_WIDTH 
+  };
+  
+  int handle_vline(int mode, 
+                   int lineStart, int lineLen, int leftChar, int rightChar,
+                   int topClip, int bottomClip,
+                   int leftClip, int rightClip) const;
+  
+  void draw_line_numbers(bool clearAll);
+  
+  void clear_rect(int style, int x, int y, int width, int height) const;
+  void display_insert();
+  
+  void offset_line_starts(int newTopLineNum);
+  
+  void calc_line_starts(int startLine, int endLine);
+  
+  void update_line_starts(int pos, int charsInserted, int charsDeleted,
+                          int linesInserted, int linesDeleted, int *scrolled);
+  
+  void calc_last_char();
+  
+  int position_to_line( int pos, int* lineNum ) const;
+  double string_width(const char* string, int length, int style) const;
+  
+  static void scroll_timer_cb(void*);
+  
+  static void buffer_predelete_cb(int pos, int nDeleted, void* cbArg);
+  static void buffer_modified_cb(int pos, int nInserted, int nDeleted,
+                                 int nRestyled, const char* deletedText,
+                                 void* cbArg);
+  
+  static void h_scrollbar_cb(fltk3::Scrollbar* w, fltk3::TextDisplay* d);
+  static void v_scrollbar_cb( fltk3::Scrollbar* w, fltk3::TextDisplay* d);
+  void update_v_scrollbar();
+  void update_h_scrollbar();
+  int measure_vline(int visLineNum) const;
+  int longest_vline() const;
+  int empty_vlines() const;
+  int vline_length(int visLineNum) const;
+  int xy_to_position(int x, int y, int PosType = CHARACTER_POS) const;
+  
+  void xy_to_rowcol(int x, int y, int* row, int* column,
+                    int PosType = CHARACTER_POS) const;
+  void maintain_absolute_top_line_number(int state);
+  int get_absolute_top_line_number() const;
+  void absolute_top_line_number(int oldFirstChar);
+  int maintaining_absolute_top_line_number() const;
+  void reset_absolute_top_line_number();
+  int position_to_linecol(int pos, int* lineNum, int* column) const;
+  int scroll_(int topLineNum, int horizOffset);
+  
+  void extend_range_for_styles(int* start, int* end);
+  
+  void find_wrap_range(const char *deletedText, int pos, int nInserted,
+                       int nDeleted, int *modRangeStart, int *modRangeEnd,
+                       int *linesInserted, int *linesDeleted);
+  void measure_deleted_lines(int pos, int nDeleted);
+  void wrapped_line_counter(fltk3::TextBuffer *buf, int startPos, int maxPos,
+                            int maxLines, bool startPosIsLineStart,
+                            int styleBufOffset, int *retPos, int *retLines,
+                            int *retLineStart, int *retLineEnd,
+                            bool countLastLineMissingNewLine = true) const;
+  void find_line_end(int pos, bool start_pos_is_line_start, int *lineEnd,
+                     int *nextLineStart) const;
+  double measure_proportional_character(const char *s, int colNum, int pos) const;
+  int wrap_uses_character(int lineEndPos) const;
+  
+  int damage_range1_start, damage_range1_end;
+  int damage_range2_start, damage_range2_end;
+  int mCursorPos;
+  int mCursorOn;
+  int mCursorOldY;              /* Y pos. of cursor for blanking */
+  int mCursorToHint;            /* Tells the buffer modified callback
+                                 where to move the cursor, to reduce
+                                 the number of redraw calls */
+  int mCursorStyle;             /* One of enum cursorStyles above */
+  int mCursorPreferredXPos;     /* Pixel position for vert. cursor movement */
+  int mNVisibleLines;           /* # of visible (displayed) lines */
+  int mNBufferLines;            /* # of newlines in the buffer */
+  fltk3::TextBuffer* mBuffer;      /* Contains text to be displayed */
+  fltk3::TextBuffer* mStyleBuffer; /* Optional parallel buffer containing
+                                 color and font information */
+  int mFirstChar, mLastChar;    /* Buffer positions of first and last
+                                 displayed character (lastChar points
+                                 either to a newline or one character
+                                 beyond the end of the buffer) */
+  int mContinuousWrap;          /* Wrap long lines when displaying */
+  int mWrapMarginPix; 	    	/* Margin in # of pixels for
+                                 wrapping in continuousWrap mode */
+  int* mLineStarts;
+  int mTopLineNum;              /* Line number of top displayed line
+                                 of file (first line of file is 1) */
+  int mAbsTopLineNum;           /* In continuous wrap mode, the line
+                                  number of the top line if the text
+                                  were not wrapped (note that this is
+                                  only maintained as needed). */
+  int mNeedAbsTopLineNum;       /* Externally settable flag to continue
+                                 maintaining absTopLineNum even if
+                                 it isn't needed for line # display */
+  int mHorizOffset;             /* Horizontal scroll pos. in pixels */
+  int mTopLineNumHint;          /* Line number of top displayed line
+                                 of file (first line of file is 1) */
+  int mHorizOffsetHint;         /* Horizontal scroll pos. in pixels */
+  int mNStyles;                 /* Number of entries in styleTable */
+  const StyleTableEntry *mStyleTable; /* Table of fonts and colors for
+                                         coloring/syntax-highlighting */
+  char mUnfinishedStyle;        /* Style buffer entry which triggers
+                                 on-the-fly reparsing of region */
+  UnfinishedStyleCb mUnfinishedHighlightCB; /* Callback to parse "unfinished" */
+  /* regions */
+  void* mHighlightCBArg;        /* Arg to unfinishedHighlightCB */
+  
+  int mMaxsize;
+  
+  int mSuppressResync;          /* Suppress resynchronization of line
+                                 starts during buffer updates */
+  int mNLinesDeleted;           /* Number of lines deleted during
+                                 buffer modification (only used
+                                 when resynchronization is suppressed) */
+  int mModifyingTabDistance;    /* Whether tab distance is being
+                                 modified */
+  
+  mutable double mColumnScale; /* Width in pixels of an average character. This
+                                 value is calculated as needed (lazy eval); it 
+                                 needs to be mutable so that it can be calculated
+                                 within a method marked as "const" */
+  
+  fltk3::Color mCursor_color;
+  
+  fltk3::Scrollbar* mHScrollBar;
+  fltk3::Scrollbar* mVScrollBar;
+  int scrollbar_width_;
+  fltk3::Align scrollbar_align_;
+  int dragPos, dragType, dragging;
+  int display_insert_position_hint;
+  struct { int x, y, w, h; } text_area;
+  
+  unsigned int shortcut_;
+  
+  // The following are not presently used from the original NEdit code,
+  // but are being put here so that future versions of fltk3::TextDisplay
+  // can implement line numbers without breaking binary compatibility.
+  
+  /* Line number margin and width */
+  int mLineNumLeft, mLineNumWidth;
+};
+
+} // namespace
+
+#endif
+
+//
+// End of "$Id: TextDisplay.h 8306 2011-01-24 17:04:22Z matt $".
+//

Deleted: branches/branch-3.0/include/fltk3/TextEditor.h

Copied: branches/branch-3.0/include/fltk3/TextEditor.h (from rev 8988, branches/branch-3.0/fltk3/TextEditor.h)
===================================================================
--- branches/branch-3.0/include/fltk3/TextEditor.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/TextEditor.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,152 @@
+//
+// "$Id: TextEditor.h 7903 2010-11-28 21:06:39Z matt $"
+//
+// Header file for fltk3::TextEditor class.
+//
+// Copyright 2001-2010 by Bill Spitzak and others.
+// Original code Copyright Mark Edel.  Permission to distribute under
+// the LGPL for the FLTK library granted by Mark Edel.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::TextEditor widget . */
+
+
+#ifndef FLtk3_TEXT_EDITOR_H
+#define FLtk3_TEXT_EDITOR_H
+
+#include "TextDisplay.h"
+
+
+class Fl_Text_Editor;
+
+
+namespace fltk3 {
+
+  // key will match in any state
+  const unsigned int TEXT_EDITOR_ANY_STATE = -1L;
+  
+  /**
+   This is the FLTK text editor widget. It allows the user to
+   edit multiple lines of text and supports highlighting and
+   scrolling. The buffer that is displayed in the widget is managed
+   by the fltk3::TextBuffer
+   class.
+   */
+  class FLTK3_EXPORT TextEditor : public fltk3::TextDisplay {
+
+    friend class ::Fl_Text_Editor;
+
+  public:
+    /** Key function binding callback type */
+    typedef int (*KeyFunc)(unsigned int key, fltk3::TextEditor* editor);
+    
+    /** Simple linked list associating a key/state to a function */
+    struct KeyBinding {
+      unsigned int key;		///< the key pressed
+      unsigned int state;	///< the state of key modifiers
+      KeyFunc     function;	///< associated function
+      KeyBinding* next;	///< next key binding in the list
+    };
+    
+    TextEditor(int X, int Y, int W, int H, const char* l = 0);
+    ~TextEditor() { remove_all_key_bindings(); }
+    virtual int handle(int e);
+    /**
+     Sets the current insert mode; if non-zero, new text
+     is inserted before the current cursor position. Otherwise, new
+     text replaces text at the current cursor position.
+     */
+    void insert_mode(int b) { insert_mode_ = b; }
+    /**
+     Gets the current insert mode; if non-zero, new text
+     is inserted before the current cursor position. Otherwise, new
+     text replaces text at the current cursor position.
+     */
+    int insert_mode() { return insert_mode_; }
+    
+    void add_key_binding(unsigned key, unsigned state, KeyFunc f, KeyBinding** list);
+    /** Adds a key of state "state" with the function "function" */
+    void add_key_binding(unsigned key, unsigned state, KeyFunc f)
+    { add_key_binding(key, state, f, &key_bindings); }
+    void remove_key_binding(unsigned key, unsigned state, KeyBinding** list);
+    /** Removes the key binding associated with the key "key" of state "state". */
+    void remove_key_binding(unsigned key, unsigned state)
+    { remove_key_binding(key, state, &key_bindings); }
+    void remove_all_key_bindings(KeyBinding** list);
+    /** Removes all of the key bindings associated with the text editor or list. */
+    void remove_all_key_bindings() { remove_all_key_bindings(&key_bindings); }
+    void add_default_key_bindings(KeyBinding** list);
+    KeyFunc bound_key_function(unsigned int key, unsigned int state, KeyBinding* list);
+    /**  Returns the function associated with a key binding. */
+    KeyFunc bound_key_function(unsigned int key, unsigned int state)
+    { return bound_key_function(key, state, key_bindings); }
+    /**  Sets the default key function for unassigned keys. */
+    void default_key_function(KeyFunc f) { default_key_function_ = f; }
+    
+    // functions for the built in default bindings
+    static int kf_default(unsigned int c, fltk3::TextEditor* e);
+    static int kf_ignore(unsigned int c, fltk3::TextEditor* e);
+    static int kf_backspace(unsigned int c, fltk3::TextEditor* e);
+    static int kf_enter(unsigned int c, fltk3::TextEditor* e);
+    static int kf_move(unsigned int c, fltk3::TextEditor* e);
+    static int kf_shift_move(unsigned int c, fltk3::TextEditor* e);
+    static int kf_ctrl_move(unsigned int c, fltk3::TextEditor* e);
+    static int kf_c_s_move(unsigned int c, fltk3::TextEditor* e);
+    static int kf_meta_move(unsigned int c, fltk3::TextEditor* e);
+    static int kf_m_s_move(unsigned int c, fltk3::TextEditor* e);
+    static int kf_home(unsigned int, fltk3::TextEditor* e);
+    static int kf_end(unsigned int c, fltk3::TextEditor* e);
+    static int kf_left(unsigned int c, fltk3::TextEditor* e);
+    static int kf_up(unsigned int c, fltk3::TextEditor* e);
+    static int kf_right(unsigned int c, fltk3::TextEditor* e);
+    static int kf_down(unsigned int c, fltk3::TextEditor* e);
+    static int kf_page_up(unsigned int c, fltk3::TextEditor* e);
+    static int kf_page_down(unsigned int c, fltk3::TextEditor* e);
+    static int kf_insert(unsigned int c, fltk3::TextEditor* e);
+    static int kf_delete(unsigned int c, fltk3::TextEditor* e);
+    static int kf_copy(unsigned int c, fltk3::TextEditor* e);
+    static int kf_cut(unsigned int c, fltk3::TextEditor* e);
+    static int kf_paste(unsigned int c, fltk3::TextEditor* e);
+    static int kf_select_all(unsigned int c, fltk3::TextEditor* e);
+    static int kf_undo(unsigned int c, fltk3::TextEditor* e);
+    
+  protected:
+    int handle_key();
+    void maybe_do_callback();
+    
+#ifndef FLTK3_DOXYGEN
+    int insert_mode_;
+    KeyBinding* key_bindings;
+    static KeyBinding* global_key_bindings;
+    KeyFunc default_key_function_;
+#endif
+  };
+  
+} // namespace
+
+#endif
+
+//
+// End of "$Id: TextEditor.h 7903 2010-11-28 21:06:39Z matt $".
+//
+

Deleted: branches/branch-3.0/include/fltk3/Tree.h

Copied: branches/branch-3.0/include/fltk3/Tree.h (from rev 8988, branches/branch-3.0/fltk3/Tree.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Tree.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Tree.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,1025 @@
+//
+// "$Id: Tree.h 8632 2011-05-04 02:59:50Z greg.ercolano $"
+//
+
+#ifndef FLtk3_TREE_H
+#define FLtk3_TREE_H
+
+#include <fltk3/run.h>
+#include <fltk3/Group.h>
+#include <fltk3/Scrollbar.h>
+#include <fltk3/draw.h>
+
+#include <fltk3/TreeItem.h>
+#include <fltk3/TreePrefs.h>
+
+class Fl_Tree;
+
+namespace fltk3 {
+  
+  //////////////////////
+  // fltk3/Tree.h
+  //////////////////////
+  //
+  // fltk3::Tree -- This file is part of the fltk3::Tree widget for FLTK
+  // Copyright (C) 2009-2010 by Greg Ercolano.
+  //
+  // This library is free software; you can redistribute it and/or
+  // modify it under the terms of the GNU Library General Public
+  // License as published by the Free Software Foundation; either
+  // version 2 of the License, or (at your option) any later version.
+  //
+  // This library is distributed in the hope that it will be useful,
+  // but WITHOUT ANY WARRANTY; without even the implied warranty of
+  // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  // Library General Public License for more details.
+  //
+  // You should have received a copy of the GNU Library General Public
+  // License along with this library; if not, write to the Free Software
+  // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  // USA.
+  //
+  
+  ///
+  /// \file
+  /// \brief This file contains the definitions of the fltk3::Tree class
+  ///
+  
+  /// \class fltk3::Tree
+  ///
+  /// \brief Tree widget.
+  ///
+  ///     \image html tree-simple.png "fltk3::Tree example program"
+  ///     \image latex tree-simple.png "fltk3::Tree example program" width=4cm
+  ///
+  /// \code
+  ///     fltk3::Tree                                         // Top level widget
+  ///        |--- fltk3::TreeItem                            // Items in the tree
+  ///        |--- fltk3::TreePrefs                           // Preferences for the tree
+  ///                  |--- fltk3::TreeConnector (enum)      // Connection modes
+  ///                  |--- fltk3::TreeSelect (enum)         // Selection modes
+  ///                  |--- fltk3::TreeSort (enum)           // Sort behavior
+  /// \endcode
+  ///
+  ///     Similar to fltk3::Browser, fltk3::Tree is a browser of fltk3::TreeItem's, which is arranged
+  ///     in a parented hierarchy, or 'tree'. Subtrees can be expanded or closed. Items can be
+  ///     added, deleted, inserted, sorted and re-ordered.
+  ///
+  ///     The tree items may also contain other FLTK widgets, like buttons, input fields,
+  ///     or even "custom" widgets.
+  ///
+  ///     The callback() is invoked depending on the value of when():
+  ///
+  ///         - fltk3::WHEN_RELEASE -- callback invoked when left mouse button is released on an item
+  ///         - fltk3::WHEN_CHANGED -- callback invoked when left mouse changes selection state
+  ///
+  ///     The simple way to define a tree:
+  /// \code
+  ///    #include <fltk3/Tree.h>
+  ///    [..]
+  ///    fltk3::Tree tree(X,Y,W,H);
+  ///    tree.begin();
+  ///      tree.add("Flintstones/Fred");
+  ///      tree.add("Flintstones/Wilma");
+  ///      tree.add("Flintstones/Pebbles");
+  ///      tree.add("Simpsons/Homer");
+  ///      tree.add("Simpsons/Marge");
+  ///      tree.add("Simpsons/Bart");
+  ///      tree.add("Simpsons/Lisa");
+  ///    tree.end();
+  /// \endcode
+  ///     
+  ///     Items can be added with add(),
+  ///     removed with remove(),
+  ///     completely cleared with clear(),
+  ///     inserted with insert() and insert_above(),
+  ///     selected/deselected with select() and deselect(),
+  ///     open/closed with open() and closed().
+  ///     Children of an item can be swapped around with fltk3::TreeItem::swap_children(),
+  ///     sorting can be controlled when items are add()ed via sortorder().
+  ///     You can walk the entire tree with first() and next().
+  ///     You can walk selected items with first_selected_item() and
+  ///     next_selected_item().
+  ///     Items can be found by their pathname using find_item(const char*),
+  ///     and an item's pathname can be found with item_pathname().
+  ///     The selected items' colors are controlled by selection_color() (inherited from fltk3::Widget).
+  ///
+  ///     The tree can have different selection behaviors controlled by selectmode().
+  ///
+  ///     FLTK widgets (including custom widgets) can be assigned to tree items via
+  ///     fltk3::TreeItem::widget().
+  ///
+  ///     Icons for individual items can be changed with
+  ///     fltk3::TreeItem::openicon(), 
+  ///     fltk3::TreeItem::closeicon(),
+  ///     fltk3::TreeItem::usericon().
+  ///
+  ///     Various default preferences can be globally manipulated via fltk3::TreePrefs, 
+  ///     including colors, margins, icons, connection lines. 
+  ///
+  ///     The tree's callback() will be invoked when items change state or are open/closed.
+  ///     when() controls when mouse/keyboard events invoke the callback.
+  ///     callback_item() and callback_reason() can be used to determine the cause of the callback. eg:
+  ///
+  /// \code
+  /// void MyTreeCallback(fltk3::Widget *w, void *data) {
+  ///   fltk3::Tree      *tree = (fltk3::Tree*)w;
+  ///   fltk3::TreeItem *item = (fltk3::TreeItem*)tree->callback_item();	// get selected item
+  ///   switch ( tree->callback_reason() ) {
+  ///     case fltk3::TREE_REASON_SELECTED: [..]
+  ///     case fltk3::TREE_REASON_DESELECTED: [..]
+  ///     case fltk3::TREE_REASON_OPENED: [..]
+  ///     case fltk3::TREE_REASON_CLOSED: [..]
+  ///   }
+  /// \endcode
+  ///
+  ///     To get the item's full menu pathname, you can use fltk3::TreeItem::item_pathname(), eg:
+  ///
+  /// \code
+  ///   char pathname[256] = "???";
+  ///   tree->item_pathname(pathname, sizeof(pathname), item);		// eg. "Parent/Child/Item"
+  /// \endcode
+  ///
+  ///     To walk all the items of the tree from top to bottom:
+  /// \code
+  /// // Walk all the items in the tree, and print their labels
+  /// for ( fltk3::TreeItem *item = tree->first(); item; item = tree->next(item) ) {
+  ///     printf("Item: %s\n", item->label());
+  /// }
+  /// \endcode
+  ///
+  ///     To recursively walk all the children of a particular item, 
+  ///     define a function that uses recursion:
+  ///     \code
+  /// // Find all of the item's children and print an indented report of their labels
+  /// void my_print_all_children(fltk3::TreeItem *item, int indent=0) {
+  ///     for ( int t=0; t<item->children(); t++ ) {
+  ///         printf("%*s Item: %s\n", indent, "", item->child(t)->label());
+  ///         my_print_all_children(item->child(t), indent+4);   // recurse
+  ///     }
+  /// }
+  ///     \endcode
+  ///
+  ///     To change the default label font and color for creating new items:
+  /// \code
+  ///  tree = new fltk3::Tree(..);
+  ///  tree->item_labelfont(fltk3::COURIER);	// Use Courier font for all new items
+  ///  tree->item_labelfgcolor(fltk3::RED);	// Use red color for labels of all new items
+  ///  [..]
+  ///  // Now create the items in the tree using the above defaults.
+  ///  tree->add("Aaa");
+  ///  tree->add("Bbb");
+  ///  [..]
+  /// \endcode
+  ///
+  ///     To change the font and color of all items in the tree:
+  /// \code
+  /// // Change the font and color of all items currently in the tree
+  /// for ( fltk3::TreeItem *item = tree->first(); item; item = tree->next(item) ) {
+  ///     item->labelfont(fltk3::COURIER);
+  ///     item->labelcolor(fltk3::RED);
+  /// }
+  /// \endcode
+  ///
+  ///     The following image shows the tree's various visual elements
+  ///     and the methods that control them:
+  ///     
+  ///     \image html tree-elements.png
+  ///     \image latex tree-elements.png "fltk3::Tree dimensions" width=6cm
+  ///
+  
+  /// \enum fltk3::TreeReason
+  /// The reason the callback was invoked.
+  ///
+  enum TreeReason {
+    TREE_REASON_NONE=0,	///< unknown reason
+    TREE_REASON_SELECTED,	///< an item was selected
+    TREE_REASON_DESELECTED,	///< an item was de-selected
+    TREE_REASON_OPENED,	///< an item was opened
+    TREE_REASON_CLOSED		///< an item was closed
+  };
+  
+  
+  class FLTK3_EXPORT Tree : public fltk3::Group {
+
+    friend class ::Fl_Tree;
+
+    fltk3::TreeItem  *_root;				// can be null!
+    fltk3::TreeItem  *_item_focus;			// item that has focus box
+    fltk3::TreeItem  *_callback_item;		// item invoked during callback (can be NULL)
+    fltk3::TreeReason _callback_reason;		// reason for the callback
+    fltk3::TreePrefs  _prefs;			// all the tree's settings
+    int            _scrollbar_size;		// size of scrollbar trough
+    
+  protected:
+    /// Vertical scrollbar
+    fltk3::Scrollbar *_vscroll;
+    
+  protected:
+    void item_clicked(fltk3::TreeItem* val);
+    /// Do the callback for the item, setting the item and reason
+    void do_callback_for_item(fltk3::TreeItem* item, fltk3::TreeReason reason) {
+      callback_reason(reason);
+      callback_item(item);
+      do_callback((fltk3::Widget*)this, user_data());
+    }
+    fltk3::TreeItem *next_visible_item(fltk3::TreeItem *start, unsigned int dir);
+    
+  public:
+    Tree(int X, int Y, int W, int H, const char *L=0);
+    ~Tree();
+    int handle(int e);
+    void draw();
+    
+    ///////////////////////
+    // root methods
+    ///////////////////////
+    
+    /// Set the label for the root item. 
+    ///
+    /// Makes an internally managed copy of 'new_label'.
+    ///
+    void root_label(const char *new_label) {
+      if ( ! _root ) return;
+      _root->label(new_label);
+    }
+    /// Returns the root item.
+    fltk3::TreeItem* root() {
+      return(_root);
+    }
+    
+    ////////////////////////////////
+    // Item creation/removal methods
+    ////////////////////////////////
+    fltk3::TreeItem *add(const char *path);
+    fltk3::TreeItem* add(fltk3::TreeItem *item, const char *name);
+    fltk3::TreeItem *insert_above(fltk3::TreeItem *above, const char *name);
+    fltk3::TreeItem* insert(fltk3::TreeItem *item, const char *name, int pos);
+    
+    /// Remove the specified \p item from the tree.
+    /// \p item may not be NULL.
+    /// If it has children, all those are removed too.
+    /// \returns 0 if done, -1 if 'item' not found.
+    ///
+    int remove(fltk3::TreeItem *item) {
+      if ( item == _root ) {
+        clear();
+      } else {
+        fltk3::TreeItem *parent = item->parent();		// find item's parent
+        if ( ! parent ) return(-1);
+        parent->remove_child(item);			// remove child + children
+      }
+      return(0);
+    } 
+    /// Clear all children from the tree.
+    /// The tree will be left completely empty.
+    ///
+    void clear() {
+      if ( ! _root ) return;
+      _root->clear_children();
+      delete _root; _root = 0;
+    } 
+    /// Clear all the children of a particular node in the tree specified by \p item.
+    /// Item may not be NULL.
+    ///
+    void clear_children(fltk3::TreeItem *item) {
+      if ( item->has_children() ) {
+        item->clear_children();
+        redraw();				// redraw only if there were children to clear
+      }
+    } 
+    
+    ////////////////////////
+    // Item lookup methods
+    ////////////////////////
+    fltk3::TreeItem *find_item(const char *path);
+    const fltk3::TreeItem *find_item(const char *path) const;
+    int item_pathname(char *pathname, int pathnamelen, const fltk3::TreeItem *item) const;
+    
+    const fltk3::TreeItem *find_clicked() const;
+    
+    /// Return the item that was last clicked.
+    ///
+    /// Valid only from within the callback().
+    ///
+    /// Deprecated: use callback_item() instead.
+    ///
+    /// \returns the item clicked, or 0 if none.
+    ///          0 may also be used to indicate several items were clicked/changed.
+    ///
+    fltk3::TreeItem *item_clicked() {
+      return(_callback_item);
+    }
+    fltk3::TreeItem *first();
+    fltk3::TreeItem *next(fltk3::TreeItem *item=0);
+    fltk3::TreeItem *prev(fltk3::TreeItem *item=0);
+    fltk3::TreeItem *last();
+    fltk3::TreeItem *first_selected_item();
+    fltk3::TreeItem *next_selected_item(fltk3::TreeItem *item=0);
+    
+    //////////////////////////
+    // Item open/close methods
+    //////////////////////////
+    
+    /// Open the specified 'item'.
+    /// This causes the item's children (if any) to be shown.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] item -- the item to be opened. Must not be NULL.
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - callback() is not invoked
+    ///     -   1 - callback() is invoked if item changed,
+    ///             callback_reason() will be fltk3::TREE_REASON_OPENED
+    /// \returns
+    ///     -   1 -- item was opened
+    ///     -   0 -- item was already open, no change
+    ///
+    /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason()
+    ///
+    int open(fltk3::TreeItem *item, int docallback=1) {
+      if ( item->is_open() ) return(0);
+      item->open();
+      redraw();
+      if ( docallback ) {
+        do_callback_for_item(item, fltk3::TREE_REASON_OPENED);
+      }
+      return(1);
+    }
+    /// Opens the item specified by \p path (eg: "Parent/child/item").
+    /// This causes the item's children (if any) to be shown.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. open("Holidays/12\\/25\//2010").
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - callback() is not invoked
+    ///     -   1 - callback() is invoked if item changed,
+    ///             callback_reason() will be fltk3::TREE_REASON_OPENED
+    /// \returns
+    ///     -   1 -- OK: item opened
+    ///     -   0 -- OK: item was already open, no change
+    ///     -  -1 -- ERROR: item was not found
+    ///
+    /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason()
+    ///         
+    int open(const char *path, int docallback=1) {
+      fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(open(item, docallback));
+    }
+    /// Toggle the open state of \p item.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] item -- the item whose open state is to be toggled. Must not be NULL.
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - callback() is not invoked
+    ///     -   1 - callback() is invoked, callback_reason() will be either
+    ///             fltk3::TREE_REASON_OPENED or fltk3::TREE_REASON_CLOSED
+    ///
+    /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason()
+    ///
+    void open_toggle(fltk3::TreeItem *item, int docallback=1) {
+      if ( item->is_open() ) {
+        close(item, docallback);
+      } else {
+        open(item, docallback);
+      }
+    }
+    /// Closes the specified \p item.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] item -- the item to be closed. Must not be NULL.
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - callback() is not invoked
+    ///     -   1 - callback() is invoked if item changed,
+    ///             callback_reason() will be fltk3::TREE_REASON_CLOSED
+    /// \returns
+    ///     -   1 -- item was closed
+    ///     -   0 -- item was already closed, no change
+    ///
+    /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason()
+    ///
+    int close(fltk3::TreeItem *item, int docallback=1) {
+      if ( item->is_close() ) return(0);
+      item->close();
+      redraw();
+      if ( docallback ) {
+        do_callback_for_item(item, fltk3::TREE_REASON_CLOSED);
+      }
+      return(1);
+    }
+    /// Closes the item specified by \p path, eg: "Parent/child/item".
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. close("Holidays/12\\/25\//2010").
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - callback() is not invoked
+    ///     -   1 - callback() is invoked if item changed,
+    ///             callback_reason() will be fltk3::TREE_REASON_CLOSED
+    /// \returns
+    ///     -   1 -- OK: item closed
+    ///     -   0 -- OK: item was already closed, no change
+    ///     -  -1 -- ERROR: item was not found
+    ///
+    /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason()
+    ///         
+    int close(const char *path, int docallback=1) {
+      fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(close(item, docallback));
+    }
+    /// See if \p item is open.
+    ///
+    /// Items that are 'open' are themselves not necessarily visible;
+    /// one of the item's parents might be closed.
+    ///
+    /// \param[in] item -- the item to be tested. Must not be NULL.
+    /// \returns
+    ///     -  1 : item is open
+    ///     -  0 : item is closed
+    ///
+    int is_open(fltk3::TreeItem *item) const {
+      return(item->is_open()?1:0);
+    }
+    /// See if item specified by \p path (eg: "Parent/child/item") is open.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. is_open("Holidays/12\\/25\//2010").
+    ///
+    /// Items that are 'open' are themselves not necessarily visible;
+    /// one of the item's parents might be closed.
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \returns
+    ///     -    1 - OK: item is open
+    ///     -    0 - OK: item is closed
+    ///     -   -1 - ERROR: item was not found
+    ///
+    int is_open(const char *path) const {
+      const fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(item->is_open()?1:0);
+    }
+    /// See if the specified \p item is closed.
+    ///
+    /// \param[in] item -- the item to be tested. Must not be NULL.
+    /// \returns
+    ///     -   1 : item is open
+    ///     -   0 : item is closed
+    ///
+    int is_close(fltk3::TreeItem *item) const {
+      return(item->is_close());
+    }
+    /// See if item specified by \p path (eg: "Parent/child/item") is closed.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. is_close("Holidays/12\\/25\//2010").
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \returns
+    ///     -   1 - OK: item is closed
+    ///     -   0 - OK: item is open
+    ///     -  -1 - ERROR: item was not found
+    ///
+    int is_close(const char *path) const {
+      const fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(item->is_close()?1:0);
+    }
+    
+    /// Select the specified \p item. Use 'deselect()' to de-select it.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] item -- the item to be selected. Must not be NULL.
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - the callback() is not invoked
+    ///     -   1 - the callback() is invoked if item changed state,
+    ///             callback_reason() will be fltk3::TREE_REASON_SELECTED
+    /// \returns
+    ///     -   1 - item's state was changed
+    ///     -   0 - item was already selected, no change was made
+    ///
+    int select(fltk3::TreeItem *item, int docallback=1) {
+      if ( ! item->is_selected() ) {
+        item->select();
+        set_changed();
+        if ( docallback ) {
+          do_callback_for_item(item, fltk3::TREE_REASON_SELECTED);
+        }
+        redraw();
+        return(1);
+      }
+      return(0);
+    }
+    /// Select the item specified by \p path (eg: "Parent/child/item").
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. select("Holidays/12\\/25\//2010").
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - the callback() is not invoked
+    ///     -   1 - the callback() is invoked if item changed state,
+    ///             callback_reason() will be fltk3::TREE_REASON_SELECTED
+    /// \returns
+    ///     -   1 : OK: item's state was changed
+    ///     -   0 : OK: item was already selected, no change was made
+    ///     -  -1 : ERROR: item was not found
+    ///
+    int select(const char *path, int docallback=1) {
+      fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(select(item, docallback));
+    }
+    /// Toggle the select state of the specified \p item.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] item -- the item to be selected. Must not be NULL.
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - the callback() is not invoked
+    ///     -   1 - the callback() is invoked, callback_reason() will be
+    ///             either fltk3::TREE_REASON_SELECTED or fltk3::TREE_REASON_DESELECTED
+    ///
+    void select_toggle(fltk3::TreeItem *item, int docallback=1) {
+      item->select_toggle();
+      set_changed();
+      if ( docallback ) {
+        do_callback_for_item(item, item->is_selected() ? fltk3::TREE_REASON_SELECTED
+                             : fltk3::TREE_REASON_DESELECTED);
+      }
+      redraw();
+    }
+    /// De-select the specified \p item.
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] item -- the item to be selected. Must not be NULL.
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - the callback() is not invoked
+    ///     -   1 - the callback() is invoked if item changed state,
+    ///             callback_reason() will be fltk3::TREE_REASON_DESELECTED
+    /// \returns
+    ///     -   0 - item was already deselected, no change was made
+    ///     -   1 - item's state was changed
+    ///
+    int deselect(fltk3::TreeItem *item, int docallback=1) {
+      if ( item->is_selected() ) {
+        item->deselect();
+        set_changed();
+        if ( docallback ) {
+          do_callback_for_item(item, fltk3::TREE_REASON_DESELECTED);
+        }
+        redraw();
+        return(1);
+      }
+      return(0);
+    }
+    /// Deselect an item specified by \p path (eg: "Parent/child/item").
+    /// Handles redrawing if anything was actually changed.
+    /// Invokes the callback depending on the value of optional parameter \p docallback.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. deselect("Holidays/12\\/25\//2010").
+    ///
+    /// The callback can use callback_item() and callback_reason() respectively to determine 
+    /// the item changed and the reason the callback was called.
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \param[in] docallback -- A flag that determines if the callback() is invoked or not:
+    ///     -   0 - the callback() is not invoked
+    ///     -   1 - the callback() is invoked if item changed state,
+    ///             callback_reason() will be fltk3::TREE_REASON_DESELECTED
+    ///  \returns
+    ///     -   1 - OK: item's state was changed
+    ///     -   0 - OK: item was already deselected, no change was made
+    ///     -  -1 - ERROR: item was not found
+    ///
+    int deselect(const char *path, int docallback=1) {
+      fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(deselect(item, docallback));
+    }
+    
+    int deselect_all(fltk3::TreeItem *item=0, int docallback=1);
+    int select_only(fltk3::TreeItem *selitem, int docallback=1);
+    int select_all(fltk3::TreeItem *item=0, int docallback=1);
+    void set_item_focus(fltk3::TreeItem *o);
+    
+    /// See if the specified \p item is selected.
+    ///
+    /// \param[in] item -- the item to be tested. Must not be NULL.
+    ///
+    /// \return
+    ///     -   1 : item selected
+    ///     -   0 : item deselected
+    ///
+    int is_selected(fltk3::TreeItem *item) const {
+      return(item->is_selected()?1:0);
+    }
+    /// See if item specified by \p path (eg: "Parent/child/item") is selected.
+    ///
+    /// Items or submenus that themselves contain slashes ('/' or '\')
+    /// should be escaped, e.g. is_selected("Holidays/12\\/25\//2010").
+    ///
+    /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
+    /// \returns
+    ///     -   1 : item selected
+    ///     -   0 : item deselected
+    ///     -  -1 : item was not found
+    ///
+    int is_selected(const char *path) {
+      fltk3::TreeItem *item = find_item(path);
+      if ( ! item ) return(-1);
+      return(is_selected(item));
+    }
+    /// Print the tree as 'ascii art' to stdout.
+    /// Used mainly for debugging.
+    ///
+    void show_self() {
+      if ( ! _root ) return;
+      _root->show_self();
+    }
+    
+    /////////////////////////////////
+    // Item attribute related methods
+    /////////////////////////////////
+    
+    /// Get the default label fontsize used for creating new items.
+    fltk3::Fontsize item_labelsize() const {
+      return(_prefs.labelsize());
+    }
+    /// Set the default label font size used for creating new items.
+    /// To change the font size on a per-item basis, use fltk3::TreeItem::labelsize(fltk3::Fontsize)
+    ///
+    void item_labelsize(fltk3::Fontsize val) {
+      _prefs.labelsize(val);
+    }
+    /// Get the default font face used for creating new items.
+    fltk3::Font item_labelfont() const {
+      return(_prefs.labelfont());
+    }
+    /// Set the default font face used for creating new items.
+    /// To change the font face on a per-item basis, use fltk3::TreeItem::labelfont(fltk3::Font)
+    ///
+    void item_labelfont(fltk3::Font val) {
+      _prefs.labelfont(val);
+    }
+    /// Get the default label foreground color used for creating new items.
+    fltk3::Color item_labelfgcolor(void) const {
+      return(_prefs.labelfgcolor());
+    }
+    /// Set the default label foreground color used for creating new items.
+    /// To change the foreground color on a per-item basis, use fltk3::TreeItem::labelfgcolor(fltk3::Color)
+    ///
+    void item_labelfgcolor(fltk3::Color val) {
+      _prefs.labelfgcolor(val);
+    }
+    /// Get the default label background color used for creating new items.
+    fltk3::Color item_labelbgcolor(void) const {
+      return(_prefs.labelbgcolor());
+    }
+    /// Set the default label background color used for creating new items.
+    /// To change the background color on a per-item basis, use fltk3::TreeItem::labelbgcolor(fltk3::Color)
+    ///
+    void item_labelbgcolor(fltk3::Color val) {
+      _prefs.labelbgcolor(val);
+    }
+    /// Get the connector color used for tree connection lines.
+    fltk3::Color connectorcolor() const {
+      return(_prefs.connectorcolor());
+    }
+    /// Set the connector color used for tree connection lines.
+    void connectorcolor(fltk3::Color val) {
+      _prefs.connectorcolor(val);
+    }
+    /// Get the amount of white space (in pixels) that should appear
+    /// between the widget's left border and the tree's contents.
+    ///
+    int marginleft() const {
+      return(_prefs.marginleft());
+    }
+    /// Set the amount of white space (in pixels) that should appear
+    /// between the widget's left border and the left side of the tree's contents.
+    ///
+    void marginleft(int val) {
+      _prefs.marginleft(val);
+      redraw();
+    }
+    /// Get the amount of white space (in pixels) that should appear
+    /// between the widget's top border and the top of the tree's contents.
+    ///
+    int margintop() const {
+      return(_prefs.margintop());
+    }
+    /// Sets the amount of white space (in pixels) that should appear
+    /// between the widget's top border and the top of the tree's contents.
+    ///
+    void margintop(int val) {
+      _prefs.margintop(val);
+      redraw();
+    }
+    /// Get the amount of white space (in pixels) that should appear
+    /// below an open child tree's contents.
+    ///
+    int openchild_marginbottom() const {
+      return(_prefs.openchild_marginbottom());
+    }
+    /// Set the amount of white space (in pixels) that should appear
+    /// below an open child tree's contents.
+    ///
+    void openchild_marginbottom(int val) {
+      _prefs.openchild_marginbottom(val);
+      redraw();
+    }
+    /// Gets the width of the horizontal connection lines (in pixels) 
+    /// that appear to the left of each tree item's label.
+    ///
+    int connectorwidth() const {
+      return(_prefs.connectorwidth());
+    }
+    /// Sets the width of the horizontal connection lines (in pixels) 
+    /// that appear to the left of each tree item's label.
+    ///
+    void connectorwidth(int val) {
+      _prefs.connectorwidth(val);
+      redraw();
+    }
+    /// Returns the fltk3::Image being used as the default user icon for all
+    /// newly created items.
+    /// Returns zero if no icon has been set, which is the default.
+    ///
+    fltk3::Image *usericon() const {
+      return(_prefs.usericon());
+    }
+    /// Sets the fltk3::Image to be used as the default user icon for all
+    /// newly created items.
+    ///
+    /// If you want to specify user icons on a per-item basis,
+    /// use fltk3::TreeItem::usericon() instead.
+    ///
+    /// \param[in] val -- The new image to be used, or
+    ///                   zero to disable user icons.
+    ///
+    void usericon(fltk3::Image *val) {
+      _prefs.usericon(val);
+      redraw();
+    }
+    /// Returns the icon to be used as the 'open' icon.
+    /// If none was set, the internal default is returned,
+    /// a simple '[+]' icon.
+    ///
+    fltk3::Image *openicon() const {
+      return(_prefs.openicon());
+    }
+    /// Sets the icon to be used as the 'open' icon.
+    /// This overrides the built in default '[+]' icon.
+    ///
+    /// \param[in] val -- The new image, or zero to use the default [+] icon.
+    ///
+    void openicon(fltk3::Image *val) {
+      _prefs.openicon(val);
+      redraw();
+    }
+    /// Returns the icon to be used as the 'close' icon.
+    /// If none was set, the internal default is returned,
+    /// a simple '[-]' icon.
+    ///
+    fltk3::Image *closeicon() const {
+      return(_prefs.closeicon());
+    }
+    /// Sets the icon to be used as the 'close' icon.
+    /// This overrides the built in default '[-]' icon.
+    ///
+    /// \param[in] val -- The new image, or zero to use the default [-] icon.
+    ///
+    void closeicon(fltk3::Image *val) {
+      _prefs.closeicon(val);
+      redraw();
+    }
+    /// Returns 1 if the collapse icon is enabled, 0 if not.
+    int showcollapse() const {
+      return(_prefs.showcollapse());
+    }
+    /// Set if we should show the collapse icon or not.
+    /// If collapse icons are disabled, the user will not be able
+    /// to interactively collapse items in the tree, unless the application
+    /// provides some other means via open() and close().
+    ///
+    /// \param[in] val 1: shows collapse icons (default),\n
+    ///                0: hides collapse icons.
+    ///
+    void showcollapse(int val) {
+      _prefs.showcollapse(val);
+      redraw();
+    }
+    /// Returns 1 if the root item is to be shown, or 0 if not.
+    int showroot() const {
+      return(_prefs.showroot());
+    }
+    /// Set if the root item should be shown or not.
+    /// \param[in] val 1 -- show the root item (default)\n
+    ///                0 -- hide the root item.
+    ///
+    void showroot(int val) {
+      _prefs.showroot(val);
+      redraw();
+    }
+    /// Returns the line drawing style for inter-connecting items.
+    fltk3::TreeConnector connectorstyle() const {
+      return(_prefs.connectorstyle());
+    }
+    /// Sets the line drawing style for inter-connecting items.
+    void connectorstyle(fltk3::TreeConnector val) {
+      _prefs.connectorstyle(val);
+      redraw();
+    }
+    /// Set the default sort order used when items are added to the tree.
+    ///     See fltk3::TreeSort for possible values.
+    ///
+    fltk3::TreeSort sortorder() const {
+      return(_prefs.sortorder());
+    }
+    /// Gets the sort order used to add items to the tree.
+    void sortorder(fltk3::TreeSort val) {
+      _prefs.sortorder(val);
+      // no redraw().. only affects new add()itions
+    }
+    /// Sets the style of box used to draw selected items.
+    /// This is an fltk fltk3::Boxtype.
+    /// The default is influenced by FLTK's current fltk3::scheme()
+    ///
+    fltk3::Boxtype selectbox() const {
+      return(_prefs.selectbox());
+    }
+    /// Gets the style of box used to draw selected items.
+    /// This is an fltk fltk3::Boxtype.
+    /// The default is influenced by FLTK's current fltk3::scheme()
+    ///
+    void selectbox(fltk3::Boxtype val) {
+      _prefs.selectbox(val);
+      redraw();
+    }
+    /// Gets the tree's current selection mode.
+    fltk3::TreeSelect selectmode() const {
+      return(_prefs.selectmode());
+    }
+    /// Sets the tree's selection mode.
+    void selectmode(fltk3::TreeSelect val) {
+      _prefs.selectmode(val);
+    }
+    int displayed(fltk3::TreeItem *item);
+    void show_item(fltk3::TreeItem *item, int yoff);
+    void show_item(fltk3::TreeItem *item);
+    void show_item_bottom(fltk3::TreeItem *item);
+    void show_item_middle(fltk3::TreeItem *item);
+    void show_item_top(fltk3::TreeItem *item);
+    void display(fltk3::TreeItem *item);
+    int  vposition() const;
+    void vposition(int ypos);
+    
+    /// See if widget \p w is one of the fltk3::Tree widget's scrollbars.
+    /// Use this to skip over the scrollbars when walking the child() array. Example:
+    /// \code
+    /// for ( int i=0; i<tree->children(); i++ ) {    // walk children
+    ///     fltk3::Widget *w= tree->child(i);
+    ///     if ( brow->is_scrollbar(w) ) continue;    // skip scrollbars
+    ///     ..do work here..
+    /// }
+    /// \endcode
+    /// \param[in] w Widget to test
+    /// \returns 1 if \p w is a scrollbar, 0 if not.
+    ///
+    int is_scrollbar(fltk3::Widget *w) {
+      return( ( w == _vscroll ) ? 1 : 0 );
+    }
+    /// Gets the current size of the scrollbars' troughs, in pixels.
+    ///
+    /// If this value is zero (default), this widget will use the global
+    /// fltk3::scrollbar_size() value as the scrollbar's width.
+    /// 
+    /// \returns Scrollbar size in pixels, or 0 if the global fltk3::scrollsize() is being used.
+    /// \see fltk3::scrollbar_size(int)
+    ///
+    int scrollbar_size() const {
+      return(_scrollbar_size);
+    }
+    /// Sets the pixel size of the scrollbars' troughs to the \p size, in pixels.
+    ///
+    /// Normally you should not need this method, and should use the global
+    /// fltk3::scrollbar_size(int) instead to manage the size of ALL 
+    /// your widgets' scrollbars. This ensures your application 
+    /// has a consistent UI, is the default behavior, and is normally
+    /// what you want.
+    ///
+    /// Only use THIS method if you really need to override the global
+    /// scrollbar size. The need for this should be rare.
+    ///   
+    /// Setting \p size to the special value of 0 causes the widget to
+    /// track the global fltk3::scrollbar_size(), which is the default.
+    ///   
+    /// \param[in] size Sets the scrollbar size in pixels.\n
+    ///                 If 0 (default), scrollbar size tracks the global fltk3::scrollbar_size()
+    /// \see fltk3::scrollbar_size()
+    ///
+    void scrollbar_size(int size) {
+      _scrollbar_size = size;
+      int scrollsize = _scrollbar_size ? _scrollbar_size : fltk3::scrollbar_size();
+      if ( _vscroll->w() != scrollsize ) {
+        _vscroll->resize(x()+w()-scrollsize, h(), scrollsize, _vscroll->h());
+      }
+    }   
+    
+    ///////////////////////
+    // callback related
+    ///////////////////////
+    
+    /// Sets the item that was changed for this callback.
+    ///    Used internally to pass the item that invoked the callback.
+    ///
+    void callback_item(fltk3::TreeItem* item) {
+      _callback_item = item;
+    }
+    /// Gets the item that caused the callback.
+    /// The callback() can use this value to see which item changed.
+    ///
+    fltk3::TreeItem* callback_item() {
+      return(_callback_item);
+    }
+    /// Sets the reason for this callback.
+    ///    Used internally to pass the reason the callback was invoked.
+    ///
+    void callback_reason(fltk3::TreeReason reason) {
+      _callback_reason = reason;
+    }
+    /// Gets the reason for this callback.
+    ///
+    /// The callback() can use this value to see why it was called. Example:
+    /// \code
+    ///     void MyTreeCallback(fltk3::Widget *w, void *userdata) {
+    ///         fltk3::Tree *tree = (fltk3::Tree*)w;
+    ///         fltk3::TreeItem *item = tree->callback_item();    // the item changed (can be NULL if more than one item was changed!)
+    ///         switch ( tree->callback_reason() ) {           // reason callback was invoked
+    ///             case     fltk3::TREE_REASON_OPENED: ..item was opened..
+    ///             case     fltk3::TREE_REASON_CLOSED: ..item was closed..
+    ///             case   fltk3::TREE_REASON_SELECTED: ..item was selected..
+    ///             case fltk3::TREE_REASON_DESELECTED: ..item was deselected..
+    ///         }
+    ///     }
+    /// \endcode
+    ///
+    fltk3::TreeReason callback_reason() const {
+      return(_callback_reason);
+    }
+    
+    /// Load FLTK preferences
+    void load(class fltk3::Preferences&);
+  };
+  
+}
+
+#endif /*fltk3::TREE_H*/
+
+//
+// End of "$Id: Tree.h 8632 2011-05-04 02:59:50Z greg.ercolano $".
+//

Deleted: branches/branch-3.0/include/fltk3/ValueInput.h

Copied: branches/branch-3.0/include/fltk3/ValueInput.h (from rev 8988, branches/branch-3.0/fltk3/ValueInput.h)
===================================================================
--- branches/branch-3.0/include/fltk3/ValueInput.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/ValueInput.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,148 @@
+//
+// "$Id: ValueInput.h 8337 2011-01-30 09:04:59Z manolo $"
+//
+// Value input header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::ValueInput widget . */
+
+#ifndef Fltk3_Value_Input_H
+#define Fltk3_Value_Input_H
+
+#include "Valuator.h"
+#include "Input.h"
+
+class Fl_Value_Input;
+
+namespace fltk3 {
+  
+  /**
+   The fltk3::ValueInput widget displays a numeric value.
+   The user can click in the text field and edit it - there is in
+   fact a hidden fltk3::Input widget with
+   type(fltk3::FLOAT_INPUT) or type(fltk3::INT_INPUT) in
+   there - and when they hit return or tab the value updates to
+   what they typed and the callback is done.
+   
+   <P>If step() is non-zero and integral, then the range of numbers
+   is limited to integers instead of floating point numbers. As
+   well as displaying the value as an integer, typed input is also
+   limited to integer values, even if the hidden fltk3::Input widget
+   is of type(fltk3::FLOAT_INPUT).</P>
+   
+   <P>If step() is non-zero, the user can also drag the
+   mouse across the object and thus slide the value. The left
+   button moves one step() per pixel, the middle by 10
+   * step(), and the right button by 100 * step(). It
+   is therefore impossible to select text by dragging across it,
+   although clicking can still move the insertion cursor.</P>
+   
+   <P>If step() is non-zero and integral, then the range
+   of numbers are limited to integers instead of floating point
+   values.
+   
+   <P ALIGN="CENTER">\image html fltk3::ValueInput.png 
+   \image latex  fltk3::ValueInput.png "fltk3::ValueInput" width=4cm
+   */
+  class FLTK3_EXPORT ValueInput : public fltk3::Valuator {
+
+   friend class ::Fl_Value_Input;
+
+  public:
+    /* This is the encapsulated fltk3::Input attribute to which 
+     this class delegates the value font, color and shortcut */
+    fltk3::Input input;
+  private:
+    char soft_;
+    static void input_cb(fltk3::Widget*,void*);
+    virtual void value_damage(); // cause damage() due to value() changing
+  public:
+    int handle(int);
+  protected:
+    void draw();
+  public:
+    void resize(int,int,int,int);
+    ValueInput(int x,int y,int w,int h,const char *l=0);
+    ~ValueInput();
+    
+    /** See void fltk3::ValueInput::soft(char s) */
+    void soft(char s) {soft_ = s;}
+    /**
+     If "soft" is turned on, the user is allowed to drag
+     the value outside the range. If they drag the value to one of
+     the ends, let go, then grab again and continue to drag, they can
+     get to any value. The default is true.
+     */
+    char soft() const {return soft_;}
+    /**
+     Returns the current shortcut key for the Input.
+     \see fltk3::ValueInput::shortcut(int) 
+     */
+    unsigned int shortcut() const {return input.shortcut();}
+    /** 
+     Sets the shortcut key to \p s. Setting this
+     overrides the use of '&' in the label().  The value is a bitwise
+     OR of a key and a set of shift flags, for example fltk3::ALT | 'a'
+     , fltk3::ALT | (fltk3::FKey + 10), or just 'a'.  A value
+     of 0 disables the shortcut.
+     
+     The key can be any value returned by 
+     fltk3::event_key(), but will usually be an ASCII letter.  Use
+     a lower-case letter unless you require the shift key to be held down.
+     
+     The shift flags can be any set of values accepted by 
+     fltk3::event_state().  If the bit is on that shift key must
+     be pushed.  Meta, Alt, Ctrl, and Shift must be off if they are not in
+     the shift flags (zero for the other bits indicates a "don't care"
+     setting).
+     */
+    void shortcut(unsigned int s) {input.shortcut(s);}
+    
+    /** Gets the typeface of the text in the value box.  */
+    fltk3::Font textfont() const {return input.textfont();}
+    /** Sets the typeface of the text in the value box.  */
+    void textfont(fltk3::Font s) {input.textfont(s);}
+    /** Gets the size of the text in the value box.  */
+    fltk3::Fontsize textsize() const {return input.textsize();}
+    /** Sets the size of the text in the value box.  */
+    void textsize(fltk3::Fontsize s) {input.textsize(s);}
+    /** Gets the color of the text in the value box.  */
+    fltk3::Color textcolor() const {return input.textcolor();}
+    /** Sets the color of the text in the value box.*/
+    void textcolor(fltk3::Color n) {input.textcolor(n);}
+    /** Gets the color of the text cursor. The text cursor is black by default. */
+    fltk3::Color cursor_color() const {return input.cursor_color();}
+    /** Sets the color of the text cursor. The text cursor is black by default. */
+    void cursor_color(fltk3::Color n) {input.cursor_color(n);}
+    
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: ValueInput.h 8337 2011-01-30 09:04:59Z manolo $".
+//

Deleted: branches/branch-3.0/include/fltk3/ValueOutput.h

Copied: branches/branch-3.0/include/fltk3/ValueOutput.h (from rev 8988, branches/branch-3.0/fltk3/ValueOutput.h)
===================================================================
--- branches/branch-3.0/include/fltk3/ValueOutput.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/ValueOutput.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,90 @@
+//
+// "$Id: ValueOutput.h 7989 2010-12-09 12:19:03Z greg.ercolano $"
+//
+// Value output header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::ValueOutput widget . */
+
+#ifndef Fltk3_Value_Output_H
+#define Fltk3_Value_Output_H
+
+#include "Valuator.h"
+
+
+class Fl_Value_Output;
+
+
+namespace fltk3 {
+  
+  /**
+   The fltk3::ValueOutput widget displays a floating point value.
+   If step() is not zero, the user can adjust the value by
+   dragging the mouse left and right.  The left button moves one step()
+   per pixel, the middle by 10 * step(), and the right button by 
+   100 * step().
+   <P>This is much lighter-weight than 
+   fltk3::ValueInput because it contains no text editing code or
+   character buffer. </P>
+   <P ALIGN=CENTER>\image html fltk3::ValueOutput.png 
+   \image latex  fltk3::ValueOutput.png "fltk3::ValueOutput" width=4cm
+   */
+  class FLTK3_EXPORT ValueOutput : public fltk3::Valuator {
+
+    friend class ::Fl_Value_Output;
+
+    uchar soft_;
+    
+  protected:
+    void draw();
+    
+  public:
+    int handle(int);
+    ValueOutput(int x,int y,int w,int h,const char *l=0);
+    
+    /**
+     If "soft" is turned on, the user is allowed to drag the value outside
+     the range.  If they drag the value to one of the ends, let go, then
+     grab again and continue to drag, they can get to any value.  Default is
+     one.
+     */
+    void soft(uchar s) {soft_ = s;}
+    /**
+     If "soft" is turned on, the user is allowed to drag the value outside
+     the range.  If they drag the value to one of the ends, let go, then
+     grab again and continue to drag, they can get to any value.  Default is
+     one.
+     */
+    uchar soft() const {return soft_;}
+    
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: ValueOutput.h 7989 2010-12-09 12:19:03Z greg.ercolano $".
+//

Deleted: branches/branch-3.0/include/fltk3/ValueSlider.h

Copied: branches/branch-3.0/include/fltk3/ValueSlider.h (from rev 8988, branches/branch-3.0/fltk3/ValueSlider.h)
===================================================================
--- branches/branch-3.0/include/fltk3/ValueSlider.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/ValueSlider.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,65 @@
+//
+// "$Id: ValueSlider.h 7981 2010-12-08 23:53:04Z greg.ercolano $"
+//
+// Value slider header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::ValueSlider widget . */
+
+#ifndef Fltk3_Value_Slider_H
+#define Fltk3_Value_Slider_H
+
+#include "Slider.h"
+
+
+class Fl_Value_Slider;
+
+
+namespace fltk3 {
+  
+  /**
+   The fltk3::ValueSlider widget is a fltk3::Slider widget
+   with a box displaying the current value.
+   <P ALIGN=CENTER>\image html value_slider.png 
+   \image latex  value_slider.png "fltk3::ValueSlider" width=4cm
+   */
+  class FLTK3_EXPORT ValueSlider : public fltk3::Slider {
+
+    friend class ::Fl_Value_Slider;
+
+  protected:
+    void draw();
+  public:
+    int handle(int);
+    ValueSlider(int x,int y,int w,int h, const char *l = 0);
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: ValueSlider.h 7981 2010-12-08 23:53:04Z greg.ercolano $".
+//

Deleted: branches/branch-3.0/include/fltk3/Widget.h

Copied: branches/branch-3.0/include/fltk3/Widget.h (from rev 8988, branches/branch-3.0/fltk3/Widget.h)
===================================================================
--- branches/branch-3.0/include/fltk3/Widget.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/Widget.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,1018 @@
+//
+// "$Id: Widget.h 8623 2011-04-24 17:09:41Z AlbrechtS $"
+//
+// Widget header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/** \file
+ fltk3::Widget, fltk3::Label classes . */
+
+#ifndef Fltk3_Widget_H
+#define Fltk3_Widget_H
+
+#include "enumerations.h"
+#include "Rectangle.h"
+
+/**
+ \todo	typedef's fl_intptr_t and fl_uintptr_t should be documented.
+ */
+#ifdef _WIN64
+#ifdef __GNUC__
+#include <stdint.h>
+#else
+#include <stddef.h>  // M$VC
+#endif
+typedef intptr_t fl_intptr_t;
+typedef uintptr_t fl_uintptr_t;
+#else
+typedef long fl_intptr_t;
+typedef unsigned long fl_uintptr_t;
+#endif
+
+namespace fltk3 { 
+  class Widget; 
+  class Group;
+  class Window;
+  class Image;
+  class GlWindow;
+
+  /** Default callback type definition for all fltk widgets (by far the most used) */
+  typedef void (Callback)(Widget*, void*);
+  /** Default callback type pointer definition for all fltk widgets */
+  typedef Callback* CallbackPtr; // needed for BORLAND
+  /** One parameter callback type definition passing only the widget */
+  typedef void (Callback0)(Widget*);
+  /** Callback type definition passing the widget and a long data value */
+  typedef void (Callback1)(Widget*, long);
+  
+  /** This struct stores all information for a text or mixed graphics label.
+   
+   \todo For FLTK 1.3, the fltk3::Label type will become a widget by itself. That way
+   we will be avoiding a lot of code duplication by handling labels in 
+   a similar fashion to widgets containing text. We also provide an easy
+   interface for very complex labels, containing html or vector graphics.
+   */
+  struct FLTK3_EXPORT Label {
+    /** label text */
+    const char* value;
+    /** optional image for an active label */
+    fltk3::Image* image;
+    /** optional image for a deactivated label */
+    fltk3::Image* deimage;
+    /** label font used in text */
+    fltk3::Font font;
+    /** size of label font */
+    fltk3::Fontsize size;
+    /** text color */
+    fltk3::Color color;
+    /** \internal The font used for the entire text. */
+    fltk3::Font textfont_;
+    /** \internal Height of the font used for the entire text. */
+    fltk3::Fontsize textsize_;
+    /** \internal color of the entire text */
+    fltk3::Color textcolor_;
+    /** alignment of label */
+    fltk3::Align align_;
+    /** type of label. \see fltk3::Labeltype */
+    uchar type;
+    
+    /** Draws the label aligned to the given box */
+    void draw(int,int,int,int, fltk3::Align) const ;
+    void measure(int &w, int &h) const ;
+  };
+  
+  
+  /** fltk3::Widget is the base class for all widgets in FLTK.  
+   
+   You can't create one of these because the constructor is not public.
+   However you can subclass it.  
+   
+   All "property" accessing methods, such as color(), parent(), or argument() 
+   are implemented as trivial inline functions and thus are as fast and small 
+   as accessing fields in a structure. Unless otherwise noted, the property 
+   setting methods such as color(n) or label(s) are also trivial inline 
+   functions, even if they change the widget's appearance. It is up to the 
+   user code to call redraw() after these.
+   */
+  class FLTK3_EXPORT Widget : public Rectangle {
+    friend class Group;
+    
+    fltk3::Group* parent_;
+    fltk3::Callback* callback_;
+    void* user_data_;
+    Label label_;
+    unsigned int flags_;
+    Color color_;
+    Color color2_;
+    uchar type_;
+    uchar damage_;
+    uchar box_;
+    uchar when_;
+    
+    const char *tooltip_;
+    
+    /** unimplemented copy ctor */
+    Widget(const Widget &);
+    /** unimplemented assignment operator */
+    Widget& operator=(const Widget &);
+    
+  protected:
+    
+    /** Gets the widget flags mask */
+    unsigned int flags() const {return flags_;}
+    /** Sets a flag in the flags mask */
+    void set_flag(unsigned int c) {flags_ |= c;}
+    /** Clears a flag in the flags mask */
+    void clear_flag(unsigned int c) {flags_ &= ~c;}
+    /** flags possible values enumeration.
+     See activate(), output(), visible(), changed(), set_visible_focus()
+     */
+    enum {
+      INACTIVE        = 1<<0,   ///< the widget can't receive focus, and is disabled but potentially visible
+      INVISIBLE       = 1<<1,   ///< the widget is not drawn, but can receive a few special events
+      OUTPUT          = 1<<2,   ///< for output only
+      NOBORDER        = 1<<3,   ///< don't draw a decoration (fltk3::Window)
+      FORCE_POSITION  = 1<<4,   ///< don't let the window manager position the window (fltk3::Window)
+      NON_MODAL       = 1<<5,   ///< this is a hovering toolbar window (fltk3::Window)
+      SHORTCUT_LABEL  = 1<<6,   ///< the label contains a shortcut we need to draw
+      CHANGED         = 1<<7,   ///< the widget value changed
+      OVERRIDE        = 1<<8,   ///< position window on top (fltk3::Window)
+      VISIBLE_FOCUS   = 1<<9,   ///< accepts keyboard focus navigation if the widget can have the focus
+      COPIED_LABEL    = 1<<10,  ///< the widget label is internally copied, its destruction is handled by the widget
+      CLIP_CHILDREN   = 1<<11,  ///< all drawing within this widget will be clipped (fltk3::Group)
+      MENU_WINDOW     = 1<<12,  ///< a temporary popup window, dismissed by clicking outside (fltk3::Window)
+      TOOLTIP_WINDOW  = 1<<13,  ///< a temporary popup, transparent to events, and dismissed easily (fltk3::Window)
+      MODAL           = 1<<14,  ///< a window blocking input to all other winows (fltk3::Window)
+      NO_OVERLAY      = 1<<15,  ///< window not using a hardware overlay plane (fltk3::MenuWindow)
+      GROUP_RELATIVE  = 1<<16,  ///< position this widget relative to the parent group, not to the window
+      COPIED_TOOLTIP  = 1<<17,  ///< the widget tooltip is internally copied, its destruction is handled by the widget
+                                // (space for more flags)
+      USERFLAG3       = 1<<29,  ///< reserved for 3rd party extensions
+      USERFLAG2       = 1<<30,  ///< reserved for 3rd party extensions
+      USERFLAG1       = 1<<31   ///< reserved for 3rd party extensions
+    };
+    void draw_box() const;
+    void draw_box(Boxtype t, Color c) const;
+    void draw_box(Boxtype t, int x,int y,int w,int h, Color c) const;
+    void draw_backdrop() const;
+    /** draws a focus rectangle around the widget */
+    void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
+    void draw_focus(Boxtype t, int x,int y,int w,int h) const;
+    void draw_label() const;
+    void draw_label(int, int, int, int) const;
+    
+  public:
+    
+    /** Creates a widget at the given position and size.
+     
+     The fltk3::Widget is a protected constructor, but all derived widgets have a 
+     matching public constructor. It takes a value for x(), y(), w(), h(), and 
+     an optional value for label().
+     
+     \param[in] x, y the position of the widget relative to the enclosing window
+     \param[in] w, h size of the widget in pixels
+     \param[in] label optional text for the widget label
+     */
+    Widget(int x, int y, int w, int h, const char *label=0L);
+    
+    /** Destroys the widget.
+     Destroying single widgets is not very common. You almost always want to 
+     destroy the parent group instead, which will destroy all of the child widgets 
+     and groups in that group.
+     
+     \since FLTK 1.3, the widget's destructor removes the widget from its parent
+     group, if it is member of a group.
+     */
+    virtual ~Widget();
+    
+    /** Draws the widget.
+     Never call this function directly. FLTK will schedule redrawing whenever
+     needed. If your widget must be redrawn as soon as possible, call redraw()
+     instead.
+     
+     Override this function to draw your own widgets.
+     
+     If you ever need to call another widget's draw method <I>from within your
+     own draw() method</I>, e.g. for an embedded scrollbar, you can do it
+     (because draw() is virtual) like this:
+     
+     \code
+     fltk3::Widget *s = &scroll;		// scroll is an embedded fltk3::Scrollbar
+     s->draw();			// calls fltk3::Scrollbar::draw()
+     \endcode
+     */
+    virtual void draw();
+    
+    /** Handles the specified event. 
+     You normally don't call this method directly, but instead let FLTK do 
+     it when the user interacts with the widget.
+     
+     When implemented in a widget, this function must return 0 if the 
+     widget does not use the event or 1 otherwise.
+     
+     Most of the time, you want to call the inherited handle() method in 
+     your overridden method so that you don't short-circuit events that you 
+     don't handle. In this last case you should return the callee retval.
+     
+     \param[in] event the kind of event received
+     \retval 0 if the event was not used or understood
+     \retval 1 if the event was used and can be deleted
+     \see fltk3::Event
+     */
+    virtual int handle(int event);
+    
+    /** Returns a pointer to the parent widget.  
+     Usually this is a fltk3::Group or fltk3::Window. 
+     \retval NULL if the widget has no parent
+     \see fltk3::Group::add(fltk3::Widget*)
+     */
+    fltk3::Group* parent() const {return parent_;}
+    
+    /** Internal use only - "for hacks only".
+     
+     It is \em \b STRONGLY recommended not to use this method, because it
+     short-circuits fltk3::Group's normal widget adding and removing methods,
+     if the widget is already a child widget of another fltk3::Group.
+     
+     Use fltk3::Group::add(fltk3::Widget*) and/or fltk3::Group::remove(fltk3::Widget*) instead.
+     */
+    void parent(fltk3::Group* p) {parent_ = p;} // for hacks only, use fltk3::Group::add()
+    
+    /** Gets the widget type.
+     Returns the widget type value, which is used for Forms compatibility
+     and to simulate RTTI.
+     
+     \todo Explain "simulate RTTI" (currently only used to decide if a widget
+     is a window, i.e. type()>=fltk3::WINDOW ?). Is type() really used in a way
+     that ensures "Forms compatibility" ?
+     */
+    uchar type() const {return type_;}
+    
+    /** Sets the widget type.
+     This is used for Forms compatibility.
+     */
+    void type(uchar t) {type_ = t;}
+    
+    /** Changes the size or position of the widget.
+     
+     This is a virtual function so that the widget may implement its 
+     own handling of resizing. The default version does \e not
+     call the redraw() method, but instead relies on the parent widget 
+     to do so because the parent may know a faster way to update the 
+     display, such as scrolling from the old position.  
+     
+     Some window managers under X11 call resize() a lot more often 
+     than needed. Please verify that the position or size of a widget 
+     did actually change before doing any extensive calculations.
+     
+     position(X, Y) is a shortcut for resize(X, Y, w(), h()), 
+     and size(W, H) is a shortcut for resize(x(), y(), W, H).
+     
+     \param[in] x, y new position relative to the parent window 
+     \param[in] w, h new size
+     \see position(int,int), size(int,int)
+     */
+    virtual void resize(int x, int y, int w, int h);
+    
+    /** Internal use only. */
+    int damage_resize(int,int,int,int);
+    
+    /** Repositions the window or widget.
+     
+     position(X, Y) is a shortcut for resize(X, Y, w(), h()).
+     
+     \param[in] X, Y new position relative to the parent window 
+     \see resize(int,int,int,int), size(int,int)
+     */
+    void position(int X,int Y) {resize(X,Y,w_,h_);}
+    
+    /** Changes the size of the widget.
+     
+     size(W, H) is a shortcut for resize(x(), y(), W, H).
+     
+     \param[in] W, H new size
+     \see position(int,int), resize(int,int,int,int)
+     */
+    void size(int W,int H) {resize(x_,y_,W,H);}
+    
+    /** Gets the label alignment.
+     
+     \return label alignment
+     \see label(), align(fltk3::Align), fltk3::Align
+     */
+    Align align() const {return label_.align_;}
+    
+    /** Sets the label alignment.
+     This controls how the label is displayed next to or inside the widget. 
+     The default value is fltk3::ALIGN_CENTER, which centers the label inside 
+     the widget.
+     \param[in] alignment new label alignment
+     \see align(), fltk3::Align
+     */
+    void align(Align alignment) {label_.align_ = alignment;}
+    
+    /** Gets the box type of the widget.
+     \return the current box type
+     \see box(fltk3::Boxtype), fltk3::Boxtype
+     */
+    Boxtype box() const {return (Boxtype)box_;}
+    
+    /** Sets the box type for the widget. 
+     This identifies a routine that draws the background of the widget.
+     See fltk3::Boxtype for the available types. The default depends on the 
+     widget, but is usually fltk3::NO_BOX or fltk3::UP_BOX.
+     \param[in] new_box the new box type
+     \see box(), fltk3::Boxtype
+     */
+    void box(Boxtype new_box) {box_ = new_box;}
+    
+    /** Gets the background color of the widget.
+     \return current background color
+     \see color(fltk3::Color), color(fltk3::Color, fltk3::Color)
+     */
+    Color color() const {return color_;}
+    
+    /** Sets the background color of the widget. 
+     The color is passed to the box routine. The color is either an index into 
+     an internal table of RGB colors or an RGB color value generated using 
+     fltk3::rgb_color().
+     
+     The default for most widgets is fltk3::BACKGROUND_COLOR. Use fltk3::set_color()
+     to redefine colors in the color map.
+     \param[in] bg background color
+     \see color(), color(fltk3::Color, fltk3::Color), selection_color(fltk3::Color)
+     */
+    void color(Color bg) {color_ = bg;}
+    
+    /** Gets the selection color.
+     \return the current selection color
+     \see selection_color(fltk3::Color), color(fltk3::Color, fltk3::Color)
+     */
+    fltk3::Color selection_color() const {return color2_;}
+    
+    /** Sets the selection color.
+     The selection color is defined for Forms compatibility and is usually 
+     used to color the widget when it is selected, although some widgets 
+     use this color for other purposes. You can set both colors at once 
+     with color(fltk3::Color bg, fltk3::Color sel).
+     \param[in] a the new selection color
+     \see selection_color(), color(fltk3::Color, fltk3::Color)
+     */
+    void selection_color(fltk3::Color a) {color2_ = a;}
+    
+    /** Sets the background and selection color of the widget. 
+     
+     The two color form sets both the background and selection colors. 
+     \param[in] bg background color
+     \param[in] sel selection color
+     \see color(unsigned), selection_color(unsigned)
+     */
+    void color(fltk3::Color bg, fltk3::Color sel) {color_=bg; color2_=sel;}
+    
+    /** Gets the current label text.
+     \return a pointer to the current label text
+     \see label(const char *), copy_label(const char *)
+     */
+    const char* label() const {return label_.value;}
+    
+    /** Sets the current label pointer.
+     
+     The label is shown somewhere on or next to the widget. The passed pointer 
+     is stored unchanged in the widget (the string is \em not copied), so if 
+     you need to set the label to a formatted value, make sure the buffer is 
+     static, global, or allocated. The copy_label() method can be used 
+     to make a copy of the label string automatically.
+     \param[in] text pointer to new label text
+     \see copy_label()
+     */
+    void label(const char* text);
+    
+    /** Sets the current label. 
+     Unlike label(), this method allocates a copy of the label 
+     string instead of using the original string pointer.
+     
+     The internal copy will automatically be freed whenever you assign
+     a new label or when the widget is destroyed.
+     
+     \param[in] new_label the new label text
+     \see label()
+     */
+    void copy_label(const char *new_label);
+    
+    /** Shortcut to set the label text and type in one call.
+     \see label(const char *), labeltype(fltk3::Labeltype)
+     */
+    void label(fltk3::Labeltype a, const char* b) {label_.type = a; label_.value = b;}
+    
+    /** Gets the label type.
+     \return the current label type.
+     \see fltk3::Labeltype
+     */
+    fltk3::Labeltype labeltype() const {return (fltk3::Labeltype)label_.type;}
+    
+    /** Sets the label type. 
+     The label type identifies the function that draws the label of the widget. 
+     This is generally used for special effects such as embossing or for using 
+     the label() pointer as another form of data such as an icon. The value 
+     fltk3::NORMAL_LABEL prints the label as plain text.
+     \param[in] a new label type
+     \see fltk3::Labeltype
+     */
+    void labeltype(fltk3::Labeltype a) {label_.type = a;}
+    
+    /** Gets the label color. 
+     The default color is fltk3::FOREGROUND_COLOR. 
+     \return the current label color
+     */
+    fltk3::Color labelcolor() const {return label_.color;}
+    
+    /** Sets the label color. 
+     The default color is fltk3::FOREGROUND_COLOR. 
+     \param[in] c the new label color
+     */
+    void labelcolor(fltk3::Color c) {label_.color=c;}
+    
+    /** Gets the font to use. 
+     Fonts are identified by indexes into a table. The default value
+     uses a Helvetica typeface (Arial for Microsoft&reg; Windows&reg;).
+     The function fltk3::set_font() can define new typefaces.
+     \return current font used by the label
+     \see fltk3::Font
+     */
+    fltk3::Font labelfont() const {return label_.font;}
+    
+    /** Sets the font to use. 
+     Fonts are identified by indexes into a table. The default value
+     uses a Helvetica typeface (Arial for Microsoft&reg; Windows&reg;).
+     The function fltk3::set_font() can define new typefaces.
+     \param[in] f the new font for the label
+     \see fltk3::Font
+     */
+    void labelfont(fltk3::Font f) {label_.font=f;}
+    
+    /** Gets the font size in pixels. 
+     The default size is 14 pixels.
+     \return the current font size
+     */
+    fltk3::Fontsize labelsize() const {return label_.size;}
+    
+    /** Sets the font size in pixels.
+     \param[in] pix the new font size
+     \see fltk3::Fontsize labelsize()
+     */
+    void labelsize(fltk3::Fontsize pix) {label_.size=pix;}
+    
+    /** Gets the image that is used as part of the widget label.
+     This image is used when drawing the widget in the active state.
+     \return the current image
+     */
+    fltk3::Image* image() {return label_.image;}
+    const fltk3::Image* image() const {return label_.image;}
+    
+    /** Sets the image to use as part of the widget label.
+     This image is used when drawing the widget in the active state.
+     \param[in] img the new image for the label 
+     */
+    void image(fltk3::Image* img) {label_.image=img;}
+    
+    /** Sets the image to use as part of the widget label.
+     This image is used when drawing the widget in the active state.
+     \param[in] img the new image for the label 
+     */
+    void image(fltk3::Image& img) {label_.image=&img;}
+    
+    /** Gets the image that is used as part of the widget label.  
+     This image is used when drawing the widget in the inactive state.
+     \return the current image for the deactivated widget
+     */
+    fltk3::Image* deimage() {return label_.deimage;}
+    const fltk3::Image* deimage() const {return label_.deimage;}
+    
+    /** Sets the image to use as part of the widget label.  
+     This image is used when drawing the widget in the inactive state.
+     \param[in] img the new image for the deactivated widget
+     */
+    void deimage(fltk3::Image* img) {label_.deimage=img;}
+    
+    /** Sets the image to use as part of the widget label.  
+     This image is used when drawing the widget in the inactive state.
+     \param[in] img the new image for the deactivated widget
+     */
+    void deimage(fltk3::Image& img) {label_.deimage=&img;}
+    
+    /** Gets the current tooltip text.
+     \return a pointer to the tooltip text or NULL
+     \see tooltip(const char*), copy_tooltip(const char*)
+     */
+    const char *tooltip() const {return tooltip_;}
+    
+    void tooltip(const char *text);		// see fltk3::Tooltip
+    void copy_tooltip(const char *text);		// see fltk3::Tooltip
+    
+    /** Gets the current callback function for the widget.
+     Each widget has a single callback.
+     \return current callback
+     */
+    CallbackPtr callback() const {return callback_;}
+    
+    /** Sets the current callback function for the widget.
+     Each widget has a single callback.
+     \param[in] cb new callback
+     \param[in] p user data
+     */
+    void callback(fltk3::Callback* cb, void* p) {callback_=cb; user_data_=p;}
+    
+    /** Sets the current callback function for the widget.
+     Each widget has a single callback.
+     \param[in] cb new callback
+     */
+    void callback(fltk3::Callback* cb) {callback_=cb;}
+    
+    /** Sets the current callback function for the widget.
+     Each widget has a single callback.
+     \param[in] cb new callback
+     */
+    void callback(fltk3::Callback0*cb) {callback_=(fltk3::Callback*)cb;}
+    
+    /** Sets the current callback function for the widget.
+     Each widget has a single callback.
+     \param[in] cb new callback
+     \param[in] p user data
+     */
+    void callback(fltk3::Callback1*cb, long p=0) {callback_=(fltk3::Callback*)cb; user_data_=(void*)p;}
+    
+    /** Gets the user data for this widget.
+     Gets the current user data (void *) argument that is passed to the callback function.
+     \return user data as a pointer
+     */
+    void* user_data() const {return user_data_;}
+    
+    /** Sets the user data for this widget.
+     Sets the new user data (void *) argument that is passed to the callback function.
+     \param[in] v new user data
+     */
+    void user_data(void* v) {user_data_ = v;}
+    
+    /** Gets the current user data (long) argument that is passed to the callback function.
+     */
+    long argument() const {return (long)(fl_intptr_t)user_data_;}
+    
+    /** Sets the current user data (long) argument that is passed to the callback function.
+     \todo The user data value must be implemented using \em intptr_t or similar
+     to avoid 64-bit machine incompatibilities.
+     */
+    void argument(long v) {user_data_ = (void*)v;}
+    
+    /** Returns the conditions under which the callback is called.
+     
+     You can set the flags with when(uchar), the default value is
+     fltk3::WHEN_RELEASE.
+     
+     \return set of flags
+     \see when(uchar)
+     */
+    fltk3::When when() const {return (fltk3::When)when_;}
+    
+    /** Sets the flags used to decide when a callback is called.
+     
+     This controls when callbacks are done. The following values are useful,
+     the default value is fltk3::WHEN_RELEASE:
+     
+     \li 0: The callback is not done, but changed() is turned on.
+     \li fltk3::WHEN_CHANGED: The callback is done each time the text is
+     changed by the user.
+     \li fltk3::WHEN_RELEASE: The callback will be done when this widget loses 
+     the focus, including when the window is unmapped. This is a useful 
+     value for text fields in a panel where doing the callback on every
+     change is wasteful. However the callback will also happen if the 
+     mouse is moved out of the window, which means it should not do 
+     anything visible (like pop up an error message).
+     You might do better setting this to zero, and scanning all the
+     items for changed() when the OK button on a panel is pressed.
+     \li fltk3::WHEN_ENTER_KEY: If the user types the Enter key, the entire 
+     text is selected, and the callback is done if the text has changed. 
+     Normally the Enter key will navigate to the next field (or insert 
+     a newline for a fltk3::MultilineInput) - this changes the behavior.
+     \li fltk3::WHEN_ENTER_KEY|fltk3::WHEN_NOT_CHANGED: The Enter key will do the
+     callback even if the text has not changed. Useful for command fields.
+     fltk3::Widget::when() is a set of bitflags used by subclasses of 
+     fltk3::Widget to decide when to do the callback.
+     
+     If the value is zero then the callback is never done. Other values 
+     are described  in the individual widgets. This field is in the base 
+     class so that you can scan a panel and do_callback() on all the ones
+     that don't do their own callbacks in response to an "OK" button.
+     \param[in] i set of flags
+     */
+    void when(uchar i) {when_ = i;}
+    
+    /** Returns whether a widget is visible.
+     \retval 0 if the widget is not drawn and hence invisible.
+     \see show(), hide(), visible_r()
+     */
+    unsigned int visible() const {return !(flags_&INVISIBLE);}
+    
+    /** Returns whether a widget and all its parents are visible.
+     \retval 0 if the widget or any of its parents are invisible.
+     \see show(), hide(), visible()
+     */
+    int visible_r() const;
+    
+    /** Makes a widget visible.
+     
+     An invisible widget never gets redrawn and does not get keyboard
+     or mouse events, but can receive a few other events like fltk3::SHOW.
+     
+     The visible() method returns true if the widget is set to be
+     visible. The visible_r() method returns true if the widget and
+     all of its parents are visible. A widget is only visible if
+     visible() is true on it <I>and all of its parents</I>.
+     
+     Changing it will send fltk3::SHOW or fltk3::HIDE events to the widget.
+     <I>Do not change it if the parent is not visible, as this
+     will send false fltk3::SHOW or fltk3::HIDE events to the widget</I>.
+     redraw() is called if necessary on this or the parent.
+     
+     \see hide(), visible(), visible_r()
+     */
+    virtual void show();
+    
+    /** Makes a widget invisible.
+     \see show(), visible(), visible_r()
+     */
+    virtual void hide();
+    
+    /** Makes the widget visible. 
+     You must still redraw the parent widget to see a change in the 
+     window. Normally you want to use the show() method instead.
+     */
+    void set_visible() {flags_ &= ~INVISIBLE;}
+    
+    /** Hides the widget. 
+     You must still redraw the parent to see a change in the window. 
+     Normally you want to use the hide() method instead.
+     */
+    void clear_visible() {flags_ |= INVISIBLE;}
+    
+    /** Returns whether the widget is active.
+     \retval 0 if the widget is inactive
+     \see active_r(), activate(), deactivate()
+     */
+    unsigned int active() const {return !(flags_&INACTIVE);}
+    
+    /** Returns whether the widget and all of its parents are active. 
+     \retval 0 if this or any of the parent widgets are inactive
+     \see active(), activate(), deactivate()
+     */
+    int active_r() const;
+    
+    /** Activates the widget.
+     Changing this value will send fltk3::ACTIVATE to the widget if 
+     active_r() is true.
+     \see active(), active_r(), deactivate()
+     */
+    void activate();
+    
+    /** Deactivates the widget.
+     Inactive widgets will be drawn "grayed out", e.g. with less contrast 
+     than the active widget. Inactive widgets will not receive any keyboard 
+     or mouse button events. Other events (including fltk3::ENTER, fltk3::MOVE, 
+     fltk3::LEAVE, fltk3::SHORTCUT, and others) will still be sent. A widget is 
+     only active if active() is true on it <I>and all of its parents</I>.  
+     
+     Changing this value will send fltk3::DEACTIVATE to the widget if 
+     active_r() is true.
+     
+     Currently you cannot deactivate fltk3::Window widgets.
+     
+     \see activate(), active(), active_r()
+     */
+    void deactivate();
+    
+    /** Returns if a widget is used for output only.
+     output() means the same as !active() except it does not change how the 
+     widget is drawn. The widget will not receive any events. This is useful 
+     for making scrollbars or buttons that work as displays rather than input 
+     devices.
+     \retval 0 if the widget is used for input and output
+     \see set_output(), clear_output() 
+     */
+    unsigned int output() const {return (flags_&OUTPUT);}
+    
+    /** Sets a widget to output only.
+     \see output(), clear_output() 
+     */
+    void set_output() {flags_ |= OUTPUT;}
+    
+    /** Sets a widget to accept input.
+     \see set_output(), output() 
+     */
+    void clear_output() {flags_ &= ~OUTPUT;}
+    
+    /** Returns if the widget is able to take events.
+     This is the same as (active() && !output() && visible())
+     but is faster.
+     \retval 0 if the widget takes no events
+     */
+    unsigned int takesevents() const {return !(flags_&(INACTIVE|INVISIBLE|OUTPUT));}
+    
+    /** 
+     Checks if the widget value changed since the last callback.
+     
+     "Changed" is a flag that is turned on when the user changes the value 
+     stored in the widget. This is only used by subclasses of fltk3::Widget that 
+     store values, but is in the base class so it is easier to scan all the 
+     widgets in a panel and do_callback() on the changed ones in response 
+     to an "OK" button.
+     
+     Most widgets turn this flag off when they do the callback, and when 
+     the program sets the stored value.
+     
+     \retval 0 if the value did not change
+     \see set_changed(), clear_changed()
+     */
+    unsigned int changed() const {return flags_&CHANGED;}
+    
+    /** Marks the value of the widget as changed.
+     \see changed(), clear_changed()
+     */
+    void set_changed() {flags_ |= CHANGED;}
+    
+    /** Marks the value of the widget as unchanged.
+     \see changed(), set_changed()
+     */
+    void clear_changed() {flags_ &= ~CHANGED;}
+    
+    /** Gives the widget the keyboard focus.
+     Tries to make this widget be the fltk3::focus() widget, by first sending 
+     it an fltk3::FOCUS event, and if it returns non-zero, setting 
+     fltk3::focus() to this widget. You should use this method to 
+     assign the focus to a widget.  
+     \return true if the widget accepted the focus.
+     */
+    int take_focus();
+    
+    /** Enables keyboard focus navigation with this widget. 
+     Note, however, that this will not necessarily mean that the widget
+     will accept focus, but for widgets that can accept focus, this method
+     enables it if it has been disabled.
+     \see visible_focus(), clear_visible_focus(), visible_focus(int) 
+     */
+    void set_visible_focus() { flags_ |= VISIBLE_FOCUS; }
+    
+    /** Disables keyboard focus navigation with this widget. 
+     Normally, all widgets participate in keyboard focus navigation.
+     \see set_visible_focus(), visible_focus(), visible_focus(int) 
+     */
+    void clear_visible_focus() { flags_ &= ~VISIBLE_FOCUS; }
+    
+    /** Modifies keyboard focus navigation. 
+     \param[in] v set or clear visible focus
+     \see set_visible_focus(), clear_visible_focus(), visible_focus() 
+     */
+    void visible_focus(int v) { if (v) set_visible_focus(); else clear_visible_focus(); }
+    
+    /** Checks whether this widget has a visible focus.
+     \retval 0 if this widget has no visible focus.
+     \see visible_focus(int), set_visible_focus(), clear_visible_focus()
+     */
+    unsigned int visible_focus() { return flags_ & VISIBLE_FOCUS; }
+    
+    /** Sets the default callback for all widgets.
+     Sets the default callback, which puts a pointer to the widget on the queue 
+     returned by fltk3::readqueue(). You may want to call this from your own callback.
+     \param[in] cb the new callback
+     \param[in] d user data associated with that callback
+     \see callback(), do_callback(), fltk3::readqueue()
+     */
+    static void default_callback(fltk3::Widget *cb, void *d);
+    
+    /** Calls the widget callback.
+     Causes a widget to invoke its callback function with default arguments.
+     \see callback()
+     */
+    void do_callback() {do_callback(this,user_data_);}
+    
+    /** Calls the widget callback.
+     Causes a widget to invoke its callback function with arbitrary arguments.
+     \param[in] o call the callback with \p o as the widget argument
+     \param[in] arg call the callback with \p arg as the user data argument
+     \see callback()
+     */
+    void do_callback(fltk3::Widget* o,long arg) {do_callback(o,(void*)arg);}
+    
+    // Causes a widget to invoke its callback function with arbitrary arguments.
+    // Documentation and implementation in fltk3::Widget.cxx
+    void do_callback(fltk3::Widget* o,void* arg=0);
+    
+    /* Internal use only. */
+    int test_shortcut();
+    /* Internal use only. */
+    static unsigned int label_shortcut(const char *t);
+    /* Internal use only. */
+    static int test_shortcut(const char*, const bool require_alt = false);
+    
+    /** Checks if w is a child of this widget.
+     \param[in] w potential child widget
+     \return Returns 1 if \p w is a child of this widget, or is
+     equal to this widget. Returns 0 if \p w is NULL.
+     */
+    int contains(const fltk3::Widget *w) const ;
+    
+    /** Checks if this widget is a child of w.
+     Returns 1 if this widget is a child of \p w, or is
+     equal to \p w. Returns 0 if \p w is NULL.
+     \param[in] w the possible parent widget.
+     \see contains()
+     */
+    int inside(const fltk3::Widget* w) const {return w ? w->contains(this) : 0;}
+    
+    /** Schedules the drawing of the widget.
+     Marks the widget as needing its draw() routine called.
+     */
+    void redraw();
+    
+    /** Schedules the drawing of the label.
+     Marks the widget or the parent as needing a redraw for the label area 
+     of a widget.
+     */
+    void redraw_label();
+    
+    /** Returns non-zero if draw() needs to be called. 
+     The damage value is actually a bit field that the widget 
+     subclass can use to figure out what parts to draw.
+     \return a bitmap of flags describing the kind of damage to the widget
+     \see damage(uchar), clear_damage(uchar)
+     */
+    fltk3::Damage damage() const {return (fltk3::Damage)damage_;}
+    
+    /** Clears or sets the damage flags.
+     Damage flags are cleared when parts of the widget drawing is repaired.
+     
+     The optional argument \p c specifies the bits that <b>are set</b>
+     after the call (default: 0) and \b not the bits that are cleared!
+     
+     \note Therefore it is possible to set damage bits with this method, but
+     this should be avoided. Use damage(uchar) instead.
+     
+     \param[in] c new bitmask of damage flags (default: 0)
+     \see damage(uchar), damage()
+     */
+    void clear_damage(uchar c = 0) {damage_ = c;}
+    
+    /** Sets the damage bits for the widget.
+     Setting damage bits will schedule the widget for the next redraw.
+     \param[in] c bitmask of flags to set
+     \see damage(), clear_damage(uchar)
+     */
+    void damage(uchar c);
+    
+    /** Sets the damage bits for an area inside the widget.
+     Setting damage bits will schedule the widget for the next redraw.
+     \param[in] c bitmask of flags to set
+     \param[in] x, y, w, h size of damaged area
+     \see damage(), clear_damage(uchar)
+     */
+    void damage(uchar c, int x, int y, int w, int h);
+    
+    void draw_label(int, int, int, int, fltk3::Align) const;
+    
+    /** Sets width ww and height hh accordingly with the label size.
+     Labels with images will return w() and h() of the image.
+     */
+    void measure_label(int& ww, int& hh) const {label_.measure(ww, hh);}
+    
+    /** Returns a pointer to the primary fltk3::Window widget.
+     \retval  NULL if no window is associated with this widget.  
+     \note for an fltk3::Window widget, this returns its <I>parent</I> window 
+     (if any), not <I>this</I> window.
+     */
+    fltk3::Window* window() const ;
+    
+    /** Returns an fltk3::Group pointer if this widget is an fltk3::Group.
+     
+     Use this method if you have a widget (pointer) and need to
+     know whether this widget is derived from fltk3::Group. If it returns
+     non-NULL, then the widget in question is derived from fltk3::Group,
+     and you can use the returned pointer to access its children
+     or other fltk3::Group-specific methods.
+     
+     Example:
+     \code
+     void my_callback (fltk3::Widget *w, void *) {
+     fltk3::Group *g = w->as_group();
+     if (g)
+     printf ("This group has %d children\n",g->children());
+     else
+     printf ("This widget is not a group!\n");
+     }
+     \endcode
+     
+     \retval NULL if this widget is not derived from fltk3::Group.
+     \note This method is provided to avoid dynamic_cast.
+     \see fltk3::Widget::as_window(), fltk3::Widget::as_gl_window()
+     */
+    virtual fltk3::Group* as_group() {return 0;}
+    
+    /** Returns an fltk3::Window pointer if this widget is an fltk3::Window.
+     
+     Use this method if you have a widget (pointer) and need to
+     know whether this widget is derived from fltk3::Window. If it returns
+     non-NULL, then the widget in question is derived from fltk3::Window,
+     and you can use the returned pointer to access its children
+     or other fltk3::Window-specific methods.
+     
+     \retval NULL if this widget is not derived from fltk3::Window.
+     \note This method is provided to avoid dynamic_cast.
+     \see fltk3::Widget::as_group(), fltk3::Widget::as_gl_window()
+     */
+    virtual fltk3::Window* as_window() {return 0;}
+    
+    /** Returns an fltk3::GlWindow pointer if this widget is an fltk3::GlWindow.
+     
+     Use this method if you have a widget (pointer) and need to
+     know whether this widget is derived from fltk3::GlWindow. If it returns
+     non-NULL, then the widget in question is derived from fltk3::GlWindow.
+     
+     \retval NULL if this widget is not derived from fltk3::GlWindow.
+     \note This method is provided to avoid dynamic_cast.
+     \see fltk3::Widget::as_group(), fltk3::Widget::as_window()
+     */
+    virtual class fltk3::GlWindow* as_gl_window() {return 0;}
+    
+    /** For back compatibility only.
+     \deprecated Use selection_color() instead.
+     */
+    fltk3::Color color2() const {return (fltk3::Color)color2_;}
+    
+    /** For back compatibility only.
+     \deprecated Use selection_color(unsigned) instead.
+     */
+    void color2(unsigned a) {color2_ = a;}
+
+    /** Gets the font of the text in the input field.
+     \return the current fltk3::Font index */
+    fltk3::Font textfont() const {return label_.textfont_;}
+    
+    /** Sets the font of the text in the input field.
+     The text font defaults to \c fltk3::HELVETICA.
+     \param [in] s the new text font */
+    void textfont(fltk3::Font s) {label_.textfont_ = s;}
+    
+    /** Gets the size of the text in the input field.
+     \return the text height in pixels */
+    fltk3::Fontsize textsize() const {return label_.textsize_;}
+    
+    /** Sets the size of the text in the input field.
+     The text height defaults to \c fltk3::NORMAL_SIZE.
+     \param [in] s the new font height in pixel units */
+    void textsize(fltk3::Fontsize s) {label_.textsize_ = s;}
+    
+    /** Gets the color of the text in the input field.
+     \return the text color
+     \see textcolor(fltk3::Color) */
+    fltk3::Color textcolor() const {return label_.textcolor_;}
+    
+    /** Sets the color of the text in the input field.
+     The text color defaults to \c fltk3::FOREGROUND_COLOR.
+     \param [in] n new text color
+     \see textcolor() */
+    void textcolor(fltk3::Color n) {label_.textcolor_ = n;}
+    
+};
+  
+  
+  /**
+   Reserved type numbers (necessary for my cheapo RTTI) start here.
+   Grep the header files for "RESERVED_TYPE" to find the next available
+   number.
+   */
+  const uchar RESERVED_TYPE = 100;
+}
+
+#endif
+
+//
+// End of "$Id: Widget.h 8623 2011-04-24 17:09:41Z AlbrechtS $".
+//

Deleted: branches/branch-3.0/include/fltk3/osx.h

Copied: branches/branch-3.0/include/fltk3/osx.h (from rev 8988, branches/branch-3.0/fltk3/osx.h)
===================================================================
--- branches/branch-3.0/include/fltk3/osx.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/osx.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,250 @@
+//
+// "$Id: osx.h 8657 2011-05-12 11:50:43Z manolo $"
+//
+// Mac header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2011 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+// Do not directly include this file, instead use <fltk3/x.h>.  It will
+// include this file if "__APPLE__" is defined.  This is to encourage
+// portability of even the system-specific code...
+#ifndef FLTK3_DOXYGEN
+
+#if !defined(Fltk3_X_H)
+#  error "Never use <fltk3/osx.h> directly; include <fltk3/x.h> instead."
+#endif // !Fltk3_X_H
+#include <fltk3/Widget.h>
+
+typedef void* Window;	    // this is really a pointer to the subclass FLWindow of NSWindow
+
+namespace fltk3 {
+  typedef void* Offscreen; // this is really a CGContextRef
+  typedef void* Bitmask;   // this is really a CGImageRef
+}
+
+#include <AvailabilityMacros.h>
+#ifndef MAC_OS_X_VERSION_10_3
+#define MAC_OS_X_VERSION_10_3 1030
+#endif
+#ifndef MAC_OS_X_VERSION_10_4
+#define MAC_OS_X_VERSION_10_4 1040
+#endif
+#ifndef MAC_OS_X_VERSION_10_5
+#define MAC_OS_X_VERSION_10_5 1050
+#endif
+#ifndef MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_10_6 1060
+#endif
+
+#if !(defined(FL_LIBRARY) || defined(FLTK3_INTERNALS)) // this part is used when compiling an application program
+
+namespace fltk3 {
+  typedef void* Region;
+}
+typedef void* Fl_CGContextRef;
+typedef void* Fl_PMPrintSettings;
+typedef void* Fl_PMPageFormat;
+typedef void* Fl_PMPrintSession;
+
+#else // this part must be compiled when building the FLTK libraries
+
+// Standard MacOS C/C++ includes...
+#include <ApplicationServices/ApplicationServices.h>
+#undef check // because of fltk3::check()
+
+typedef CGContextRef	Fl_CGContextRef;
+typedef PMPrintSettings Fl_PMPrintSettings;
+typedef PMPageFormat	Fl_PMPageFormat;
+typedef PMPrintSession	Fl_PMPrintSession;
+
+namespace fltk3 {
+  typedef struct flCocoaRegion {
+    int count;
+    CGRect *rects;
+  } *Region;  // a region is the union of a series of rectangles
+}
+
+#  include "Window.h"
+
+// Some random X equivalents
+struct XPoint { int x, y; };
+struct XRectangle {int x, y, width, height;};
+#ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
+#if defined(__LP64__) && __LP64__
+typedef double CGFloat;
+#else
+typedef float CGFloat;
+#endif
+#endif // CGFLOAT_DEFINED
+
+extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h);
+inline fltk3::Region XRectangleRegion(int x, int y, int w, int h) {
+  fltk3::Region R = (fltk3::Region)malloc(sizeof(*R));
+  R->count = 1;
+  R->rects = (CGRect *)malloc(sizeof(CGRect));
+  *(R->rects) = fl_cgrectmake_cocoa(x, y, w, h);
+  return R;
+}
+inline void XDestroyRegion(fltk3::Region r) {
+  if(r) {
+    free(r->rects);
+    free(r);
+  }
+}
+extern void *fl_system_menu;
+extern void *fl_default_cursor;
+
+// This object contains all mac-specific stuff about a window:
+// WARNING: this object is highly subject to change!
+class Fl_X {
+  
+public:
+  Window xid;              // pointer to the Cocoa window object (FLWindow*)
+  fltk3::Offscreen other_xid;  // pointer for offscreen bitmaps (overlay window)
+  fltk3::Window *w;            // FLTK window for 
+  fltk3::Region region;
+  fltk3::Region subRegion;     // region for this specific subwindow
+  Fl_X *next;              // linked tree to support subwindows
+  Fl_X *xidChildren, *xidNext; // more subwindow tree
+  int wait_for_expose;
+  void *cursor;	           // is really NSCursor*
+  static Fl_X* first;
+  static Fl_X* i(const fltk3::Window* w) {return w->i;}
+  static int fake_X_wm(const fltk3::Window*,int&,int&,int&,int&,int&);
+  static void make(fltk3::Window*);
+  void flush();
+  // Quartz additions:
+  CGContextRef gc;                 // graphics context (NULL when using QD)
+  static void q_fill_context();    // fill a Quartz context with current FLTK state
+  static void q_clear_clipping();  // remove all clipping from a Quartz context
+  static void q_release_context(Fl_X *x=0); // free all resources associated with fl_gc
+  static void q_begin_image(CGRect&, int x, int y, int w, int h);
+  static void q_end_image();
+  // Cocoa additions
+  void destroy(void);
+  void map(void);
+  void unmap(void);
+  int unlink(Fl_X* start = NULL);
+  void collapse(void);
+  WindowRef window_ref(void);
+  void set_key_window(void);
+  void set_cursor(fltk3::Cursor);
+  static CGImageRef CGImage_from_window_rect(fltk3::Window *win, int x, int y, int w, int h);
+  static unsigned char *bitmap_from_window_rect(fltk3::Window *win, int x, int y, int w, int h, int *bytesPerPixel);
+  static fltk3::Region intersect_region_and_rect(fltk3::Region current, int x,int y,int w, int h);
+  static CGContextRef watch_cursor_image(void);
+  static CGContextRef help_cursor_image(void);
+  static CGContextRef nesw_cursor_image(void);
+  static CGContextRef nwse_cursor_image(void);
+  static CGContextRef none_cursor_image(void);
+  static void *get_carbon_function(const char *name);
+private:
+  static void relink(fltk3::Window*, fltk3::Window*);
+  bool subwindow;
+};
+
+extern struct Fl_XMap {
+  RGBColor rgb;
+  ulong pen;
+} *fl_current_xmap;
+extern FLTK3_EXPORT Window fl_window;
+
+#endif // FL_LIBRARY || FLTK3_INTERNALS
+
+extern FLTK3_EXPORT Fl_CGContextRef fl_gc;
+
+namespace fltk3 {
+  extern FLTK3_EXPORT class SysMenuBar *sys_menu_bar;
+}
+
+extern Window fl_xid(const fltk3::Window*);
+
+namespace fltk3 {
+  void clip_region(fltk3::Region);
+}
+
+extern FLTK3_EXPORT fltk3::Bitmask fl_create_bitmask(int w, int h, const uchar *data);
+extern FLTK3_EXPORT fltk3::Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
+extern FLTK3_EXPORT void fl_delete_bitmask(fltk3::Bitmask bm);
+extern fltk3::Offscreen fl_create_offscreen(int w, int h);
+extern void fl_copy_offscreen(int x,int y,int w,int h, fltk3::Offscreen gWorld, int srcx,int srcy);
+extern void fl_delete_offscreen(fltk3::Offscreen gWorld);
+extern void fl_begin_offscreen(fltk3::Offscreen gWorld);
+extern void fl_end_offscreen();
+
+extern FLTK3_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
+extern void fl_open_display();
+
+#endif // FLTK3_DOXYGEN
+
+/** \defgroup group_macosx Mac OS X-specific symbols
+ Mac OS X-specific symbols declared in <fltk3/x.h> or <fltk3/gl.h>
+ @{ */
+
+/** @brief Register a function called for each file dropped onto an application icon.
+ \e cb will be called with a single Unix-style file name and path.
+ If multiple files were dropped, \e cb will be called multiple times.
+ */
+extern void fl_open_callback(void (*cb)(const char *));
+
+/** 
+ * \brief Attaches a callback to the "About myprog" item of the system application menu.
+ *
+ * \param cb   a callback that will be called by "About myprog" menu item
+ *		   with NULL 1st argument.
+ * \param user_data   a pointer transmitted as 2nd argument to the callback.
+ * \param shortcut    optional shortcut to attach to the "About myprog" menu item (e.g., fltk3::META+'a')
+ */
+extern void fl_mac_set_about( fltk3::Callback *cb, void *user_data, unsigned int shortcut = 0);
+
+/** \brief The version number of the running Mac OS X (e.g., 100604 for 10.6.4)
+ */
+extern int fl_mac_os_version;
+
+class Fl_Mac_App_Menu {
+public:
+  /** Localizable text for the "About xxx" application menu item */
+  static const char *about;
+  /** Localizable text for the "Print Front Window" application menu item.
+   This menu item won't be displayed if Fl_Mac_App_Menu::print 
+   is set to an empty string.
+   */
+  static const char *print;
+  /** Localizable text for the "Services" application menu item */
+  static const char *services;
+  /** Localizable text for the "Hide xxx" application menu item */
+  static const char *hide;
+  /** Localizable text for the "Hide Others" application menu item */
+  static const char *hide_others;
+  /** Localizable text for the "Show All" application menu item */
+  static const char *show;
+  /** Localizable text for the "Quit xxx" application menu item */
+  static const char *quit;
+};
+
+/** @} */
+
+//
+// End of "$Id: osx.h 8657 2011-05-12 11:50:43Z manolo $".
+//
+

Deleted: branches/branch-3.0/include/fltk3/run.h

Copied: branches/branch-3.0/include/fltk3/run.h (from rev 8988, branches/branch-3.0/fltk3/run.h)
===================================================================
--- branches/branch-3.0/include/fltk3/run.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3/run.h	2011-08-22 15:21:44 UTC (rev 8991)
@@ -0,0 +1,1170 @@
+//
+// "$Id: run.h 8548 2011-03-30 12:07:52Z AlbrechtS $"
+//
+// Main header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/** \file
+ fltk3 namespace
+ */
+
+#ifndef FLTK3_RUN_H
+#  define FLTK3_RUN_H
+
+#ifdef FLTK_HAVE_CAIRO
+# include <fltk3/Cairo.h>
+#endif
+
+#  include "utf8.h"
+#  include "enumerations.h"
+
+#  ifdef check
+#    undef check
+#  endif
+
+
+namespace fltk3 { 
+  class Widget;
+  class Window;
+  struct Label;
+  class Image;
+  
+  /** \defgroup  callback_functions Callback function typedefs
+   \brief Typedefs defined in <fltk3/run.h> for callback or handler functions passed as function parameters.
+   
+   FLTK uses callback functions as parameters for some function calls, e.g. to
+   set up global event handlers (fltk3::add_handler()), to add a timeout handler
+   (fltk3::add_timeout()), and many more.
+   
+   The typedefs defined in this group describe the function parameters used to set
+   up or clear the callback functions and should also be referenced to define the
+   callback function to handle such events in the user's code.
+   
+   \see fltk3::add_handler(), fltk3::add_timeout(), fltk3::repeat_timeout(),
+   fltk3::remove_timeout() and others
+   @{ */
+  
+  /** S