Author: matt
Date: 2012-06-15 14:11:24 -0700 (Fri, 15 Jun 2012)
New Revision: 9615
Log:
Some updates to make FLTK3 compile on vc2010 and VC6
Modified:
branches/branch-3.0/ide/VisualC6/fltk3.dsp
branches/branch-3.0/include/FL/Fl_Device.H
branches/branch-3.0/include/fltk3/PackedGroup.h
branches/branch-3.0/src/fltk3/Scalebar.cxx
branches/branch-3.0/src/fltk3/Window.cxx
branches/branch-3.0/src/fltk3/run.cxx
branches/branch-3.0/src/fltk3/vertex.cxx
branches/branch-3.0/src/fltk3/win32.cxx
branches/branch-3.0/src/fltk3connect/Socket.cxx
Modified: branches/branch-3.0/ide/VisualC6/fltk3.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3.dsp 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/ide/VisualC6/fltk3.dsp 2012-06-15 21:11:24 UTC (rev
9615)
@@ -83,619 +83,611 @@
# Name "fltk3 - Win32 Debug"
# Begin Source File
-SOURCE=..\..\src\fltk3\Adjuster.cxx
+SOURCE=..\..\src\fltk3\abort.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Bitmap.cxx
+SOURCE=..\..\src\fltk3\add_idle.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Box.cxx
+SOURCE=..\..\src\fltk3\Adjuster.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Browser.cxx
+SOURCE=..\..\src\fltk3\arc.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Browser_.cxx
+SOURCE=..\..\src\fltk3\arci.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Browser_load.cxx
+SOURCE=..\..\src\fltk3\arg.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Button.cxx
+SOURCE=..\..\src\fltk3\ask.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Chart.cxx
+SOURCE=..\..\src\fltk3\Bitmap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\CheckBrowser.cxx
+SOURCE=..\..\src\fltk3\Box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\CheckButton.cxx
+SOURCE=..\..\src\fltk3\boxtype.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Choice.cxx
+SOURCE=..\..\src\fltk3\Browser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Clock.cxx
+SOURCE=..\..\src\fltk3\Browser_.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ColorChooser.cxx
+SOURCE=..\..\src\fltk3\Browser_load.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Counter.cxx
+SOURCE=..\..\src\fltk3\Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Device.cxx
+SOURCE=..\..\src\fltk3\call_main.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Dial.cxx
+SOURCE=..\..\src\fltk3\xutf8\case.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\DoubleWindow.cxx
+SOURCE=..\..\src\fltk3\Chart.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\FileBrowser.cxx
+SOURCE=..\..\src\fltk3\CheckBrowser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\FileChooser.cxx
+SOURCE=..\..\src\fltk3\CheckButton.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\FileChooser2.cxx
+SOURCE=..\..\src\fltk3\Choice.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\FileIcon.cxx
+SOURCE=..\..\src\fltk3\Clock.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\FileInput.cxx
+SOURCE=..\..\src\fltk3\color.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Group.cxx
+SOURCE=..\..\src\fltk3\ColorChooser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\HelpView.cxx
+SOURCE=..\..\src\fltk3\compose.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Image.cxx
+SOURCE=..\..\src\fltk3\Counter.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Input.cxx
+SOURCE=..\..\src\fltk3\cursor.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Input_.cxx
+SOURCE=..\..\src\fltk3\curve.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\LightButton.cxx
+SOURCE=..\..\src\fltk3\Device.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Menu.cxx
+SOURCE=..\..\src\fltk3\Dial.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Menu_.cxx
+SOURCE=..\..\src\fltk3\diamond_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\MenuBar.cxx
+SOURCE=..\..\src\fltk3\display.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\MenuButton.cxx
+SOURCE=..\..\src\fltk3\dnd.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\MenuWindow.cxx
+SOURCE=..\..\src\fltk3\DoubleWindow.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Menu_add.cxx
+SOURCE=..\..\src\fltk3\draw.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Menu_global.cxx
+SOURCE=..\..\src\fltk3\draw_image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\MultiLabel.cxx
+SOURCE=..\..\src\fltk3\draw_pixmap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\NativeFileChooser.cxx
+SOURCE=..\..\src\fltk3\encoding_latin1.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\OverlayWindow.cxx
+SOURCE=..\..\src\fltk3\encoding_mac_roman.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\PackedGroup.cxx
+SOURCE=..\..\src\fltk3\engraved_label.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\PagedDevice.cxx
+SOURCE=..\..\src\fltk3\file_dir.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Pixmap.cxx
+SOURCE=..\..\src\fltk3\FileBrowser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Positioner.cxx
+SOURCE=..\..\src\fltk3\FileChooser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Printer.cxx
+SOURCE=..\..\src\fltk3\FileChooser2.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Preferences.cxx
+SOURCE=..\..\src\fltk3\FileIcon.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Progress.cxx
+SOURCE=..\..\src\fltk3\FileInput.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\RepeatButton.cxx
+SOURCE=..\..\src\fltk3\filename_absolute.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ReturnButton.cxx
+SOURCE=..\..\src\fltk3\filename_expand.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Roller.cxx
+SOURCE=..\..\src\fltk3\filename_ext.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\RoundButton.cxx
+SOURCE=..\..\src\fltk3\filename_isdir.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Scalebar.cxx
+SOURCE=..\..\src\fltk3\filename_list.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ScrollGroup.cxx
+SOURCE=..\..\src\fltk3\filename_match.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Scrollbar.cxx
+SOURCE=..\..\src\fltk3\filename_setext.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ShapedWindow.cxx
+SOURCE=..\..\src\fltk3\flstring.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\SharedImage.cxx
+SOURCE=..\..\src\fltk3\font.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\SingleWindow.cxx
+SOURCE=..\..\src\fltk3\get_key.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Slider.cxx
+SOURCE=..\..\src\fltk3\get_system_colors.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Style.cxx
+SOURCE=..\..\src\fltk3\grab.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Symbol.cxx
+SOURCE=..\..\src\fltk3\Group.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Table.cxx
+SOURCE=..\..\src\fltk3\gtk.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TableRow.cxx
+SOURCE=..\..\src\fltk3\HelpView.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TabGroup.cxx
+SOURCE=..\..\src\fltk3\Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TextBuffer.cxx
+SOURCE=..\..\src\fltk3\Input.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TextDisplay.cxx
+SOURCE=..\..\src\fltk3\Input_.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TextEditor.cxx
+SOURCE=..\..\src\fltk3\xutf8\is_right2left.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TiledGroup.cxx
+SOURCE=..\..\src\fltk3\xutf8\is_spacing.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TiledImage.cxx
+SOURCE=..\..\src\fltk3\labeltype.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Tooltip.cxx
+SOURCE=..\..\src\fltk3\LightButton.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Tree.cxx
+SOURCE=..\..\src\fltk3\line_style.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TreeItem.cxx
+SOURCE=..\..\src\fltk3\lock.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TreeItemArray.cxx
+SOURCE=..\..\src\fltk3\Menu.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\TreePrefs.cxx
+SOURCE=..\..\src\fltk3\Menu_.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Valuator.cxx
+SOURCE=..\..\src\fltk3\Menu_add.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ValueInput.cxx
+SOURCE=..\..\src\fltk3\Menu_global.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ValueOutput.cxx
+SOURCE=..\..\src\fltk3\MenuBar.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ValueSlider.cxx
+SOURCE=..\..\src\fltk3\MenuButton.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Widget.cxx
+SOURCE=..\..\src\fltk3\MenuWindow.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Window.cxx
+SOURCE=..\..\src\fltk3\MultiLabel.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Window_fullscreen.cxx
+SOURCE=..\..\src\fltk3\NativeFileChooser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Window_hotspot.cxx
+SOURCE=..\..\src\fltk3\numericsort.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Window_iconize.cxx
+SOURCE=..\..\src\fltk3\open_uri.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\WizardGroup.cxx
+SOURCE=..\..\src\fltk3\oval_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\XBMImage.cxx
+SOURCE=..\..\src\fltk3\overlay.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\XPMImage.cxx
+SOURCE=..\..\src\fltk3\overlay_visual.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\arc.cxx
+SOURCE=..\..\src\fltk3\OverlayWindow.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\arci.cxx
+SOURCE=..\..\src\fltk3\own_colormap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ask.cxx
+SOURCE=..\..\src\fltk3\PackedGroup.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\abort.cxx
+SOURCE=..\..\src\fltk3\PagedDevice.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\add_idle.cxx
+SOURCE=..\..\src\fltk3\Pixmap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\arg.cxx
+SOURCE=..\..\src\fltk3\plastic.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\boxtype.cxx
+SOURCE=..\..\src\fltk3\Positioner.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\call_main.cxx
+SOURCE=..\..\src\fltk3\Preferences.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\xutf8\case.c
+SOURCE=..\..\src\fltk3\Printer.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\color.cxx
+SOURCE=..\..\src\fltk3\Progress.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\compatibility1.cxx
+SOURCE=..\..\src\fltk3\ps_image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\compatibility2.cxx
+SOURCE=..\..\src\fltk3\read_image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\compose.cxx
+SOURCE=..\..\src\fltk3\rect.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\cursor.cxx
+SOURCE=..\..\src\fltk3\RepeatButton.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\curve.cxx
+SOURCE=..\..\src\fltk3\ReturnButton.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\diamond_box.cxx
+SOURCE=..\..\src\fltk3\Roller.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\display.cxx
+SOURCE=..\..\src\fltk3\round_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\dnd.cxx
+SOURCE=..\..\src\fltk3\RoundButton.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\draw.cxx
+SOURCE=..\..\src\fltk3\rounded_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\draw_image.cxx
+SOURCE=..\..\src\fltk3\run.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\draw_pixmap.cxx
+SOURCE=..\..\src\fltk3\Scalebar.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\encoding_latin1.cxx
+SOURCE=..\..\src\fltk3\scandir.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\encoding_mac_roman.cxx
+SOURCE=..\..\src\fltk3\screen_xywh.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\engraved_label.cxx
+SOURCE=..\..\src\fltk3\scroll_area.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\file_dir.cxx
+SOURCE=..\..\src\fltk3\Scrollbar.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_absolute.cxx
+SOURCE=..\..\src\fltk3\ScrollGroup.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_expand.cxx
+SOURCE=..\..\src\fltk3\set_font.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_ext.cxx
+SOURCE=..\..\src\fltk3\set_fonts.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_isdir.cxx
+SOURCE=..\..\src\fltk3\shadow_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_list.cxx
+SOURCE=..\..\src\fltk3\ShapedWindow.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_match.cxx
+SOURCE=..\..\src\fltk3\SharedImage.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\filename_setext.cxx
+SOURCE=..\..\src\fltk3\shortcut.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\flstring.c
+SOURCE=..\..\src\fltk3\show_colormap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\font.cxx
+SOURCE=..\..\src\fltk3\SingleWindow.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\gtk.cxx
+SOURCE=..\..\src\fltk3\Slider.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\get_key.cxx
+SOURCE=..\..\src\fltk3\Style.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\get_system_colors.cxx
+SOURCE=..\..\src\fltk3\Symbol.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\grab.cxx
+SOURCE=..\..\src\fltk3\symbols.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\xutf8\is_right2left.c
+SOURCE=..\..\src\fltk3\TabGroup.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\xutf8\is_spacing.c
+SOURCE=..\..\src\fltk3\Table.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\labeltype.cxx
+SOURCE=..\..\src\fltk3\TableRow.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\line_style.cxx
+SOURCE=..\..\src\fltk3\TextBuffer.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\lock.cxx
+SOURCE=..\..\src\fltk3\TextDisplay.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\numericsort.cxx
+SOURCE=..\..\src\fltk3\TextEditor.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\open_uri.cxx
+SOURCE=..\..\src\fltk3\TiledGroup.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\oval_box.cxx
+SOURCE=..\..\src\fltk3\TiledImage.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\overlay.cxx
+SOURCE=..\..\src\fltk3\Tooltip.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\overlay_visual.cxx
+SOURCE=..\..\src\fltk3\Tree.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\own_colormap.cxx
+SOURCE=..\..\src\fltk3\TreeItem.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\plastic.cxx
+SOURCE=..\..\src\fltk3\TreeItemArray.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\ps_image.cxx
+SOURCE=..\..\src\fltk3\TreePrefs.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\read_image.cxx
+SOURCE=..\..\src\fltk3\utf.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\rect.cxx
+SOURCE=..\..\src\fltk3\utf8.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\round_box.cxx
+SOURCE=..\..\src\fltk3\Valuator.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\rounded_box.cxx
+SOURCE=..\..\src\fltk3\ValueInput.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\run.cxx
+SOURCE=..\..\src\fltk3\ValueOutput.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\scandir.cxx
+SOURCE=..\..\src\fltk3\ValueSlider.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\screen_xywh.cxx
+SOURCE=..\..\src\fltk3\vertex.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\scroll_area.cxx
+SOURCE=..\..\src\fltk3\visual.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\set_font.cxx
+SOURCE=..\..\src\fltk3\vsnprintf.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\set_fonts.cxx
+SOURCE=..\..\src\fltk3\Widget.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\shadow_box.cxx
+SOURCE=..\..\src\fltk3\Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\shortcut.cxx
+SOURCE=..\..\src\fltk3\Window_fullscreen.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\show_colormap.cxx
+SOURCE=..\..\src\fltk3\Window_hotspot.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\symbols.cxx
+SOURCE=..\..\src\fltk3\Window_iconize.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\utf.cxx
+SOURCE=..\..\src\fltk3\WizardGroup.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\utf8.cxx
+SOURCE=..\..\src\fltk3\x11.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\vertex.cxx
+SOURCE=..\..\src\fltk3\XBMImage.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\visual.cxx
+SOURCE=..\..\src\fltk3\XPMImage.cxx
# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fltk3\x11.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fltk3\vsnprintf.c
-# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/include/FL/Fl_Device.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Device.H 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/include/FL/Fl_Device.H 2012-06-15 21:11:24 UTC (rev
9615)
@@ -377,22 +377,22 @@
fl_matrix = (matrix*)((fltk3::GraphicsDriver*)_p)->fl_matrix;
}
int vertex_no() {
- return ((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::vertex_no();
+ return ((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::vertex_no();
}
XPOINT *vertices() {
- return ((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::vertices();
+ return ((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::vertices();
}
int vertex_kind() {
- return
((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::vertex_kind();
+ return ((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::vertex_kind();
}
void fixloop() {
- ((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::fixloop();
+ ((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::fixloop();
}
void prepare_circle(double x, double y, double r, int& llx, int& lly, int&
w, int& h, double& xt, double& yt) {
- ((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::prepare_circle(x,
y, r, llx, lly, w, h, xt, yt);
+ ((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::prepare_circle(x, y, r,
llx, lly, w, h, xt, yt);
}
Fl_Font font() {
- return fltk3::_3to1_font(
((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::font() );
+ return fltk3::_3to1_font(
((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::font() );
}
Fl_Fontsize size() {
return fltk3::_3to1_fontsize( ((fltk3::GraphicsDriver_I*)_p)->size() );
@@ -401,7 +401,7 @@
((fltk3::GraphicsDriver_I*)_p)->font(fltk3::_1to3_font(f),
fltk3::_1to3_fontsize(s));
}
Fl_Color color() {
- return fltk3::_3to1_color(
((fltk3::GraphicsDriver_I*)_p)->fltk3::GraphicsDriver::color() );
+ return fltk3::_3to1_color(
((fltk3::GraphicsDriver_I*)_p)->GraphicsDriver::color() );
}
void color(Fl_Color c) {
((fltk3::GraphicsDriver_I*)_p)->color(fltk3::_1to3_color(c));
Modified: branches/branch-3.0/include/fltk3/PackedGroup.h
===================================================================
--- branches/branch-3.0/include/fltk3/PackedGroup.h 2012-06-15 20:52:12 UTC
(rev 9614)
+++ branches/branch-3.0/include/fltk3/PackedGroup.h 2012-06-15 21:11:24 UTC
(rev 9615)
@@ -81,7 +81,7 @@
uchar horizontal() const {return type();}
/** Recalculate the size of this widget and reposition all children. */
void layout();
- void resize(int x, int y, int w, int h) { fltk3::Widget::resize(x, y, w,
h); }
+ void resize(int x, int y, int w, int h) { Widget::resize(x, y, w, h); }
};
}
Modified: branches/branch-3.0/src/fltk3/Scalebar.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Scalebar.cxx 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/src/fltk3/Scalebar.cxx 2012-06-15 21:11:24 UTC (rev
9615)
@@ -45,7 +45,7 @@
int fltk3::Scalebar::value() {
- return int(fltk3::Slider::value());
+ return int(Slider::value());
}
@@ -103,7 +103,7 @@
if (p+n > t+l) l = p+n-t;
slider_size(n >= l ? 1.0 : double(n)/double(l));
bounds(t, l-n+t);
- return fltk3::Valuator::value(p);
+ return Valuator::value(p);
}
@@ -194,7 +194,7 @@
int W = w()-fltk3::box_dw(box());
int H = h()-fltk3::box_dh(box());
if (horizontal()) {
- if (W < 3*H) {fltk3::Slider::draw(X,Y,W,H); return;}
+ if (W < 3*H) {Slider::draw(X,Y,W,H); return;}
drawSlider(X+H,Y,W-2*H,H);
if (damage()&fltk3::DAMAGE_ALL) {
// left arrow box
@@ -216,7 +216,7 @@
fltk3::polygon(x1, y1, x1, y1+2*d1, x1+d1, y1+d1);
}
} else { // vertical
- if (H < 3*W) {fltk3::Slider::draw(X,Y,W,H); return;}
+ if (H < 3*W) {Slider::draw(X,Y,W,H); return;}
drawSlider(X,Y+W,W,H-2*W);
if (damage()&fltk3::DAMAGE_ALL) {
draw_box((pushed_==1) ? fltk3::down(slider()) : slider(),
@@ -327,7 +327,7 @@
damage(fltk3::DAMAGE_ALL);
}
}
- return fltk3::Scrollbar::handle( event );
+ return Scrollbar::handle( event );
}
//
Modified: branches/branch-3.0/src/fltk3/Window.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Window.cxx 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/src/fltk3/Window.cxx 2012-06-15 21:11:24 UTC (rev
9615)
@@ -152,7 +152,7 @@
}
void fltk3::Window::copy_label(const char *a) {
- fltk3::Label::copy_label(a);
+ Label::copy_label(a);
label(a, iconlabel());
}
Modified: branches/branch-3.0/src/fltk3/run.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/run.cxx 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/src/fltk3/run.cxx 2012-06-15 21:11:24 UTC (rev
9615)
@@ -230,7 +230,7 @@
dy -= g->dy_window();
}
}
- return o->fltk3::Rectangle::contains(dx, dy);
+ return o->Rectangle::contains(dx, dy);
}
//
Modified: branches/branch-3.0/src/fltk3/vertex.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/vertex.cxx 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/src/fltk3/vertex.cxx 2012-06-15 21:11:24 UTC (rev
9615)
@@ -253,7 +253,7 @@
}
#if defined(WIN32)
void fltk3::GDIGraphicsDriver::begin_complex_polygon() {
- fltk3::GraphicsDriver::begin_complex_polygon();
+ GraphicsDriver::begin_complex_polygon();
numcount = 0;
}
#endif
Modified: branches/branch-3.0/src/fltk3/win32.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32.cxx 2012-06-15 20:52:12 UTC (rev
9614)
+++ branches/branch-3.0/src/fltk3/win32.cxx 2012-06-15 21:11:24 UTC (rev
9615)
@@ -777,7 +777,7 @@
{0xdc, '\\'},
{0xdd, ']'},
{0xde, '\''},
- {VK_OEM_102, fltk3::IsoKey}
+ {226 /*VK_OEM_102*/, fltk3::IsoKey}
};
static int ms2fltk(WPARAM vk, int extended) {
static unsigned short vklut[256];
Modified: branches/branch-3.0/src/fltk3connect/Socket.cxx
===================================================================
--- branches/branch-3.0/src/fltk3connect/Socket.cxx 2012-06-15 20:52:12 UTC
(rev 9614)
+++ branches/branch-3.0/src/fltk3connect/Socket.cxx 2012-06-15 21:11:24 UTC
(rev 9615)
@@ -34,7 +34,7 @@
void fltk3::Socket::draw()
{
- fltk3::Group::draw();
+ Group::draw();
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
