Author: matt
Date: 2011-08-02 11:04:56 -0700 (Tue, 02 Aug 2011)
New Revision: 8905
Log:
Changes needed to make FLTK compile on VC2010
Modified:
branches/branch-3.0/fluid/file_cmake.cxx
branches/branch-3.0/fluid/file_make.cxx
branches/branch-3.0/fluid/file_visualc.cxx
branches/branch-3.0/fluid/file_xcode.cxx
branches/branch-3.0/fluid/workspace_panel.cxx
branches/branch-3.0/ide/VisualC2010/fltk.lib.vcxproj.filters
branches/branch-3.0/src/Fl_Input.cxx
Modified: branches/branch-3.0/fluid/file_cmake.cxx
===================================================================
--- branches/branch-3.0/fluid/file_cmake.cxx 2011-08-02 16:56:21 UTC (rev
8904)
+++ branches/branch-3.0/fluid/file_cmake.cxx 2011-08-02 18:04:56 UTC (rev
8905)
@@ -38,7 +38,7 @@
// ------------ file conversion
------------------------------------------------
-extern char *filename;
+extern const char *filename;
int write_fltk_cmake() {
// for now, we use a template file in FLTK/ide/templates/CMake.tmpl .
Modified: branches/branch-3.0/fluid/file_make.cxx
===================================================================
--- branches/branch-3.0/fluid/file_make.cxx 2011-08-02 16:56:21 UTC (rev
8904)
+++ branches/branch-3.0/fluid/file_make.cxx 2011-08-02 18:04:56 UTC (rev
8905)
@@ -38,7 +38,7 @@
// ------------ file conversion
------------------------------------------------
-extern char *filename;
+extern const char *filename;
int write_fltk_makefiles() {
// for now, we use a template file in FLTK/ide/templates/Makefile.tmpl .
Modified: branches/branch-3.0/fluid/file_visualc.cxx
===================================================================
--- branches/branch-3.0/fluid/file_visualc.cxx 2011-08-02 16:56:21 UTC (rev
8904)
+++ branches/branch-3.0/fluid/file_visualc.cxx 2011-08-02 18:04:56 UTC (rev
8905)
@@ -37,7 +37,7 @@
#include "../fltk3/filename.h"
-extern char *filename;
+extern const char *filename;
// ------------ file conversion
------------------------------------------------
Modified: branches/branch-3.0/fluid/file_xcode.cxx
===================================================================
--- branches/branch-3.0/fluid/file_xcode.cxx 2011-08-02 16:56:21 UTC (rev
8904)
+++ branches/branch-3.0/fluid/file_xcode.cxx 2011-08-02 18:04:56 UTC (rev
8905)
@@ -65,7 +65,7 @@
// ------------ file conversion
------------------------------------------------
-extern char *filename;
+extern const char *filename;
static const char *xcode4_type(unsigned int ft) {
Modified: branches/branch-3.0/fluid/workspace_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.cxx 2011-08-02 16:56:21 UTC
(rev 8904)
+++ branches/branch-3.0/fluid/workspace_panel.cxx 2011-08-02 18:04:56 UTC
(rev 8905)
@@ -226,7 +226,7 @@
workspace_panel->show();
return workspace_panel;
}
-extern fltk3::Window *the_file_panel;
+extern Fl_Panel *the_file_panel;
void file_panel_set_cb(fltk3::Widget*, void *v) {
if (v == Fl_Panel::LOAD) {
@@ -249,11 +249,11 @@
if (Fl_Panel::numselected != 1) {
o->static_value("<Multiple Values>");
o->deactivate();
- snprintf(buf, sizeof(buf), "File Properties (%d files)",
Fl_Panel::numselected);
+ sprintf(buf, "File Properties (%d files)", Fl_Panel::numselected);
} else {
o->static_value(Fl_Panel::current_file()->filename());
o->activate();
- snprintf(buf, sizeof(buf), "%s Properties",
Fl_Panel::current_file()->name());
+ sprintf(buf, "%s Properties", Fl_Panel::current_file()->name());
}
the_file_panel->label(buf);
} else {
Modified: branches/branch-3.0/ide/VisualC2010/fltk.lib.vcxproj.filters
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk.lib.vcxproj.filters
2011-08-02 16:56:21 UTC (rev 8904)
+++ branches/branch-3.0/ide/VisualC2010/fltk.lib.vcxproj.filters
2011-08-02 18:04:56 UTC (rev 8905)
@@ -1,15 +1,163 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup>
- <Filter Include="Headers">
-
<UniqueIdentifier>{5034cc57-c7ba-44dc-856a-937165898868}</UniqueIdentifier>
- <Extensions>*.h*</Extensions>
- </Filter>
+ <ClCompile Include="..\..\src\Fl.cxx" />
+ <ClCompile Include="..\..\src\Fl_Adjuster.cxx" />
+ <ClCompile Include="..\..\src\Fl_Bitmap.cxx" />
+ <ClCompile Include="..\..\src\Fl_Box.cxx" />
+ <ClCompile Include="..\..\src\Fl_Browser.cxx" />
+ <ClCompile Include="..\..\src\Fl_Browser_.cxx" />
+ <ClCompile Include="..\..\src\Fl_Browser_load.cxx" />
+ <ClCompile Include="..\..\src\Fl_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Chart.cxx" />
+ <ClCompile Include="..\..\src\Fl_Check_Browser.cxx" />
+ <ClCompile Include="..\..\src\Fl_Check_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Choice.cxx" />
+ <ClCompile Include="..\..\src\Fl_Clock.cxx" />
+ <ClCompile Include="..\..\src\Fl_Color_Chooser.cxx" />
+ <ClCompile Include="..\..\src\Fl_Counter.cxx" />
+ <ClCompile Include="..\..\src\Fl_Device.cxx" />
+ <ClCompile Include="..\..\src\Fl_Dial.cxx" />
+ <ClCompile Include="..\..\src\Fl_Double_Window.cxx" />
+ <ClCompile Include="..\..\src\Fl_File_Browser.cxx" />
+ <ClCompile Include="..\..\src\Fl_File_Chooser.cxx" />
+ <ClCompile Include="..\..\src\Fl_File_Chooser2.cxx" />
+ <ClCompile Include="..\..\src\Fl_File_Icon.cxx" />
+ <ClCompile Include="..\..\src\Fl_File_Input.cxx" />
+ <ClCompile Include="..\..\src\Fl_Group.cxx" />
+ <ClCompile Include="..\..\src\Fl_Help_View.cxx" />
+ <ClCompile Include="..\..\src\Fl_Image.cxx" />
+ <ClCompile Include="..\..\src\Fl_Input.cxx" />
+ <ClCompile Include="..\..\src\Fl_Input_.cxx" />
+ <ClCompile Include="..\..\src\Fl_Light_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu_.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu_Bar.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu_Window.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu_add.cxx" />
+ <ClCompile Include="..\..\src\Fl_Menu_global.cxx" />
+ <ClCompile Include="..\..\src\Fl_Multi_Label.cxx" />
+ <ClCompile Include="..\..\src\Fl_Native_File_Chooser.cxx" />
+ <ClCompile Include="..\..\src\Fl_Overlay_Window.cxx" />
+ <ClCompile Include="..\..\src\Fl_Pack.cxx" />
+ <ClCompile Include="..\..\src\Fl_Paged_Device.cxx" />
+ <ClCompile Include="..\..\src\Fl_Pixmap.cxx" />
+ <ClCompile Include="..\..\src\Fl_Positioner.cxx" />
+ <ClCompile Include="..\..\src\Fl_Printer.cxx" />
+ <ClCompile Include="..\..\src\Fl_Preferences.cxx" />
+ <ClCompile Include="..\..\src\Fl_Progress.cxx" />
+ <ClCompile Include="..\..\src\Fl_Repeat_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Return_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Roller.cxx" />
+ <ClCompile Include="..\..\src\Fl_Round_Button.cxx" />
+ <ClCompile Include="..\..\src\Fl_Scroll.cxx" />
+ <ClCompile Include="..\..\src\Fl_Scrollbar.cxx" />
+ <ClCompile Include="..\..\src\Fl_Shared_Image.cxx" />
+ <ClCompile Include="..\..\src\Fl_Single_Window.cxx" />
+ <ClCompile Include="..\..\src\Fl_Slider.cxx" />
+ <ClCompile Include="..\..\src\Fl_Sys_Menu_Bar.cxx" />
+ <ClCompile Include="..\..\src\Fl_Table.cxx" />
+ <ClCompile Include="..\..\src\Fl_Table_Row.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tabs.cxx" />
+ <ClCompile Include="..\..\src\Fl_Text_Buffer.cxx" />
+ <ClCompile Include="..\..\src\Fl_Text_Display.cxx" />
+ <ClCompile Include="..\..\src\Fl_Text_Editor.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tile.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tiled_Image.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tooltip.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tree.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tree_Item.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tree_Item_Array.cxx" />
+ <ClCompile Include="..\..\src\Fl_Tree_Prefs.cxx" />
+ <ClCompile Include="..\..\src\Fl_Valuator.cxx" />
+ <ClCompile Include="..\..\src\Fl_Value_Input.cxx" />
+ <ClCompile Include="..\..\src\Fl_Value_Output.cxx" />
+ <ClCompile Include="..\..\src\Fl_Value_Slider.cxx" />
+ <ClCompile Include="..\..\src\Fl_Widget.cxx" />
+ <ClCompile Include="..\..\src\Fl_Window.cxx" />
+ <ClCompile Include="..\..\src\Fl_Window_fullscreen.cxx" />
+ <ClCompile Include="..\..\src\Fl_Window_hotspot.cxx" />
+ <ClCompile Include="..\..\src\Fl_Window_iconize.cxx" />
+ <ClCompile Include="..\..\src\Fl_Wizard.cxx" />
+ <ClCompile Include="..\..\src\Fl_XBM_Image.cxx" />
+ <ClCompile Include="..\..\src\Fl_XPM_Image.cxx" />
+ <ClCompile Include="..\..\src\Fl_abort.cxx" />
+ <ClCompile Include="..\..\src\Fl_add_idle.cxx" />
+ <ClCompile Include="..\..\src\Fl_arg.cxx" />
+ <ClCompile Include="..\..\src\Fl_compose.cxx" />
+ <ClCompile Include="..\..\src\Fl_display.cxx" />
+ <ClCompile Include="..\..\src\Fl_get_key.cxx" />
+ <ClCompile Include="..\..\src\Fl_get_system_colors.cxx" />
+ <ClCompile Include="..\..\src\Fl_grab.cxx" />
+ <ClCompile Include="..\..\src\Fl_lock.cxx" />
+ <ClCompile Include="..\..\src\Fl_own_colormap.cxx" />
+ <ClCompile Include="..\..\src\Fl_visual.cxx" />
+ <ClCompile Include="..\..\src\Fl_x.cxx" />
+ <ClCompile Include="..\..\src\filename_absolute.cxx" />
+ <ClCompile Include="..\..\src\filename_expand.cxx" />
+ <ClCompile Include="..\..\src\filename_ext.cxx" />
+ <ClCompile Include="..\..\src\filename_isdir.cxx" />
+ <ClCompile Include="..\..\src\filename_list.cxx" />
+ <ClCompile Include="..\..\src\filename_match.cxx" />
+ <ClCompile Include="..\..\src\filename_setext.cxx" />
+ <ClCompile Include="..\..\src\fl_arc.cxx" />
+ <ClCompile Include="..\..\src\fl_arci.cxx" />
+ <ClCompile Include="..\..\src\fl_ask.cxx" />
+ <ClCompile Include="..\..\src\fl_boxtype.cxx" />
+ <ClCompile Include="..\..\src\fl_call_main.cxx" />
+ <ClCompile Include="..\..\src\fl_color.cxx" />
+ <ClCompile Include="..\..\src\fl_cursor.cxx" />
+ <ClCompile Include="..\..\src\fl_curve.cxx" />
+ <ClCompile Include="..\..\src\fl_diamond_box.cxx" />
+ <ClCompile Include="..\..\src\fl_dnd.cxx" />
+ <ClCompile Include="..\..\src\fl_draw.cxx" />
+ <ClCompile Include="..\..\src\fl_draw_image.cxx" />
+ <ClCompile Include="..\..\src\fl_draw_pixmap.cxx" />
+ <ClCompile Include="..\..\src\fl_encoding_latin1.cxx" />
+ <ClCompile Include="..\..\src\fl_encoding_mac_roman.cxx" />
+ <ClCompile Include="..\..\src\fl_engraved_label.cxx" />
+ <ClCompile Include="..\..\src\fl_file_dir.cxx" />
+ <ClCompile Include="..\..\src\fl_font.cxx" />
+ <ClCompile Include="..\..\src\fl_gtk.cxx" />
+ <ClCompile Include="..\..\src\fl_labeltype.cxx" />
+ <ClCompile Include="..\..\src\fl_line_style.cxx" />
+ <ClCompile Include="..\..\src\fl_open_uri.cxx" />
+ <ClCompile Include="..\..\src\fl_oval_box.cxx" />
+ <ClCompile Include="..\..\src\fl_overlay.cxx" />
+ <ClCompile Include="..\..\src\fl_overlay_visual.cxx" />
+ <ClCompile Include="..\..\src\fl_plastic.cxx" />
+ <ClCompile Include="..\..\src\fl_read_image.cxx" />
+ <ClCompile Include="..\..\src\fl_rect.cxx" />
+ <ClCompile Include="..\..\src\fl_round_box.cxx" />
+ <ClCompile Include="..\..\src\fl_rounded_box.cxx" />
+ <ClCompile Include="..\..\src\fl_scroll_area.cxx" />
+ <ClCompile Include="..\..\src\fl_set_font.cxx" />
+ <ClCompile Include="..\..\src\fl_set_fonts.cxx" />
+ <ClCompile Include="..\..\src\fl_shadow_box.cxx" />
+ <ClCompile Include="..\..\src\fl_shortcut.cxx" />
+ <ClCompile Include="..\..\src\fl_show_colormap.cxx" />
+ <ClCompile Include="..\..\src\fl_symbols.cxx" />
+ <ClCompile Include="..\..\src\fl_utf8.cxx" />
+ <ClCompile Include="..\..\src\fl_utf.cxx" />
+ <ClCompile Include="..\..\src\fl_vertex.cxx" />
+ <ClCompile Include="..\..\src\numericsort.cxx" />
+ <ClCompile Include="..\..\src\ps_image.cxx" />
+ <ClCompile Include="..\..\src\scandir.cxx" />
+ <ClCompile Include="..\..\src\screen_xywh.cxx" />
+ <ClCompile Include="..\..\src\flstring.c" />
+ <ClCompile Include="..\..\src\vsnprintf.c" />
+ <ClCompile Include="..\..\src\xutf8\case.c" />
+ <ClCompile Include="..\..\src\xutf8\is_right2left.c" />
+ <ClCompile Include="..\..\src\xutf8\is_spacing.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\fltk3\Adjuster.h">
<Filter>Headers</Filter>
</ClInclude>
+ <ClInclude Include="..\..\fltk3\CairoWindow.h">
+ <Filter>Headers</Filter>
+ </ClInclude>
<ClInclude Include="..\..\fltk3\ask.h">
<Filter>Headers</Filter>
</ClInclude>
@@ -22,10 +170,10 @@
<ClInclude Include="..\..\fltk3\Box.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Browser_.h">
+ <ClInclude Include="..\..\fltk3\Browser.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Browser.h">
+ <ClInclude Include="..\..\fltk3\Browser_.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\fltk3\Button.h">
@@ -34,10 +182,10 @@
<ClInclude Include="..\..\fltk3\Cairo.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\CairoWindow.h">
+ <ClInclude Include="..\..\fltk3\Chart.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Chart.h">
+ <ClInclude Include="..\..\fltk3\filename.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\fltk3\CheckBrowser.h">
@@ -91,9 +239,6 @@
<ClInclude Include="..\..\fltk3\FileInput.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\filename.h">
- <Filter>Headers</Filter>
- </ClInclude>
<ClInclude Include="..\..\fltk3\FillDial.h">
<Filter>Headers</Filter>
</ClInclude>
@@ -163,10 +308,10 @@
<ClInclude Include="..\..\fltk3\Image.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Input_.h">
+ <ClInclude Include="..\..\fltk3\Input.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Input.h">
+ <ClInclude Include="..\..\fltk3\Input_.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\fltk3\InputChoice.h">
@@ -178,6 +323,9 @@
<ClInclude Include="..\..\fltk3\JPEGImage.h">
<Filter>Headers</Filter>
</ClInclude>
+ <ClInclude Include="..\..\fltk3\NiceSlider.h">
+ <Filter>Headers</Filter>
+ </ClInclude>
<ClInclude Include="..\..\fltk3\LightButton.h">
<Filter>Headers</Filter>
</ClInclude>
@@ -187,10 +335,10 @@
<ClInclude Include="..\..\fltk3\math.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Menu_.h">
+ <ClInclude Include="..\..\fltk3\Menu.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Menu.h">
+ <ClInclude Include="..\..\fltk3\Menu_.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\fltk3\MenuBar.h">
@@ -226,10 +374,10 @@
<ClInclude Include="..\..\fltk3\NativeFileChooser.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\NiceSlider.h">
+ <ClInclude Include="..\..\fltk3\Object.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Object.h">
+ <ClInclude Include="..\..\fltk3\Xutf8.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\fltk3\osx.h">
@@ -436,158 +584,10 @@
<ClInclude Include="..\..\fltk3\XPMImage.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\..\fltk3\Xutf8.h">
- <Filter>Headers</Filter>
- </ClInclude>
+ </ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\src\Fl.cxx" />
- <ClInclude Include="..\..\src\Fl_Adjuster.cxx" />
- <ClInclude Include="..\..\src\Fl_Bitmap.cxx" />
- <ClInclude Include="..\..\src\Fl_Box.cxx" />
- <ClInclude Include="..\..\src\Fl_Browser.cxx" />
- <ClInclude Include="..\..\src\Fl_Browser_.cxx" />
- <ClInclude Include="..\..\src\Fl_Browser_load.cxx" />
- <ClInclude Include="..\..\src\Fl_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Chart.cxx" />
- <ClInclude Include="..\..\src\Fl_Check_Browser.cxx" />
- <ClInclude Include="..\..\src\Fl_Check_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Choice.cxx" />
- <ClInclude Include="..\..\src\Fl_Clock.cxx" />
- <ClInclude Include="..\..\src\Fl_Color_Chooser.cxx" />
- <ClInclude Include="..\..\src\Fl_Counter.cxx" />
- <ClInclude Include="..\..\src\Fl_Device.cxx" />
- <ClInclude Include="..\..\src\Fl_Dial.cxx" />
- <ClInclude Include="..\..\src\Fl_Double_Window.cxx" />
- <ClInclude Include="..\..\src\Fl_File_Browser.cxx" />
- <ClInclude Include="..\..\src\Fl_File_Chooser.cxx" />
- <ClInclude Include="..\..\src\Fl_File_Chooser2.cxx" />
- <ClInclude Include="..\..\src\Fl_File_Icon.cxx" />
- <ClInclude Include="..\..\src\Fl_File_Input.cxx" />
- <ClInclude Include="..\..\src\Fl_Group.cxx" />
- <ClInclude Include="..\..\src\Fl_Help_View.cxx" />
- <ClInclude Include="..\..\src\Fl_Image.cxx" />
- <ClInclude Include="..\..\src\Fl_Input.cxx" />
- <ClInclude Include="..\..\src\Fl_Input_.cxx" />
- <ClInclude Include="..\..\src\Fl_Light_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu_.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu_Bar.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu_Window.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu_add.cxx" />
- <ClInclude Include="..\..\src\Fl_Menu_global.cxx" />
- <ClInclude Include="..\..\src\Fl_Multi_Label.cxx" />
- <ClInclude Include="..\..\src\Fl_Native_File_Chooser.cxx" />
- <ClInclude Include="..\..\src\Fl_Overlay_Window.cxx" />
- <ClInclude Include="..\..\src\Fl_Pack.cxx" />
- <ClInclude Include="..\..\src\Fl_Paged_Device.cxx" />
- <ClInclude Include="..\..\src\Fl_Pixmap.cxx" />
- <ClInclude Include="..\..\src\Fl_Positioner.cxx" />
- <ClInclude Include="..\..\src\Fl_Printer.cxx" />
- <ClInclude Include="..\..\src\Fl_Preferences.cxx" />
- <ClInclude Include="..\..\src\Fl_Progress.cxx" />
- <ClInclude Include="..\..\src\Fl_Repeat_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Return_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Roller.cxx" />
- <ClInclude Include="..\..\src\Fl_Round_Button.cxx" />
- <ClInclude Include="..\..\src\Fl_Scroll.cxx" />
- <ClInclude Include="..\..\src\Fl_Scrollbar.cxx" />
- <ClInclude Include="..\..\src\Fl_Shared_Image.cxx" />
- <ClInclude Include="..\..\src\Fl_Single_Window.cxx" />
- <ClInclude Include="..\..\src\Fl_Slider.cxx" />
- <ClInclude Include="..\..\src\Fl_Sys_Menu_Bar.cxx" />
- <ClInclude Include="..\..\src\Fl_Table.cxx" />
- <ClInclude Include="..\..\src\Fl_Table_Row.cxx" />
- <ClInclude Include="..\..\src\Fl_Tabs.cxx" />
- <ClInclude Include="..\..\src\Fl_Text_Buffer.cxx" />
- <ClInclude Include="..\..\src\Fl_Text_Display.cxx" />
- <ClInclude Include="..\..\src\Fl_Text_Editor.cxx" />
- <ClInclude Include="..\..\src\Fl_Tile.cxx" />
- <ClInclude Include="..\..\src\Fl_Tiled_Image.cxx" />
- <ClInclude Include="..\..\src\Fl_Tooltip.cxx" />
- <ClInclude Include="..\..\src\Fl_Tree.cxx" />
- <ClInclude Include="..\..\src\Fl_Tree_Item.cxx" />
- <ClInclude Include="..\..\src\Fl_Tree_Item_Array.cxx" />
- <ClInclude Include="..\..\src\Fl_Tree_Prefs.cxx" />
- <ClInclude Include="..\..\src\Fl_Valuator.cxx" />
- <ClInclude Include="..\..\src\Fl_Value_Input.cxx" />
- <ClInclude Include="..\..\src\Fl_Value_Output.cxx" />
- <ClInclude Include="..\..\src\Fl_Value_Slider.cxx" />
- <ClInclude Include="..\..\src\Fl_Widget.cxx" />
- <ClInclude Include="..\..\src\Fl_Window.cxx" />
- <ClInclude Include="..\..\src\Fl_Window_fullscreen.cxx" />
- <ClInclude Include="..\..\src\Fl_Window_hotspot.cxx" />
- <ClInclude Include="..\..\src\Fl_Window_iconize.cxx" />
- <ClInclude Include="..\..\src\Fl_Wizard.cxx" />
- <ClInclude Include="..\..\src\Fl_XBM_Image.cxx" />
- <ClInclude Include="..\..\src\Fl_XPM_Image.cxx" />
- <ClInclude Include="..\..\src\Fl_abort.cxx" />
- <ClInclude Include="..\..\src\Fl_add_idle.cxx" />
- <ClInclude Include="..\..\src\Fl_arg.cxx" />
- <ClInclude Include="..\..\src\Fl_compose.cxx" />
- <ClInclude Include="..\..\src\Fl_display.cxx" />
- <ClInclude Include="..\..\src\Fl_get_key.cxx" />
- <ClInclude Include="..\..\src\Fl_get_system_colors.cxx" />
- <ClInclude Include="..\..\src\Fl_grab.cxx" />
- <ClInclude Include="..\..\src\Fl_lock.cxx" />
- <ClInclude Include="..\..\src\Fl_own_colormap.cxx" />
- <ClInclude Include="..\..\src\Fl_visual.cxx" />
- <ClInclude Include="..\..\src\Fl_x.cxx" />
- <ClInclude Include="..\..\src\filename_absolute.cxx" />
- <ClInclude Include="..\..\src\filename_expand.cxx" />
- <ClInclude Include="..\..\src\filename_ext.cxx" />
- <ClInclude Include="..\..\src\filename_isdir.cxx" />
- <ClInclude Include="..\..\src\filename_list.cxx" />
- <ClInclude Include="..\..\src\filename_match.cxx" />
- <ClInclude Include="..\..\src\filename_setext.cxx" />
- <ClInclude Include="..\..\src\fl_arc.cxx" />
- <ClInclude Include="..\..\src\fl_arci.cxx" />
- <ClInclude Include="..\..\src\fl_ask.cxx" />
- <ClInclude Include="..\..\src\fl_boxtype.cxx" />
- <ClInclude Include="..\..\src\fl_call_main.cxx" />
- <ClInclude Include="..\..\src\fl_color.cxx" />
- <ClInclude Include="..\..\src\fl_cursor.cxx" />
- <ClInclude Include="..\..\src\fl_curve.cxx" />
- <ClInclude Include="..\..\src\fl_diamond_box.cxx" />
- <ClInclude Include="..\..\src\fl_dnd.cxx" />
- <ClInclude Include="..\..\src\fl_draw.cxx" />
- <ClInclude Include="..\..\src\fl_draw_image.cxx" />
- <ClInclude Include="..\..\src\fl_draw_pixmap.cxx" />
- <ClInclude Include="..\..\src\fl_encoding_latin1.cxx" />
- <ClInclude Include="..\..\src\fl_encoding_mac_roman.cxx" />
- <ClInclude Include="..\..\src\fl_engraved_label.cxx" />
- <ClInclude Include="..\..\src\fl_file_dir.cxx" />
- <ClInclude Include="..\..\src\fl_font.cxx" />
- <ClInclude Include="..\..\src\fl_gtk.cxx" />
- <ClInclude Include="..\..\src\fl_labeltype.cxx" />
- <ClInclude Include="..\..\src\fl_line_style.cxx" />
- <ClInclude Include="..\..\src\fl_open_uri.cxx" />
- <ClInclude Include="..\..\src\fl_oval_box.cxx" />
- <ClInclude Include="..\..\src\fl_overlay.cxx" />
- <ClInclude Include="..\..\src\fl_overlay_visual.cxx" />
- <ClInclude Include="..\..\src\fl_plastic.cxx" />
- <ClInclude Include="..\..\src\fl_read_image.cxx" />
- <ClInclude Include="..\..\src\fl_rect.cxx" />
- <ClInclude Include="..\..\src\fl_round_box.cxx" />
- <ClInclude Include="..\..\src\fl_rounded_box.cxx" />
- <ClInclude Include="..\..\src\fl_scroll_area.cxx" />
- <ClInclude Include="..\..\src\fl_set_font.cxx" />
- <ClInclude Include="..\..\src\fl_set_fonts.cxx" />
- <ClInclude Include="..\..\src\fl_shadow_box.cxx" />
- <ClInclude Include="..\..\src\fl_shortcut.cxx" />
- <ClInclude Include="..\..\src\fl_show_colormap.cxx" />
- <ClInclude Include="..\..\src\fl_symbols.cxx" />
- <ClInclude Include="..\..\src\fl_utf8.cxx" />
- <ClInclude Include="..\..\src\fl_utf.cxx" />
- <ClInclude Include="..\..\src\fl_vertex.cxx" />
- <ClInclude Include="..\..\src\numericsort.cxx" />
- <ClInclude Include="..\..\src\ps_image.cxx" />
- <ClInclude Include="..\..\src\scandir.cxx" />
- <ClInclude Include="..\..\src\screen_xywh.cxx" />
- <ClInclude Include="..\..\src\flstring.c" />
- <ClInclude Include="..\..\src\vsnprintf.c" />
- <ClInclude Include="..\..\src\xutf8\case.c" />
- <ClInclude Include="..\..\src\xutf8\is_right2left.c" />
- <ClInclude Include="..\..\src\xutf8\is_spacing.c" />
+ <Filter Include="Headers">
+
<UniqueIdentifier>{bc7a2717-54e2-4753-97c2-ef4b9d6493c1}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: branches/branch-3.0/src/Fl_Input.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Input.cxx 2011-08-02 16:56:21 UTC (rev
8904)
+++ branches/branch-3.0/src/Fl_Input.cxx 2011-08-02 18:04:56 UTC (rev
8905)
@@ -787,34 +787,34 @@
*/
#if defined(FL_DLL)
-Fl_Float_Input::Fl_Float_Input(int X,int Y,int W,int H,const char *l)
-: Fl_Input(X,Y,W,H,l) {
- type(FL_FLOAT_INPUT);
+fltk3::FloatInput::FloatInput(int X,int Y,int W,int H,const char *l)
+: fltk3::Input(X,Y,W,H,l) {
+ type(fltk3::FLOAT_INPUT);
}
-Fl_Int_Input::Fl_Int_Input(int X,int Y,int W,int H,const char *l)
-: Fl_Input(X,Y,W,H,l) {
- type(FL_INT_INPUT);
+fltk3::IntInput::IntInput(int X,int Y,int W,int H,const char *l)
+: fltk3::Input(X,Y,W,H,l) {
+ type(fltk3::INT_INPUT);
}
-Fl_Multiline_Input::Fl_Multiline_Input(int X,int Y,int W,int H,const char *l)
-: Fl_Input(X,Y,W,H,l) {
- type(FL_MULTILINE_INPUT);
+fltk3::MultilineInput::MultilineInput(int X,int Y,int W,int H,const char *l)
+: fltk3::Input(X,Y,W,H,l) {
+ type(fltk3::MULTILINE_INPUT);
}
-Fl_Output::Fl_Output(int X,int Y,int W,int H, const char *l)
-: Fl_Input(X, Y, W, H, l) {
- type(FL_NORMAL_OUTPUT);
+fltk3::Output::Output(int X,int Y,int W,int H, const char *l)
+: fltk3::Input(X, Y, W, H, l) {
+ type(fltk3::NORMAL_OUTPUT);
}
-Fl_Multiline_Output::Fl_Multiline_Output(int X,int Y,int W,int H,const char *l)
-: Fl_Output(X,Y,W,H,l) {
- type(FL_MULTILINE_OUTPUT);
+fltk3::MultilineOutput::MultilineOutput(int X,int Y,int W,int H,const char *l)
+: fltk3::Output(X,Y,W,H,l) {
+ type(fltk3::MULTILINE_OUTPUT);
}
-Fl_Secret_Input::Fl_Secret_Input(int X,int Y,int W,int H,const char *l)
-: Fl_Input(X,Y,W,H,l) {
- type(FL_SECRET_INPUT);
+fltk3::SecretInput::SecretInput(int X,int Y,int W,int H,const char *l)
+: fltk3::Input(X,Y,W,H,l) {
+ type(fltk3::SECRET_INPUT);
}
#endif // FL_DLL
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
