| |
Author: matt
Date: 2011-09-18 13:11:00 -0700 (Sun, 18 Sep 2011)
New Revision: 9048
Log:
FLTK3: moved all widget compatibility wrappers to the new scheme.
Added:
branches/branch-3.0/src/fltk3/WizardGroup.cxx
Removed:
branches/branch-3.0/src/fltk3/Wizard.cxx
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
branches/branch-3.0/ide/VisualC6/fltk3.dsp
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/include/FL/Fl_Help_View.H
branches/branch-3.0/include/FL/Fl_Hold_Browser.H
branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H
branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H
branches/branch-3.0/include/FL/Fl_Hor_Slider.H
branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H
branches/branch-3.0/include/FL/Fl_Input.H
branches/branch-3.0/include/FL/Fl_Input_.H
branches/branch-3.0/include/FL/Fl_Input_Choice.H
branches/branch-3.0/include/FL/Fl_Int_Input.H
branches/branch-3.0/include/FL/Fl_Light_Button.H
branches/branch-3.0/include/FL/Fl_Line_Dial.H
branches/branch-3.0/include/FL/Fl_Menu_.H
branches/branch-3.0/include/FL/Fl_Menu_Bar.H
branches/branch-3.0/include/FL/Fl_Menu_Button.H
branches/branch-3.0/include/FL/Fl_Menu_Window.H
branches/branch-3.0/include/FL/Fl_Multi_Browser.H
branches/branch-3.0/include/FL/Fl_Multiline_Input.H
branches/branch-3.0/include/FL/Fl_Multiline_Output.H
branches/branch-3.0/include/FL/Fl_Nice_Slider.H
branches/branch-3.0/include/FL/Fl_Output.H
branches/branch-3.0/include/FL/Fl_Pack.H
branches/branch-3.0/include/FL/Fl_Positioner.H
branches/branch-3.0/include/FL/Fl_Progress.H
branches/branch-3.0/include/FL/Fl_Radio_Button.H
branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H
branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H
branches/branch-3.0/include/FL/Fl_Repeat_Button.H
branches/branch-3.0/include/FL/Fl_Return_Button.H
branches/branch-3.0/include/FL/Fl_Roller.H
branches/branch-3.0/include/FL/Fl_Round_Button.H
branches/branch-3.0/include/FL/Fl_Round_Clock.H
branches/branch-3.0/include/FL/Fl_Scroll.H
branches/branch-3.0/include/FL/Fl_Scrollbar.H
branches/branch-3.0/include/FL/Fl_Secret_Input.H
branches/branch-3.0/include/FL/Fl_Select_Browser.H
branches/branch-3.0/include/FL/Fl_Simple_Counter.H
branches/branch-3.0/include/FL/Fl_Single_Window.H
branches/branch-3.0/include/FL/Fl_Slider.H
branches/branch-3.0/include/FL/Fl_Spinner.H
branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H
branches/branch-3.0/include/FL/Fl_Table.H
branches/branch-3.0/include/FL/Fl_Table_Row.H
branches/branch-3.0/include/FL/Fl_Tabs.H
branches/branch-3.0/include/FL/Fl_Text_Display.H
branches/branch-3.0/include/FL/Fl_Text_Editor.H
branches/branch-3.0/include/FL/Fl_Tile.H
branches/branch-3.0/include/FL/Fl_Timer.H
branches/branch-3.0/include/FL/Fl_Toggle_Button.H
branches/branch-3.0/include/FL/Fl_Tree.H
branches/branch-3.0/include/FL/Fl_Valuator.H
branches/branch-3.0/include/FL/Fl_Value_Input.H
branches/branch-3.0/include/FL/Fl_Value_Output.H
branches/branch-3.0/include/FL/Fl_Value_Slider.H
branches/branch-3.0/include/FL/Fl_Widget.H
branches/branch-3.0/include/FL/Fl_Window.H
branches/branch-3.0/include/FL/Fl_Wizard.H
branches/branch-3.0/include/FL/glut.H
branches/branch-3.0/include/fltk3/HelpView.h
branches/branch-3.0/include/fltk3/HoldBrowser.h
branches/branch-3.0/include/fltk3/Input_.h
branches/branch-3.0/include/fltk3/LightButton.h
branches/branch-3.0/include/fltk3/MenuBar.h
branches/branch-3.0/include/fltk3/MenuButton.h
branches/branch-3.0/include/fltk3/MultiBrowser.h
branches/branch-3.0/include/fltk3/MultilineInput.h
branches/branch-3.0/include/fltk3/MultilineOutput.h
branches/branch-3.0/include/fltk3/PackedGroup.h
branches/branch-3.0/include/fltk3/Positioner.h
branches/branch-3.0/include/fltk3/Progress.h
branches/branch-3.0/include/fltk3/ReturnButton.h
branches/branch-3.0/include/fltk3/Roller.h
branches/branch-3.0/include/fltk3/ScrollGroup.h
branches/branch-3.0/include/fltk3/Slider.h
branches/branch-3.0/include/fltk3/Spinner.h
branches/branch-3.0/include/fltk3/TabGroup.h
branches/branch-3.0/include/fltk3/TextDisplay.h
branches/branch-3.0/include/fltk3/TextEditor.h
branches/branch-3.0/include/fltk3/TiledGroup.h
branches/branch-3.0/include/fltk3/ToggleButton.h
branches/branch-3.0/include/fltk3/Tree.h
branches/branch-3.0/include/fltk3/Valuator.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/Window.h
branches/branch-3.0/include/fltk3/WizardGroup.h
branches/branch-3.0/include/fltk3gl/glut.h
branches/branch-3.0/src/Makefile
branches/branch-3.0/src/fltk3/HelpView.cxx
branches/branch-3.0/src/fltk3/Input.cxx
branches/branch-3.0/src/fltk3/LightButton.cxx
branches/branch-3.0/src/fltk3/MenuBar.cxx
branches/branch-3.0/src/fltk3/MenuButton.cxx
branches/branch-3.0/src/fltk3/PackedGroup.cxx
branches/branch-3.0/src/fltk3/Positioner.cxx
branches/branch-3.0/src/fltk3/Progress.cxx
branches/branch-3.0/src/fltk3/RepeatButton.cxx
branches/branch-3.0/src/fltk3/ReturnButton.cxx
branches/branch-3.0/src/fltk3/Roller.cxx
branches/branch-3.0/src/fltk3/ScrollGroup.cxx
branches/branch-3.0/src/fltk3/Scrollbar.cxx
branches/branch-3.0/src/fltk3/Slider.cxx
branches/branch-3.0/src/fltk3/TabGroup.cxx
branches/branch-3.0/src/fltk3/Table.cxx
branches/branch-3.0/src/fltk3/TableRow.cxx
branches/branch-3.0/src/fltk3/TextDisplay.cxx
branches/branch-3.0/src/fltk3/TextEditor.cxx
branches/branch-3.0/src/fltk3/TiledGroup.cxx
branches/branch-3.0/src/fltk3/Tree.cxx
branches/branch-3.0/src/fltk3/ValueInput.cxx
branches/branch-3.0/src/fltk3/ValueOutput.cxx
branches/branch-3.0/src/fltk3/ValueSlider.cxx
branches/branch-3.0/src/fltk3/Window.cxx
branches/branch-3.0/src/fltk3/run.cxx
branches/branch-3.0/src/fltk3/show_colormap.cxx
branches/branch-3.0/src/fltk3gl/glut_compatability.cxx
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/fltk.flw 2011-09-18 20:11:00 UTC (rev 9048)
@@ -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}
@@ -1409,7 +1409,7 @@
filename_and_path {include/fltk3/XPMImage.h}
}
}
- folder Sources {
+ folder Sources {open
uuid_Xcode4_Group {91990322-0AF9-42F2-A077-713540EE5AB1}
} {
file_ref {cocoa.mm} {
@@ -1910,11 +1910,11 @@
uuid_Xcode4_BuildFileInSources {E373B7F4-2FFB-4CEE-9357-7586F6D255E9}
filename_and_path {src/fltk3/Window_iconize.cxx}
}
- file_ref {Wizard.cxx} {
+ file_ref {WizardGroup.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/fltk3/Wizard.cxx}
+ filename_and_path {src/fltk3/WizardGroup.cxx}
}
file_ref {XBMImage.cxx} {
uuid_Xcode4_BuildFile {0331C1F4-F50E-40CE-A3DF-DBCE1026AEE5}
@@ -7044,7 +7044,7 @@
file_ref {function_panel.cxx} {
filename_and_path {fluid1/function_panel.cxx}
}
- file_ref {print_panel.cxx} {selected
+ file_ref {print_panel.cxx} {
build_env 0
filename_and_path {fluid1/print_panel.cxx}
}
Modified: branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3.vcproj 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/ide/VisualC2008/fltk3.vcproj 2011-09-18 20:11:00 UTC (rev 9048)
@@ -1978,7 +1978,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fltk3\Wizard.cxx"
+ RelativePath="..\..\src\fltk3\WizardGroup.cxx"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj 2011-09-18 20:11:00 UTC (rev 9048)
@@ -646,7 +646,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fltk3\Wizard.cxx">
+ <ClCompile Include="..\..\src\fltk3\WizardGroup.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>
Modified: branches/branch-3.0/ide/VisualC6/fltk3.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3.dsp 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/ide/VisualC6/fltk3.dsp 2011-09-18 20:11:00 UTC (rev 9048)
@@ -399,7 +399,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\src\fltk3\Wizard.cxx
+SOURCE=..\..\src\fltk3\WizardGroup.cxx
# End Source File
# Begin Source File
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj 2011-09-18 20:11:00 UTC (rev 9048)
@@ -126,7 +126,7 @@
C62F4F9E13B7E78D46033106 /* Window_fullscreen.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7679F6CC5391C705D9B921DA /* Window_fullscreen.cxx */; };
A76E032AD9B13380163BB493 /* Window_hotspot.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B5E58AC3929D3ADCBE238301 /* Window_hotspot.cxx */; };
E373B7F46315E6D1F6D255E9 /* Window_iconize.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C34CF806FAE9E39DDFD23D3B /* Window_iconize.cxx */; };
- 72DEB4A9569C0F11C103EF90 /* Wizard.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A84F18440208B2AA809D2871 /* Wizard.cxx */; };
+ 72DEB4A9569C0F11C103EF90 /* WizardGroup.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A84F18440208B2AA809D2871 /* WizardGroup.cxx */; };
F4974EC29CF042D6AEB0CC0D /* XBMImage.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9A21D7EDE35664C4B0EDD969 /* XBMImage.cxx */; };
A7891F57744007954D70C5D4 /* XPMImage.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 302A3FA8AB59DE7E5255E28C /* XPMImage.cxx */; };
230F7BA09DDFC95489B89DFF /* abort.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 671B96BA5D85D5C6EE31AB76 /* abort.cxx */; };
@@ -781,38 +781,38 @@
F671D5D730460EFE9A3F9E32 /* valuators.fl in Sources */ = {isa = PBXBuildFile; fileRef = 8C3E04CD4812A22D33320C59 /* valuators.fl */; };
77A4274D64F74E06FAB74014 /* fltk3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */; };
9CA300448F4F92C123D68EE9 /* fltk3.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */; };
- 98FEA99FF5D417760C05B0AC /* about_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = ACD15C7E190BF0FDA03C174B /* about_panel.cxx */; };
- 9AACE33F046D7DFFAD12F289 /* align_widget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C8CEB73F9DFD897A27CE543C /* align_widget.cxx */; };
- 3BEBFD3CA30A0FBD54024733 /* alignment_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8ECFC2BBFAE5202B68FB537C /* alignment_panel.cxx */; };
- FB120483438F0030E673CCDD /* code.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38CE7EA3E78D254AD5BC8BE8 /* code.cxx */; };
- 2C5C05846D84B2B61448D6FC /* CodeEditor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8735E62CE2B77E37D6B4B270 /* CodeEditor.cxx */; };
- 87F59897DDE5A82A887DBD9F /* factory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 02922929B1A4738E06214A23 /* factory.cxx */; };
- FB3511138D51CD7ABBDC45BC /* file.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4CE776F4DA28D8B2FC3511D7 /* file.cxx */; };
- CC6ACE19414238882783B98E /* Fl_Function_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC912646F7E4FD6A9E3B0551 /* Fl_Function_Type.cxx */; };
- D5BF8F9771531AEBB51AFB08 /* Fl_Group_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 12CF60788D5D061D698AF983 /* Fl_Group_Type.cxx */; };
- 90A6580F5E546F4A86240B24 /* Fl_Menu_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F6030FA1B67E9CF6A95CCA63 /* Fl_Menu_Type.cxx */; };
- 941139DB8ED1F0882F1C1E3A /* Fl_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D5353FDF84406926BE510DF0 /* Fl_Type.cxx */; };
- D5D5232D75CA9B15D024E066 /* Fl_Widget_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 054C66854BBA7236992A4513 /* Fl_Widget_Type.cxx */; };
- 3C494A99A375BC093A0FC7FA /* Fl_Window_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6895E5F0B27851C8897001E0 /* Fl_Window_Type.cxx */; };
- B248C2FBD85135C32A56C6F6 /* Fluid_Image.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E001DE87F971F8210A3418DD /* Fluid_Image.cxx */; };
- 499AE4EDF0C6D87B8F95DAD5 /* fluid.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AE76F5A10A6B3E9AA6BEF6EC /* fluid.cxx */; };
- 220FB0CD2E0D573E602D7BCD /* function_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AC8B658782FE6E1208194982 /* function_panel.cxx */; };
- 52154211513B6338E22DC1EB /* template_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28DF9870F6B64173111A65EC /* template_panel.cxx */; };
- 9052CD0A4CEFCD66CD7C398A /* undo.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BCA66AFD55F24BBB5A2531A5 /* undo.cxx */; };
- 26D9C9FD5E5FB96DAB7EB27C /* widget_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6013E7F43A4EE8D511C23BDE /* widget_panel.cxx */; };
- B21B79532AE23ABA0FB90D27 /* about_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = A14D4AAC1806F71D66DE7FE2 /* about_panel.h */; };
- 27F693256B7E1EA7DCAAE53A /* alignment_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF92D80F77A243FD2B7C185 /* alignment_panel.h */; };
- 318F131DDC25C67AA240E9B9 /* CodeEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BD7E913943B023749BBF18 /* CodeEditor.h */; };
- 31A0FF6870359276AE4CE4EB /* comments.h in Headers */ = {isa = PBXBuildFile; fileRef = 97220675F7DB794F1B34AE89 /* comments.h */; };
- 77077BE19BF78EA2B482C660 /* Fl_Type.h in Headers */ = {isa = PBXBuildFile; fileRef = 68A116FE7263B5C0042DFA76 /* Fl_Type.h */; };
- B8112BC2A12F9CB49C7BD5C1 /* Fl_Widget_Type.h in Headers */ = {isa = PBXBuildFile; fileRef = 419968D8BC906476EBAF27C6 /* Fl_Widget_Type.h */; };
- B18B5D1DBF963EB79BE318BD /* Fluid_Image.h in Headers */ = {isa = PBXBuildFile; fileRef = 91244E359154AF471A939B36 /* Fluid_Image.h */; };
- EA094071AF3728616E7C48F3 /* function_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 31B425710FA67F1E409A0D6C /* function_panel.h */; };
- 37EDBB3CA07F345241FF3E34 /* print_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = C825B5ACCED7BBDEBA698E6C /* print_panel.h */; };
- 944CB3F0AE6C9CF299FC829B /* Shortcut_Button.h in Headers */ = {isa = PBXBuildFile; fileRef = EB83E82D5F3890E9B63894DB /* Shortcut_Button.h */; };
- FA87C5B46117EAB2A708D9F6 /* template_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = B0674CA75EFFA1F8A11C82A2 /* template_panel.h */; };
- 68CDF71178EDC881D9ACE8E9 /* undo.h in Headers */ = {isa = PBXBuildFile; fileRef = 229ACF1CF315FE3A2DC05A91 /* undo.h */; };
- 6D970CCA6A0800B0A5A9A39D /* widget_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 553C9CCA73F47236C6A651EE /* widget_panel.h */; };
+ 286E1BECA332E18FFB5E8D5A /* about_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 306CCE5AAF53FB9DE6D10DE7 /* about_panel.cxx */; };
+ 9D3D5714162C973B87D0869B /* align_widget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C5CB8576EC6F3A4AC76A2473 /* align_widget.cxx */; };
+ ADD6A2D4CB9ACCA2C246C168 /* alignment_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A9A7B2E62D2C441D1DBB7C6D /* alignment_panel.cxx */; };
+ 045289856CA56E8AF10AAE4E /* code.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C30CED2F533ED69580B02428 /* code.cxx */; };
+ 445FC3218A91EB6D0019408C /* CodeEditor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0B02D03D8A6ADF61E43DA9BA /* CodeEditor.cxx */; };
+ 3F826F26E0A8ADA2E0337AB9 /* factory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF0BE3D5CB73BB487AAFDC28 /* factory.cxx */; };
+ 796D9FBAC3FC7CDF524791BC /* file.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0938A9B51028FAB2E2CEB461 /* file.cxx */; };
+ A2C02CC7955344573D9A1BE7 /* Fl_Function_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2BEE2F213603496DFEA1F392 /* Fl_Function_Type.cxx */; };
+ A01BA10AB474EF6177B9C833 /* Fl_Group_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E9723D36940403F60F821DB8 /* Fl_Group_Type.cxx */; };
+ 3E26787BC7C636971F47DB60 /* Fl_Menu_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 58F42D857558B9395E8CA60A /* Fl_Menu_Type.cxx */; };
+ 40EBCD429B40E5CF74C1D8F0 /* Fl_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9CD4159F47065BB15CEDC4AC /* Fl_Type.cxx */; };
+ B4E8EE6D4842A2C991320A52 /* Fl_Widget_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0ECFA93DE93B2B36C18A8F11 /* Fl_Widget_Type.cxx */; };
+ 1E67B658780514E04B65E01F /* Fl_Window_Type.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 25DF3A0B599ACF39CE6B3D71 /* Fl_Window_Type.cxx */; };
+ 268F7ED7F499BCA9FAD1BD92 /* Fluid_Image.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 962D10722CB44E2F0FE9F587 /* Fluid_Image.cxx */; };
+ 90FBAAF4DC21EBD7CD3A9671 /* fluid.cxx in Sources */ = {isa = PBXBuildFile; fileRef = ECF6093D3231712B6A3E2832 /* fluid.cxx */; };
+ 1B6D836B56E0E57994D31417 /* function_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 521DDF390E6AB95575224FF2 /* function_panel.cxx */; };
+ 24335B202003A9F9472EBA8A /* template_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 823CB0A1F2F5C97F1C8139CA /* template_panel.cxx */; };
+ ADDF50A553020B87963DB494 /* undo.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 84D6B5EC20F2881DD3709722 /* undo.cxx */; };
+ F13AB62EBD91CAC5BA974D76 /* widget_panel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 005C9D0D9231A0E0DA45CF8E /* widget_panel.cxx */; };
+ 31D3E5BD6ED31B2197C5EAB8 /* about_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 64D3967E6440C1162BD848E6 /* about_panel.h */; };
+ 581B84047D193D36B33AF7A5 /* alignment_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 726936FD87574BA0474FA559 /* alignment_panel.h */; };
+ 89354521E8FD02B4F04535CD /* CodeEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 8831B5D01D4DE423E5A5562B /* CodeEditor.h */; };
+ 543479D3BBAE1FA752A1EB90 /* comments.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E28382F4C5D2EB106CBC770 /* comments.h */; };
+ 03C2B29773E8A51CB4FBC635 /* Fl_Type.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A80C271399CB94946AC232 /* Fl_Type.h */; };
+ A5870248E65A3B8B2C427D2B /* Fl_Widget_Type.h in Headers */ = {isa = PBXBuildFile; fileRef = 232B044C7042CFC77D3F49CA /* Fl_Widget_Type.h */; };
+ 2EA096DA17043398FE2789F0 /* Fluid_Image.h in Headers */ = {isa = PBXBuildFile; fileRef = BA4EE06777D3AC14443FE5C6 /* Fluid_Image.h */; };
+ E5FC65F11D58AD33AE698F31 /* function_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C2240C5E7C3DBD74C47F44 /* function_panel.h */; };
+ DE60464464EB71FCA9E18719 /* print_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A67600005A692AE1784E9FF /* print_panel.h */; };
+ 5A5959A514FC24762921704B /* Shortcut_Button.h in Headers */ = {isa = PBXBuildFile; fileRef = 20D15C212C7DD1674F4B2C59 /* Shortcut_Button.h */; };
+ 87112948F8C68CFCD34B3C7B /* template_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 19267BC894F0A636A7364186 /* template_panel.h */; };
+ EB05CEAFD9F83DBB2398B611 /* undo.h in Headers */ = {isa = PBXBuildFile; fileRef = 16E78020D9B74C2947213769 /* undo.h */; };
+ F0C55D77857E6802BBAC594A /* widget_panel.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FDFD955C81BF8BC37CB90F9 /* widget_panel.h */; };
47B0E1740C2F2BD4484F9D04 /* fltk3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */; };
89601FB26DBB4646423EF756 /* fltk3images.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7522F0908E6250B67C2110 /* fltk3images.framework */; };
46C7A5C09B944BAC21444E2C /* fltk3png.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06A7B68E2100DB960872987D /* fltk3png.framework */; };
@@ -823,7 +823,7 @@
9B9AA0A4AB4B9737FF17D323 /* fltk3png.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 06A7B68E2100DB960872987D /* fltk3png.framework */; };
850AB0916947A0A36E2D7216 /* fltk3jpeg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C03975F619684D3461888340 /* fltk3jpeg.framework */; };
4347543596E9D9210AE7AD95 /* fltk3zlib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AFDEBB8CE5A31C066586BF8B /* fltk3zlib.framework */; };
- 02BBDAFADA373D9076DB6E47 /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5E14846F0BA22D2B313756A3 /* hello.cxx */; };
+ 0BD4FB8DBDFE375AC93A7242 /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 67329B5738EFA0E9089F55CC /* hello.cxx */; };
752E08556331ABF38A21882C /* fltk3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */; };
FEABCB46F4DCC7B8B8188E69 /* fltk3.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 86C380FE76A739F296A44961 /* fltk3.framework */; };
/* End PBXBuildFile section */
@@ -1753,7 +1753,7 @@
);
script = "export DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} && ${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
};
- FD4ECA653484C2FBC1EA555F /* PBXBuildRule */ = {
+ 5448D2856BBC95A8FE0610CE /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.fl";
@@ -3965,7 +3965,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 61B6DC735A28DB6F9A42AF6F /* CopyFiles */ = {
+ 7A31AD2EE86FD99225F3440C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
@@ -4234,7 +4234,7 @@
7679F6CC5391C705D9B921DA /* Window_fullscreen.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Window_fullscreen.cxx; path = ../../src/fltk3/Window_fullscreen.cxx; sourceTree = SOURCE_ROOT; };
B5E58AC3929D3ADCBE238301 /* Window_hotspot.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Window_hotspot.cxx; path = ../../src/fltk3/Window_hotspot.cxx; sourceTree = SOURCE_ROOT; };
C34CF806FAE9E39DDFD23D3B /* Window_iconize.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Window_iconize.cxx; path = ../../src/fltk3/Window_iconize.cxx; sourceTree = SOURCE_ROOT; };
- A84F18440208B2AA809D2871 /* Wizard.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Wizard.cxx; path = ../../src/fltk3/Wizard.cxx; sourceTree = SOURCE_ROOT; };
+ A84F18440208B2AA809D2871 /* WizardGroup.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WizardGroup.cxx; path = ../../src/fltk3/WizardGroup.cxx; sourceTree = SOURCE_ROOT; };
9A21D7EDE35664C4B0EDD969 /* XBMImage.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XBMImage.cxx; path = ../../src/fltk3/XBMImage.cxx; sourceTree = SOURCE_ROOT; };
302A3FA8AB59DE7E5255E28C /* XPMImage.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XPMImage.cxx; path = ../../src/fltk3/XPMImage.cxx; sourceTree = SOURCE_ROOT; };
671B96BA5D85D5C6EE31AB76 /* abort.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = abort.cxx; path = ../../src/fltk3/abort.cxx; sourceTree = SOURCE_ROOT; };
@@ -4306,148 +4306,148 @@
15064F3F45361B071125C187 /* is_right2left.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_right2left.c; path = ../../src/fltk3/xutf8/is_right2left.c; sourceTree = SOURCE_ROOT; };
35196210FA39F50016C06ED2 /* is_spacing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_spacing.c; path = ../../src/fltk3/xutf8/is_spacing.c; sourceTree = SOURCE_ROOT; };
14F66311E977D66CE29024C3 /* Cocoa.framework */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
- 439DEA85B7E505E2CD1268CC /* dirent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dirent.h; path = ../../include/FL/dirent.h; sourceTree = SOURCE_ROOT; };
- B1A586E1B10239EF08BBA921 /* Enumerations.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Enumerations.H; path = ../../include/FL/Enumerations.H; sourceTree = SOURCE_ROOT; };
- 13B4A9244780367FF89EBBC5 /* filename.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = filename.H; path = ../../include/FL/filename.H; sourceTree = SOURCE_ROOT; };
- C4862E6F77CCD703A70AFB40 /* Fl_Adjuster.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Adjuster.H; path = ../../include/FL/Fl_Adjuster.H; sourceTree = SOURCE_ROOT; };
- F219E7FD19BC6594B2E92F9E /* fl_ask.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_ask.H; path = ../../include/FL/fl_ask.H; sourceTree = SOURCE_ROOT; };
- BDDDD3055259A999F5AA732D /* Fl_Bitmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Bitmap.H; path = ../../include/FL/Fl_Bitmap.H; sourceTree = SOURCE_ROOT; };
- 4E03DB7CCA01BF60AF20F0C1 /* Fl_BMP_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_BMP_Image.H; path = ../../include/FL/Fl_BMP_Image.H; sourceTree = SOURCE_ROOT; };
- 7EDDF78D57064DC3E9BBB984 /* Fl_Box.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Box.H; path = ../../include/FL/Fl_Box.H; sourceTree = SOURCE_ROOT; };
- 21F2CBBC8739C8E763BE5128 /* Fl_Browser_.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Browser_.H; path = ../../include/FL/Fl_Browser_.H; sourceTree = SOURCE_ROOT; };
- B037AB19553B4C3A1FB3781A /* Fl_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Browser.H; path = ../../include/FL/Fl_Browser.H; sourceTree = SOURCE_ROOT; };
- AFC0DED5D95426476D2B623C /* Fl_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Button.H; path = ../../include/FL/Fl_Button.H; sourceTree = SOURCE_ROOT; };
- 6DC17B501DA631C930C6AEC0 /* Fl_Cairo_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Cairo_Window.H; path = ../../include/FL/Fl_Cairo_Window.H; sourceTree = SOURCE_ROOT; };
- 55B4CDCEF4B09787E7FD25BB /* Fl_Cairo.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Cairo.H; path = ../../include/FL/Fl_Cairo.H; sourceTree = SOURCE_ROOT; };
- EE19925D86B4E18A2ABA4B72 /* Fl_Chart.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Chart.H; path = ../../include/FL/Fl_Chart.H; sourceTree = SOURCE_ROOT; };
- BEA4818208D31ED50B1C56E7 /* Fl_Check_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Check_Browser.H; path = ../../include/FL/Fl_Check_Browser.H; sourceTree = SOURCE_ROOT; };
- 59F26B39132872DE688B56DE /* Fl_Check_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Check_Button.H; path = ../../include/FL/Fl_Check_Button.H; sourceTree = SOURCE_ROOT; };
- DEEF6347E960D45D61A594F9 /* Fl_Choice.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Choice.H; path = ../../include/FL/Fl_Choice.H; sourceTree = SOURCE_ROOT; };
- 6DCE509AF493A23C55FE0FD9 /* Fl_Clock.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Clock.H; path = ../../include/FL/Fl_Clock.H; sourceTree = SOURCE_ROOT; };
- 0387AB541B67B2B60FD9919A /* Fl_Color_Chooser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Color_Chooser.H; path = ../../include/FL/Fl_Color_Chooser.H; sourceTree = SOURCE_ROOT; };
- 5F065F11F3EE9685C02D295C /* Fl_Counter.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Counter.H; path = ../../include/FL/Fl_Counter.H; sourceTree = SOURCE_ROOT; };
- 751ED6A281FB39E15D693701 /* Fl_Device.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Device.H; path = ../../include/FL/Fl_Device.H; sourceTree = SOURCE_ROOT; };
- 046814A317B7073B7768385F /* Fl_Dial.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Dial.H; path = ../../include/FL/Fl_Dial.H; sourceTree = SOURCE_ROOT; };
- A7DBE2F499ABB0F4D6C7ECF6 /* Fl_Double_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Double_Window.H; path = ../../include/FL/Fl_Double_Window.H; sourceTree = SOURCE_ROOT; };
- 476B2004F912E552D42CDE24 /* fl_draw.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_draw.H; path = ../../include/FL/fl_draw.H; sourceTree = SOURCE_ROOT; };
- 1C2E2951B883232E4EC0E841 /* Fl_Export.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Export.H; path = ../../include/FL/Fl_Export.H; sourceTree = SOURCE_ROOT; };
- 5F5909D1C69616EC92F5CE74 /* Fl_File_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Browser.H; path = ../../include/FL/Fl_File_Browser.H; sourceTree = SOURCE_ROOT; };
- 94D72137FD51BCF01BDD6F8F /* Fl_File_Chooser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Chooser.H; path = ../../include/FL/Fl_File_Chooser.H; sourceTree = SOURCE_ROOT; };
- D8DCB158B7E8DE3C262743E3 /* Fl_File_Icon.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Icon.H; path = ../../include/FL/Fl_File_Icon.H; sourceTree = SOURCE_ROOT; };
- E573C4B7E9A494DEF90629D3 /* Fl_File_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Input.H; path = ../../include/FL/Fl_File_Input.H; sourceTree = SOURCE_ROOT; };
- C56F2400B8E177E58CACDE80 /* Fl_Fill_Dial.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Fill_Dial.H; path = ../../include/FL/Fl_Fill_Dial.H; sourceTree = SOURCE_ROOT; };
- 343CA2F0A1A1B6A2D0A9A606 /* Fl_Fill_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Fill_Slider.H; path = ../../include/FL/Fl_Fill_Slider.H; sourceTree = SOURCE_ROOT; };
- 06DA1F2D064DBB6E7F70C21A /* Fl_Float_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Float_Input.H; path = ../../include/FL/Fl_Float_Input.H; sourceTree = SOURCE_ROOT; };
- 7BC0D43FACFDE8AC7F386E83 /* Fl_FormsBitmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_FormsBitmap.H; path = ../../include/FL/Fl_FormsBitmap.H; sourceTree = SOURCE_ROOT; };
- 80874C039FCA9D112DF53128 /* Fl_FormsPixmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_FormsPixmap.H; path = ../../include/FL/Fl_FormsPixmap.H; sourceTree = SOURCE_ROOT; };
- 77A92658ED8711C0E7EC3D86 /* Fl_Free.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Free.H; path = ../../include/FL/Fl_Free.H; sourceTree = SOURCE_ROOT; };
- F9A9C12F7C34A2FD6D63FA27 /* Fl_GIF_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_GIF_Image.H; path = ../../include/FL/Fl_GIF_Image.H; sourceTree = SOURCE_ROOT; };
- 10E9C2D644478A5E0F81B2DF /* Fl_Gl_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Gl_Window.H; path = ../../include/FL/Fl_Gl_Window.H; sourceTree = SOURCE_ROOT; };
- 9E4A0F8C30C6E23F7DC32434 /* Fl_Group.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Group.H; path = ../../include/FL/Fl_Group.H; sourceTree = SOURCE_ROOT; };
- 60E45BA2AB334C49760259F9 /* Fl_Help_Dialog.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Help_Dialog.H; path = ../../include/FL/Fl_Help_Dialog.H; sourceTree = SOURCE_ROOT; };
- 7309CA08B4E6334A6E5D23EA /* Fl_Help_View.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Help_View.H; path = ../../include/FL/Fl_Help_View.H; sourceTree = SOURCE_ROOT; };
- 545645285CE253BF821E40DD /* Fl_Hold_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hold_Browser.H; path = ../../include/FL/Fl_Hold_Browser.H; sourceTree = SOURCE_ROOT; };
- 526DD9E09265B8764D47D621 /* Fl_Hor_Fill_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Fill_Slider.H; path = ../../include/FL/Fl_Hor_Fill_Slider.H; sourceTree = SOURCE_ROOT; };
- 2AD2D488CB2FB56DF2B58078 /* Fl_Hor_Nice_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Nice_Slider.H; path = ../../include/FL/Fl_Hor_Nice_Slider.H; sourceTree = SOURCE_ROOT; };
- 3E9BE577930F8C8926BFB839 /* Fl_Hor_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Slider.H; path = ../../include/FL/Fl_Hor_Slider.H; sourceTree = SOURCE_ROOT; };
- 3D61268FFEC92E286B5D9023 /* Fl_Hor_Value_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Value_Slider.H; path = ../../include/FL/Fl_Hor_Value_Slider.H; sourceTree = SOURCE_ROOT; };
- 466A05708D8BA9418FC4FD25 /* Fl_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Image.H; path = ../../include/FL/Fl_Image.H; sourceTree = SOURCE_ROOT; };
- BE55456A4415AB1E89D7C0E1 /* Fl_Input_.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Input_.H; path = ../../include/FL/Fl_Input_.H; sourceTree = SOURCE_ROOT; };
- C2ED282027F1F15A04AC3081 /* Fl_Input_Choice.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Input_Choice.H; path = ../../include/FL/Fl_Input_Choice.H; sourceTree = SOURCE_ROOT; };
- 8E19A974EC938A6FDA453D30 /* Fl_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Input.H; path = ../../include/FL/Fl_Input.H; sourceTree = SOURCE_ROOT; };
- AB036590CED7EE46D4FC6C2E /* Fl_Int_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Int_Input.H; path = ../../include/FL/Fl_Int_Input.H; sourceTree = SOURCE_ROOT; };
- CD08D56A8407F3B5381E645C /* Fl_JPEG_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_JPEG_Image.H; path = ../../include/FL/Fl_JPEG_Image.H; sourceTree = SOURCE_ROOT; };
- D19D54396CD5FC8E69EECF84 /* Fl_Light_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Light_Button.H; path = ../../include/FL/Fl_Light_Button.H; sourceTree = SOURCE_ROOT; };
- 05630C0935D39BDAE99C1488 /* Fl_Line_Dial.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Line_Dial.H; path = ../../include/FL/Fl_Line_Dial.H; sourceTree = SOURCE_ROOT; };
- 40777FF26EE380FDE756415B /* Fl_Menu_.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_.H; path = ../../include/FL/Fl_Menu_.H; sourceTree = SOURCE_ROOT; };
- 3241B9A996EC15BB88C9CDAA /* Fl_Menu_Bar.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Bar.H; path = ../../include/FL/Fl_Menu_Bar.H; sourceTree = SOURCE_ROOT; };
- 13990D44168373A8BD062890 /* Fl_Menu_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Button.H; path = ../../include/FL/Fl_Menu_Button.H; sourceTree = SOURCE_ROOT; };
- 339DB023BEF387CB77A08103 /* Fl_Menu_Item.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Item.H; path = ../../include/FL/Fl_Menu_Item.H; sourceTree = SOURCE_ROOT; };
- 8617C24879F7B3CA2652C529 /* Fl_Menu_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Window.H; path = ../../include/FL/Fl_Menu_Window.H; sourceTree = SOURCE_ROOT; };
- DA0A53B1D87CC356ADBE7049 /* Fl_Menu.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu.H; path = ../../include/FL/Fl_Menu.H; sourceTree = SOURCE_ROOT; };
- 2F569BED58DFD0E0822975B3 /* fl_message.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_message.H; path = ../../include/FL/fl_message.H; sourceTree = SOURCE_ROOT; };
- 578C7EEA0DD33349A6E04D9A /* Fl_Multi_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multi_Browser.H; path = ../../include/FL/Fl_Multi_Browser.H; sourceTree = SOURCE_ROOT; };
- 8FB78C0FE8925BA5FCD43C25 /* Fl_Multi_Label.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multi_Label.H; path = ../../include/FL/Fl_Multi_Label.H; sourceTree = SOURCE_ROOT; };
- D1B63C925797FF9711133994 /* Fl_Multiline_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multiline_Input.H; path = ../../include/FL/Fl_Multiline_Input.H; sourceTree = SOURCE_ROOT; };
- F14D9B932EF4A975FD60E87B /* Fl_Multiline_Output.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multiline_Output.H; path = ../../include/FL/Fl_Multiline_Output.H; sourceTree = SOURCE_ROOT; };
- B882FDD5DC45640FFB7C29C7 /* Fl_Native_File_Chooser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Native_File_Chooser.H; path = ../../include/FL/Fl_Native_File_Chooser.H; sourceTree = SOURCE_ROOT; };
- 93B4695B7D268EBE9B2BDE58 /* Fl_Nice_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Nice_Slider.H; path = ../../include/FL/Fl_Nice_Slider.H; sourceTree = SOURCE_ROOT; };
- DB23D2A5E2888F596CD39DDE /* Fl_Object.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Object.H; path = ../../include/FL/Fl_Object.H; sourceTree = SOURCE_ROOT; };
- 07AF912D35A52DAC6B7203BA /* Fl_Output.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Output.H; path = ../../include/FL/Fl_Output.H; sourceTree = SOURCE_ROOT; };
- 18DD5DAA4B3B10040867B380 /* Fl_Overlay_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Overlay_Window.H; path = ../../include/FL/Fl_Overlay_Window.H; sourceTree = SOURCE_ROOT; };
- 1EF0C4F284DC1493DC386A4E /* Fl_Pack.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Pack.H; path = ../../include/FL/Fl_Pack.H; sourceTree = SOURCE_ROOT; };
- EB31FE1AB75A9F788FAAB39D /* Fl_Paged_Device.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Paged_Device.H; path = ../../include/FL/Fl_Paged_Device.H; sourceTree = SOURCE_ROOT; };
- 9075C1D161BFFEC0703ED7D8 /* Fl_Pixmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Pixmap.H; path = ../../include/FL/Fl_Pixmap.H; sourceTree = SOURCE_ROOT; };
- 87B8772E27F71EEDAD947533 /* Fl_Plugin.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Plugin.H; path = ../../include/FL/Fl_Plugin.H; sourceTree = SOURCE_ROOT; };
- 1014A2127B6531E799CFC91E /* Fl_PNG_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_PNG_Image.H; path = ../../include/FL/Fl_PNG_Image.H; sourceTree = SOURCE_ROOT; };
- F87952A979BDF75CDF550CFB /* Fl_PNM_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_PNM_Image.H; path = ../../include/FL/Fl_PNM_Image.H; sourceTree = SOURCE_ROOT; };
- 214F4DA7D74384A8EA92B1A6 /* Fl_Positioner.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Positioner.H; path = ../../include/FL/Fl_Positioner.H; sourceTree = SOURCE_ROOT; };
- 2283A6687E2704797E27DB67 /* Fl_PostScript.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_PostScript.H; path = ../../include/FL/Fl_PostScript.H; sourceTree = SOURCE_ROOT; };
- EBA784ED48809DC8FE06A277 /* Fl_Preferences.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Preferences.H; path = ../../include/FL/Fl_Preferences.H; sourceTree = SOURCE_ROOT; };
- 30EF7AAA16AA5596148968E0 /* Fl_Printer.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Printer.H; path = ../../include/FL/Fl_Printer.H; sourceTree = SOURCE_ROOT; };
- B7D35985B64D3AA65D627D45 /* Fl_Progress.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Progress.H; path = ../../include/FL/Fl_Progress.H; sourceTree = SOURCE_ROOT; };
- 53B237C1A9AFC215D3599963 /* Fl_Radio_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Radio_Button.H; path = ../../include/FL/Fl_Radio_Button.H; sourceTree = SOURCE_ROOT; };
- 825FD983F073C0759CAB8CA6 /* Fl_Radio_Light_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Radio_Light_Button.H; path = ../../include/FL/Fl_Radio_Light_Button.H; sourceTree = SOURCE_ROOT; };
- F5493C73D7EA50E1A1664A25 /* Fl_Radio_Round_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Radio_Round_Button.H; path = ../../include/FL/Fl_Radio_Round_Button.H; sourceTree = SOURCE_ROOT; };
- 0E58FB5220CCDAB8C72E06AD /* Fl_Repeat_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Repeat_Button.H; path = ../../include/FL/Fl_Repeat_Button.H; sourceTree = SOURCE_ROOT; };
- 720EF8D754579743BEA87E1A /* Fl_Return_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Return_Button.H; path = ../../include/FL/Fl_Return_Button.H; sourceTree = SOURCE_ROOT; };
- 6161F4A36F804A380623236B /* Fl_RGB_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_RGB_Image.H; path = ../../include/FL/Fl_RGB_Image.H; sourceTree = SOURCE_ROOT; };
- F6B574F98BE2F4BA0D2D8A0C /* Fl_Roller.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Roller.H; path = ../../include/FL/Fl_Roller.H; sourceTree = SOURCE_ROOT; };
- 896FD44A049C4D2DC7CD1550 /* Fl_Round_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Round_Button.H; path = ../../include/FL/Fl_Round_Button.H; sourceTree = SOURCE_ROOT; };
- AF92E4FE86ABDFE3D7027CFC /* Fl_Round_Clock.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Round_Clock.H; path = ../../include/FL/Fl_Round_Clock.H; sourceTree = SOURCE_ROOT; };
- 230472B81D51A13668C6E270 /* Fl_Scroll.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Scroll.H; path = ../../include/FL/Fl_Scroll.H; sourceTree = SOURCE_ROOT; };
- 645CF555D66678807F68E63F /* Fl_Scrollbar.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Scrollbar.H; path = ../../include/FL/Fl_Scrollbar.H; sourceTree = SOURCE_ROOT; };
- C8A3EB4B97498DF207FA6463 /* Fl_Secret_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Secret_Input.H; path = ../../include/FL/Fl_Secret_Input.H; sourceTree = SOURCE_ROOT; };
- 19B339FBDAB257DAF0AEC8A5 /* Fl_Select_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Select_Browser.H; path = ../../include/FL/Fl_Select_Browser.H; sourceTree = SOURCE_ROOT; };
- 95BDE5A2E708ED36D3593CF5 /* Fl_Shared_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Shared_Image.H; path = ../../include/FL/Fl_Shared_Image.H; sourceTree = SOURCE_ROOT; };
- 6AA57F121E8D71E89BCB72CC /* fl_show_colormap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_show_colormap.H; path = ../../include/FL/fl_show_colormap.H; sourceTree = SOURCE_ROOT; };
- 488E0B7DE9A923DAE61FF4CA /* fl_show_input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_show_input.H; path = ../../include/FL/fl_show_input.H; sourceTree = SOURCE_ROOT; };
- 9DEEB873D6A4926F002C2195 /* Fl_Simple_Counter.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Simple_Counter.H; path = ../../include/FL/Fl_Simple_Counter.H; sourceTree = SOURCE_ROOT; };
- 63AA3252FC4440BF08F5EB73 /* Fl_Single_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Single_Window.H; path = ../../include/FL/Fl_Single_Window.H; sourceTree = SOURCE_ROOT; };
- E3F28722F4B0D76C3894B847 /* Fl_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Slider.H; path = ../../include/FL/Fl_Slider.H; sourceTree = SOURCE_ROOT; };
- 54DFCB067D157B2B6E227147 /* Fl_Spinner.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Spinner.H; path = ../../include/FL/Fl_Spinner.H; sourceTree = SOURCE_ROOT; };
- CCE1F220EA45EBB59A5194EC /* Fl_Sys_Menu_Bar.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Sys_Menu_Bar.H; path = ../../include/FL/Fl_Sys_Menu_Bar.H; sourceTree = SOURCE_ROOT; };
- 7DF0FCA833DF744E4C48C918 /* Fl_Table_Row.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Table_Row.H; path = ../../include/FL/Fl_Table_Row.H; sourceTree = SOURCE_ROOT; };
- 3B18C086D0DFBD3715B01BFB /* Fl_Table.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Table.H; path = ../../include/FL/Fl_Table.H; sourceTree = SOURCE_ROOT; };
- 42A9E6B22DC843F52F524F47 /* Fl_Tabs.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tabs.H; path = ../../include/FL/Fl_Tabs.H; sourceTree = SOURCE_ROOT; };
- 97184624A3F7DE2B6CD96563 /* Fl_Text_Buffer.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Text_Buffer.H; path = ../../include/FL/Fl_Text_Buffer.H; sourceTree = SOURCE_ROOT; };
- FD0D12C7DC092F03F2E346EF /* Fl_Text_Display.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Text_Display.H; path = ../../include/FL/Fl_Text_Display.H; sourceTree = SOURCE_ROOT; };
- 27DB0008CB40F74982D862B1 /* Fl_Text_Editor.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Text_Editor.H; path = ../../include/FL/Fl_Text_Editor.H; sourceTree = SOURCE_ROOT; };
- BE9AC0CC02D28D4F7342082B /* Fl_Tile.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tile.H; path = ../../include/FL/Fl_Tile.H; sourceTree = SOURCE_ROOT; };
- E3C687781CE6F0D0C89DE7F4 /* Fl_Tiled_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tiled_Image.H; path = ../../include/FL/Fl_Tiled_Image.H; sourceTree = SOURCE_ROOT; };
- 65FCC43071F84259EEDCBF51 /* Fl_Timer.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Timer.H; path = ../../include/FL/Fl_Timer.H; sourceTree = SOURCE_ROOT; };
- 32981B5BBD19645E12681E62 /* Fl_Toggle_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Toggle_Button.H; path = ../../include/FL/Fl_Toggle_Button.H; sourceTree = SOURCE_ROOT; };
- 063A1979FD4A43332C5E8638 /* Fl_Toggle_Light_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Toggle_Light_Button.H; path = ../../include/FL/Fl_Toggle_Light_Button.H; sourceTree = SOURCE_ROOT; };
- 5D0DE7E03351EF5C859F0173 /* Fl_Toggle_Round_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Toggle_Round_Button.H; path = ../../include/FL/Fl_Toggle_Round_Button.H; sourceTree = SOURCE_ROOT; };
- 7F44D2B8F644B32A74DC298A /* Fl_Tooltip.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tooltip.H; path = ../../include/FL/Fl_Tooltip.H; sourceTree = SOURCE_ROOT; };
- 8FC0A58335CC7B37A9EB1A39 /* Fl_Tree_Item_Array.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree_Item_Array.H; path = ../../include/FL/Fl_Tree_Item_Array.H; sourceTree = SOURCE_ROOT; };
- F2A58128F6C32FA8C1AE9BF9 /* Fl_Tree_Item.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree_Item.H; path = ../../include/FL/Fl_Tree_Item.H; sourceTree = SOURCE_ROOT; };
- 7A70BCF3E30FA2957F50EBF2 /* Fl_Tree_Prefs.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree_Prefs.H; path = ../../include/FL/Fl_Tree_Prefs.H; sourceTree = SOURCE_ROOT; };
- FF90DB87E6CF7C6E1D0D9187 /* Fl_Tree.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree.H; path = ../../include/FL/Fl_Tree.H; sourceTree = SOURCE_ROOT; };
- 98333F502D6F3EAF11804409 /* fl_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fl_types.h; path = ../../include/FL/fl_types.h; sourceTree = SOURCE_ROOT; };
- B147194C498A0A5C8F2D8414 /* fl_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fl_utf8.h; path = ../../include/FL/fl_utf8.h; sourceTree = SOURCE_ROOT; };
- 65D052392932FC4922DF688C /* Fl_Valuator.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Valuator.H; path = ../../include/FL/Fl_Valuator.H; sourceTree = SOURCE_ROOT; };
- A238A124592C9AC9F1616582 /* Fl_Value_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Value_Input.H; path = ../../include/FL/Fl_Value_Input.H; sourceTree = SOURCE_ROOT; };
- 4DD87BAD1636E1605A6766CF /* Fl_Value_Output.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Value_Output.H; path = ../../include/FL/Fl_Value_Output.H; sourceTree = SOURCE_ROOT; };
- 2AA93056FE96AD23E3ED9224 /* Fl_Value_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Value_Slider.H; path = ../../include/FL/Fl_Value_Slider.H; sourceTree = SOURCE_ROOT; };
- 24E9531EEF94E11B6A006D4B /* Fl_Widget.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Widget.H; path = ../../include/FL/Fl_Widget.H; sourceTree = SOURCE_ROOT; };
- DD267E3F127787BAC7DEC6E0 /* Fl_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Window.H; path = ../../include/FL/Fl_Window.H; sourceTree = SOURCE_ROOT; };
- 43B659A38F5B9A6EC4970FA7 /* Fl_Wizard.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Wizard.H; path = ../../include/FL/Fl_Wizard.H; sourceTree = SOURCE_ROOT; };
- E34B76A8E7FAFB6F5A9AE6E5 /* Fl_XBM_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_XBM_Image.H; path = ../../include/FL/Fl_XBM_Image.H; sourceTree = SOURCE_ROOT; };
- 0CCA35FA3E2B6CD8D4D7174C /* Fl_XPM_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_XPM_Image.H; path = ../../include/FL/Fl_XPM_Image.H; sourceTree = SOURCE_ROOT; };
- 4737F685D8B620BE3E364DFD /* Fl.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl.H; path = ../../include/FL/Fl.H; sourceTree = SOURCE_ROOT; };
- 09CEB7C1FB5534E5EAADF81E /* forms.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = forms.H; path = ../../include/FL/forms.H; sourceTree = SOURCE_ROOT; };
- 9F66C80FA862C5CC109D65C6 /* gl_draw.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gl_draw.H; path = ../../include/FL/gl_draw.H; sourceTree = SOURCE_ROOT; };
- DED76E7604C977F157865A6E /* gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl.h; path = ../../include/FL/gl.h; sourceTree = SOURCE_ROOT; };
- 440037402CCD9746CA87C7EF /* gl2opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2opengl.h; path = ../../include/FL/gl2opengl.h; sourceTree = SOURCE_ROOT; };
- 24CBD81B778F5F40886AF4F2 /* glu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glu.h; path = ../../include/FL/glu.h; sourceTree = SOURCE_ROOT; };
- 0FDE8890E7E693799703428F /* glut.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = glut.H; path = ../../include/FL/glut.H; sourceTree = SOURCE_ROOT; };
- 7F47EEE9D81BC6F2DFB6687B /* mac.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = mac.H; path = ../../include/FL/mac.H; sourceTree = SOURCE_ROOT; };
- 4E4A1470B8A2CF8EFEE0604A /* math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = math.h; path = ../../include/FL/math.h; sourceTree = SOURCE_ROOT; };
- 33E47A9280F49940E23BC53F /* names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = names.h; path = ../../include/FL/names.h; sourceTree = SOURCE_ROOT; };
- BD04331D0DAE8BA61546C6E9 /* win32.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = win32.H; path = ../../include/FL/win32.H; sourceTree = SOURCE_ROOT; };
- 177D0E2DD87973D409A5B211 /* x.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = x.H; path = ../../include/FL/x.H; sourceTree = SOURCE_ROOT; };
- B1EA671F137EC075DA390451 /* Xutf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Xutf8.h; path = ../../include/FL/Xutf8.h; sourceTree = SOURCE_ROOT; };
+ 69C2640C2C5ECAF1C7E312A1 /* dirent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dirent.h; path = ../../include/FL/dirent.h; sourceTree = SOURCE_ROOT; };
+ 2A61539D3EBD007731E29C63 /* Enumerations.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Enumerations.H; path = ../../include/FL/Enumerations.H; sourceTree = SOURCE_ROOT; };
+ 4DC4609B92F2D7EE1FDA68C5 /* filename.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = filename.H; path = ../../include/FL/filename.H; sourceTree = SOURCE_ROOT; };
+ 00B302AA194587610664E6BA /* Fl_Adjuster.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Adjuster.H; path = ../../include/FL/Fl_Adjuster.H; sourceTree = SOURCE_ROOT; };
+ 0CE22D9802C992DCB7783EDC /* fl_ask.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_ask.H; path = ../../include/FL/fl_ask.H; sourceTree = SOURCE_ROOT; };
+ E77B050FE3494F0CB9973606 /* Fl_Bitmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Bitmap.H; path = ../../include/FL/Fl_Bitmap.H; sourceTree = SOURCE_ROOT; };
+ 6F56D851D0A15061D5946F08 /* Fl_BMP_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_BMP_Image.H; path = ../../include/FL/Fl_BMP_Image.H; sourceTree = SOURCE_ROOT; };
+ BEB1C8ABCFC203BE03935E85 /* Fl_Box.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Box.H; path = ../../include/FL/Fl_Box.H; sourceTree = SOURCE_ROOT; };
+ 71313C2D94965DAF677BC055 /* Fl_Browser_.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Browser_.H; path = ../../include/FL/Fl_Browser_.H; sourceTree = SOURCE_ROOT; };
+ F732903CD6C6FA6E40F29B6C /* Fl_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Browser.H; path = ../../include/FL/Fl_Browser.H; sourceTree = SOURCE_ROOT; };
+ 4AB2C29065C6F227129F3127 /* Fl_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Button.H; path = ../../include/FL/Fl_Button.H; sourceTree = SOURCE_ROOT; };
+ 85842AFD5224FD34160CDB9D /* Fl_Cairo_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Cairo_Window.H; path = ../../include/FL/Fl_Cairo_Window.H; sourceTree = SOURCE_ROOT; };
+ 5C06B798B6F732CA8A9E01C8 /* Fl_Cairo.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Cairo.H; path = ../../include/FL/Fl_Cairo.H; sourceTree = SOURCE_ROOT; };
+ DC0E6F03D49478A28DE4B358 /* Fl_Chart.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Chart.H; path = ../../include/FL/Fl_Chart.H; sourceTree = SOURCE_ROOT; };
+ 27F4C25CD138343780F5B6CE /* Fl_Check_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Check_Browser.H; path = ../../include/FL/Fl_Check_Browser.H; sourceTree = SOURCE_ROOT; };
+ 91F1EFD856FBEAAE31385807 /* Fl_Check_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Check_Button.H; path = ../../include/FL/Fl_Check_Button.H; sourceTree = SOURCE_ROOT; };
+ DFDEF18502380DAB06EC9DD0 /* Fl_Choice.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Choice.H; path = ../../include/FL/Fl_Choice.H; sourceTree = SOURCE_ROOT; };
+ 92027C6C9B7C86F938351ECF /* Fl_Clock.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Clock.H; path = ../../include/FL/Fl_Clock.H; sourceTree = SOURCE_ROOT; };
+ 55D02511AEA8D4201C372B91 /* Fl_Color_Chooser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Color_Chooser.H; path = ../../include/FL/Fl_Color_Chooser.H; sourceTree = SOURCE_ROOT; };
+ D241A08F70ED1F9E0093E79C /* Fl_Counter.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Counter.H; path = ../../include/FL/Fl_Counter.H; sourceTree = SOURCE_ROOT; };
+ 65FF490FE9113F8EE81F233F /* Fl_Device.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Device.H; path = ../../include/FL/Fl_Device.H; sourceTree = SOURCE_ROOT; };
+ CBE81F3C581680C49B41F7F1 /* Fl_Dial.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Dial.H; path = ../../include/FL/Fl_Dial.H; sourceTree = SOURCE_ROOT; };
+ 87F0AFB3A41B67F0CBC79A70 /* Fl_Double_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Double_Window.H; path = ../../include/FL/Fl_Double_Window.H; sourceTree = SOURCE_ROOT; };
+ F7A42D5C15154741C59E003C /* fl_draw.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_draw.H; path = ../../include/FL/fl_draw.H; sourceTree = SOURCE_ROOT; };
+ BE71AC43179373EE75B58A45 /* Fl_Export.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Export.H; path = ../../include/FL/Fl_Export.H; sourceTree = SOURCE_ROOT; };
+ 058CF809E8D182747AF5F6AE /* Fl_File_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Browser.H; path = ../../include/FL/Fl_File_Browser.H; sourceTree = SOURCE_ROOT; };
+ E61D7ACA404961CC2CDAEE9F /* Fl_File_Chooser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Chooser.H; path = ../../include/FL/Fl_File_Chooser.H; sourceTree = SOURCE_ROOT; };
+ 78D3101F571600871964C2D6 /* Fl_File_Icon.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Icon.H; path = ../../include/FL/Fl_File_Icon.H; sourceTree = SOURCE_ROOT; };
+ 685EAC951ACBB169C208B102 /* Fl_File_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_File_Input.H; path = ../../include/FL/Fl_File_Input.H; sourceTree = SOURCE_ROOT; };
+ 6B3F4A01294B4032421E5363 /* Fl_Fill_Dial.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Fill_Dial.H; path = ../../include/FL/Fl_Fill_Dial.H; sourceTree = SOURCE_ROOT; };
+ 2C4D6B12586FAE028394176E /* Fl_Fill_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Fill_Slider.H; path = ../../include/FL/Fl_Fill_Slider.H; sourceTree = SOURCE_ROOT; };
+ EEBE1CEBFD43C4F061F5B202 /* Fl_Float_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Float_Input.H; path = ../../include/FL/Fl_Float_Input.H; sourceTree = SOURCE_ROOT; };
+ 332FE193FCC1EF68990A5AD4 /* Fl_FormsBitmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_FormsBitmap.H; path = ../../include/FL/Fl_FormsBitmap.H; sourceTree = SOURCE_ROOT; };
+ DB27CF0A2151280913575F93 /* Fl_FormsPixmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_FormsPixmap.H; path = ../../include/FL/Fl_FormsPixmap.H; sourceTree = SOURCE_ROOT; };
+ 09229795A7E8ACF905079D5E /* Fl_Free.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Free.H; path = ../../include/FL/Fl_Free.H; sourceTree = SOURCE_ROOT; };
+ 8279907DE5F20C88EEBE4DF9 /* Fl_GIF_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_GIF_Image.H; path = ../../include/FL/Fl_GIF_Image.H; sourceTree = SOURCE_ROOT; };
+ D6B0E605662B681E14976AAB /* Fl_Gl_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Gl_Window.H; path = ../../include/FL/Fl_Gl_Window.H; sourceTree = SOURCE_ROOT; };
+ C4990598C2720AA2F95673FB /* Fl_Group.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Group.H; path = ../../include/FL/Fl_Group.H; sourceTree = SOURCE_ROOT; };
+ BB525EC719F2E59F58A7ECE9 /* Fl_Help_Dialog.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Help_Dialog.H; path = ../../include/FL/Fl_Help_Dialog.H; sourceTree = SOURCE_ROOT; };
+ CBB24D4125A3C325617AB3E5 /* Fl_Help_View.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Help_View.H; path = ../../include/FL/Fl_Help_View.H; sourceTree = SOURCE_ROOT; };
+ 7CA5999FE08C978ABC8CFFAE /* Fl_Hold_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hold_Browser.H; path = ../../include/FL/Fl_Hold_Browser.H; sourceTree = SOURCE_ROOT; };
+ D2C99DC9193E6A63910A7968 /* Fl_Hor_Fill_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Fill_Slider.H; path = ../../include/FL/Fl_Hor_Fill_Slider.H; sourceTree = SOURCE_ROOT; };
+ BD2E49722D1C39BF1A403B12 /* Fl_Hor_Nice_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Nice_Slider.H; path = ../../include/FL/Fl_Hor_Nice_Slider.H; sourceTree = SOURCE_ROOT; };
+ E7DB83951C5AAB5731026A71 /* Fl_Hor_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Slider.H; path = ../../include/FL/Fl_Hor_Slider.H; sourceTree = SOURCE_ROOT; };
+ A920632C391B871DA0A0E658 /* Fl_Hor_Value_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Hor_Value_Slider.H; path = ../../include/FL/Fl_Hor_Value_Slider.H; sourceTree = SOURCE_ROOT; };
+ 817C39C4AC25E54409493656 /* Fl_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Image.H; path = ../../include/FL/Fl_Image.H; sourceTree = SOURCE_ROOT; };
+ 595C6BDED7E0A8F4E5F3F560 /* Fl_Input_.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Input_.H; path = ../../include/FL/Fl_Input_.H; sourceTree = SOURCE_ROOT; };
+ E44655EF447B741518B014FF /* Fl_Input_Choice.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Input_Choice.H; path = ../../include/FL/Fl_Input_Choice.H; sourceTree = SOURCE_ROOT; };
+ 3EBBDADB5EF5A2D4007649E7 /* Fl_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Input.H; path = ../../include/FL/Fl_Input.H; sourceTree = SOURCE_ROOT; };
+ B4E3234B3A6621D860C34C83 /* Fl_Int_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Int_Input.H; path = ../../include/FL/Fl_Int_Input.H; sourceTree = SOURCE_ROOT; };
+ AC005208484203D2D5ADAFCB /* Fl_JPEG_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_JPEG_Image.H; path = ../../include/FL/Fl_JPEG_Image.H; sourceTree = SOURCE_ROOT; };
+ AE6F44AAE35658A34D8D751C /* Fl_Light_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Light_Button.H; path = ../../include/FL/Fl_Light_Button.H; sourceTree = SOURCE_ROOT; };
+ 51D58233E27816478FEE5D07 /* Fl_Line_Dial.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Line_Dial.H; path = ../../include/FL/Fl_Line_Dial.H; sourceTree = SOURCE_ROOT; };
+ A77E94067A8A1D24F5F0435E /* Fl_Menu_.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_.H; path = ../../include/FL/Fl_Menu_.H; sourceTree = SOURCE_ROOT; };
+ 6CEAABB6FC6325E1DBE9700C /* Fl_Menu_Bar.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Bar.H; path = ../../include/FL/Fl_Menu_Bar.H; sourceTree = SOURCE_ROOT; };
+ 5A734DC58B7CD71D291E6F88 /* Fl_Menu_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Button.H; path = ../../include/FL/Fl_Menu_Button.H; sourceTree = SOURCE_ROOT; };
+ 62771243064473A7FF5FD90F /* Fl_Menu_Item.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Item.H; path = ../../include/FL/Fl_Menu_Item.H; sourceTree = SOURCE_ROOT; };
+ C1C8D29F56834FC6A107181A /* Fl_Menu_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu_Window.H; path = ../../include/FL/Fl_Menu_Window.H; sourceTree = SOURCE_ROOT; };
+ 7902E947B20BA38F82AA343A /* Fl_Menu.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Menu.H; path = ../../include/FL/Fl_Menu.H; sourceTree = SOURCE_ROOT; };
+ 5CB532035A71674B34A0B587 /* fl_message.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_message.H; path = ../../include/FL/fl_message.H; sourceTree = SOURCE_ROOT; };
+ 49897D39A4A3EE8F26E9E799 /* Fl_Multi_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multi_Browser.H; path = ../../include/FL/Fl_Multi_Browser.H; sourceTree = SOURCE_ROOT; };
+ F5A281BE9B792478A463B364 /* Fl_Multi_Label.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multi_Label.H; path = ../../include/FL/Fl_Multi_Label.H; sourceTree = SOURCE_ROOT; };
+ 038DF62263523AD26F0914F7 /* Fl_Multiline_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multiline_Input.H; path = ../../include/FL/Fl_Multiline_Input.H; sourceTree = SOURCE_ROOT; };
+ 94988F7EECD00403D2066F43 /* Fl_Multiline_Output.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Multiline_Output.H; path = ../../include/FL/Fl_Multiline_Output.H; sourceTree = SOURCE_ROOT; };
+ CDE17641B8319026AE2B5EBB /* Fl_Native_File_Chooser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Native_File_Chooser.H; path = ../../include/FL/Fl_Native_File_Chooser.H; sourceTree = SOURCE_ROOT; };
+ A1FC281A358355A0713C7288 /* Fl_Nice_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Nice_Slider.H; path = ../../include/FL/Fl_Nice_Slider.H; sourceTree = SOURCE_ROOT; };
+ 3C311650275E771ACB11D045 /* Fl_Object.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Object.H; path = ../../include/FL/Fl_Object.H; sourceTree = SOURCE_ROOT; };
+ B80E807F36FD92CEB48316FC /* Fl_Output.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Output.H; path = ../../include/FL/Fl_Output.H; sourceTree = SOURCE_ROOT; };
+ 82A293C1F7DF7BA71DABD3BB /* Fl_Overlay_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Overlay_Window.H; path = ../../include/FL/Fl_Overlay_Window.H; sourceTree = SOURCE_ROOT; };
+ 29FCB84A346AD43E101DEC3E /* Fl_Pack.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Pack.H; path = ../../include/FL/Fl_Pack.H; sourceTree = SOURCE_ROOT; };
+ 95C56134C758F02F1F0EF7F2 /* Fl_Paged_Device.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Paged_Device.H; path = ../../include/FL/Fl_Paged_Device.H; sourceTree = SOURCE_ROOT; };
+ A6F9E504EA5F550300B75683 /* Fl_Pixmap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Pixmap.H; path = ../../include/FL/Fl_Pixmap.H; sourceTree = SOURCE_ROOT; };
+ 0102E6CCF6280F255D9AA91C /* Fl_Plugin.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Plugin.H; path = ../../include/FL/Fl_Plugin.H; sourceTree = SOURCE_ROOT; };
+ 5467CA024E9383D4E7653D80 /* Fl_PNG_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_PNG_Image.H; path = ../../include/FL/Fl_PNG_Image.H; sourceTree = SOURCE_ROOT; };
+ DED22221073FF943CCCCFBFE /* Fl_PNM_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_PNM_Image.H; path = ../../include/FL/Fl_PNM_Image.H; sourceTree = SOURCE_ROOT; };
+ E9578F0FFDE406AF0C74F13E /* Fl_Positioner.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Positioner.H; path = ../../include/FL/Fl_Positioner.H; sourceTree = SOURCE_ROOT; };
+ CECC3FE216A0682640B43C4E /* Fl_PostScript.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_PostScript.H; path = ../../include/FL/Fl_PostScript.H; sourceTree = SOURCE_ROOT; };
+ E9A3D7D3E6F498C2C46AB9BB /* Fl_Preferences.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Preferences.H; path = ../../include/FL/Fl_Preferences.H; sourceTree = SOURCE_ROOT; };
+ 1DAE8C73702CE0BB56F14E60 /* Fl_Printer.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Printer.H; path = ../../include/FL/Fl_Printer.H; sourceTree = SOURCE_ROOT; };
+ B1FF391AECD6C5B8061ADABF /* Fl_Progress.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Progress.H; path = ../../include/FL/Fl_Progress.H; sourceTree = SOURCE_ROOT; };
+ 66D17798853EA874252C6D65 /* Fl_Radio_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Radio_Button.H; path = ../../include/FL/Fl_Radio_Button.H; sourceTree = SOURCE_ROOT; };
+ 966E2FF91F3467B361B6E16B /* Fl_Radio_Light_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Radio_Light_Button.H; path = ../../include/FL/Fl_Radio_Light_Button.H; sourceTree = SOURCE_ROOT; };
+ 8E4CFCE3B850F4FD0A527E59 /* Fl_Radio_Round_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Radio_Round_Button.H; path = ../../include/FL/Fl_Radio_Round_Button.H; sourceTree = SOURCE_ROOT; };
+ EE72F5D68BD65EB1E9F4782C /* Fl_Repeat_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Repeat_Button.H; path = ../../include/FL/Fl_Repeat_Button.H; sourceTree = SOURCE_ROOT; };
+ B3BBE04F7C92FA3B28F724EC /* Fl_Return_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Return_Button.H; path = ../../include/FL/Fl_Return_Button.H; sourceTree = SOURCE_ROOT; };
+ 466AD506D4D6762D81A862E2 /* Fl_RGB_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_RGB_Image.H; path = ../../include/FL/Fl_RGB_Image.H; sourceTree = SOURCE_ROOT; };
+ 5FDBBC03AEA34E4EEAA7FBC7 /* Fl_Roller.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Roller.H; path = ../../include/FL/Fl_Roller.H; sourceTree = SOURCE_ROOT; };
+ 69F20A36BB53FC3AF8588C9A /* Fl_Round_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Round_Button.H; path = ../../include/FL/Fl_Round_Button.H; sourceTree = SOURCE_ROOT; };
+ F1F4A71594A073F418560995 /* Fl_Round_Clock.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Round_Clock.H; path = ../../include/FL/Fl_Round_Clock.H; sourceTree = SOURCE_ROOT; };
+ 92232DB006AC569BF640873F /* Fl_Scroll.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Scroll.H; path = ../../include/FL/Fl_Scroll.H; sourceTree = SOURCE_ROOT; };
+ 635FF7C56A5EA8BAF16CD8C0 /* Fl_Scrollbar.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Scrollbar.H; path = ../../include/FL/Fl_Scrollbar.H; sourceTree = SOURCE_ROOT; };
+ B3C148D99C258B9FF22A5727 /* Fl_Secret_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Secret_Input.H; path = ../../include/FL/Fl_Secret_Input.H; sourceTree = SOURCE_ROOT; };
+ 94AA62F05929DE9224CBF735 /* Fl_Select_Browser.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Select_Browser.H; path = ../../include/FL/Fl_Select_Browser.H; sourceTree = SOURCE_ROOT; };
+ BAFF106B06358E4A609B3603 /* Fl_Shared_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Shared_Image.H; path = ../../include/FL/Fl_Shared_Image.H; sourceTree = SOURCE_ROOT; };
+ 4518F2ABE2E70C3D07FCB294 /* fl_show_colormap.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_show_colormap.H; path = ../../include/FL/fl_show_colormap.H; sourceTree = SOURCE_ROOT; };
+ B387DD9EAF7DFB71B96E8A80 /* fl_show_input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = fl_show_input.H; path = ../../include/FL/fl_show_input.H; sourceTree = SOURCE_ROOT; };
+ 59CCADE43992C44AF13AB964 /* Fl_Simple_Counter.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Simple_Counter.H; path = ../../include/FL/Fl_Simple_Counter.H; sourceTree = SOURCE_ROOT; };
+ 3626245257FD9D66D9804FDE /* Fl_Single_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Single_Window.H; path = ../../include/FL/Fl_Single_Window.H; sourceTree = SOURCE_ROOT; };
+ 954820449B90567D9E96BE7F /* Fl_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Slider.H; path = ../../include/FL/Fl_Slider.H; sourceTree = SOURCE_ROOT; };
+ 461F9B57C5B1974DCAD17CF7 /* Fl_Spinner.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Spinner.H; path = ../../include/FL/Fl_Spinner.H; sourceTree = SOURCE_ROOT; };
+ F9DD9F6BEEDBE419712531A8 /* Fl_Sys_Menu_Bar.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Sys_Menu_Bar.H; path = ../../include/FL/Fl_Sys_Menu_Bar.H; sourceTree = SOURCE_ROOT; };
+ 172A93EC6CEA842985B5CDAE /* Fl_Table_Row.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Table_Row.H; path = ../../include/FL/Fl_Table_Row.H; sourceTree = SOURCE_ROOT; };
+ 8552D223DB794B3B8440E031 /* Fl_Table.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Table.H; path = ../../include/FL/Fl_Table.H; sourceTree = SOURCE_ROOT; };
+ DB3D34A155A44817966E5408 /* Fl_Tabs.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tabs.H; path = ../../include/FL/Fl_Tabs.H; sourceTree = SOURCE_ROOT; };
+ 3C1743152E54AB995BE69A64 /* Fl_Text_Buffer.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Text_Buffer.H; path = ../../include/FL/Fl_Text_Buffer.H; sourceTree = SOURCE_ROOT; };
+ DA86EE88CED70542546C574D /* Fl_Text_Display.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Text_Display.H; path = ../../include/FL/Fl_Text_Display.H; sourceTree = SOURCE_ROOT; };
+ 91C64F56C5C66C5A6A58C7A4 /* Fl_Text_Editor.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Text_Editor.H; path = ../../include/FL/Fl_Text_Editor.H; sourceTree = SOURCE_ROOT; };
+ 5A9B1312F3DD6B28B098E8EA /* Fl_Tile.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tile.H; path = ../../include/FL/Fl_Tile.H; sourceTree = SOURCE_ROOT; };
+ 3B55011D3AA5D9BCF4C7E94A /* Fl_Tiled_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tiled_Image.H; path = ../../include/FL/Fl_Tiled_Image.H; sourceTree = SOURCE_ROOT; };
+ 3E03CB40C4EDEA0D94DC95C7 /* Fl_Timer.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Timer.H; path = ../../include/FL/Fl_Timer.H; sourceTree = SOURCE_ROOT; };
+ F482A9D31687CDC37521E61C /* Fl_Toggle_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Toggle_Button.H; path = ../../include/FL/Fl_Toggle_Button.H; sourceTree = SOURCE_ROOT; };
+ A41E656F6E814AD04230FFA3 /* Fl_Toggle_Light_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Toggle_Light_Button.H; path = ../../include/FL/Fl_Toggle_Light_Button.H; sourceTree = SOURCE_ROOT; };
+ 69A3CA0C3A897CC1E5F1F087 /* Fl_Toggle_Round_Button.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Toggle_Round_Button.H; path = ../../include/FL/Fl_Toggle_Round_Button.H; sourceTree = SOURCE_ROOT; };
+ 18970CCA07610CC910212A36 /* Fl_Tooltip.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tooltip.H; path = ../../include/FL/Fl_Tooltip.H; sourceTree = SOURCE_ROOT; };
+ 3D31C2BD61250F8A8A4979F7 /* Fl_Tree_Item_Array.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree_Item_Array.H; path = ../../include/FL/Fl_Tree_Item_Array.H; sourceTree = SOURCE_ROOT; };
+ 0FB68D65062FF711B5F43FC3 /* Fl_Tree_Item.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree_Item.H; path = ../../include/FL/Fl_Tree_Item.H; sourceTree = SOURCE_ROOT; };
+ B57FD83797A0DD89BCA0EE19 /* Fl_Tree_Prefs.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree_Prefs.H; path = ../../include/FL/Fl_Tree_Prefs.H; sourceTree = SOURCE_ROOT; };
+ FCD4D0F3E5BA3ABF6744AFF7 /* Fl_Tree.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Tree.H; path = ../../include/FL/Fl_Tree.H; sourceTree = SOURCE_ROOT; };
+ 35D125ED0115B48E04288485 /* fl_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fl_types.h; path = ../../include/FL/fl_types.h; sourceTree = SOURCE_ROOT; };
+ 3B6E01EB829DC7CB277B7DD3 /* fl_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fl_utf8.h; path = ../../include/FL/fl_utf8.h; sourceTree = SOURCE_ROOT; };
+ 3286D14FDDEE0E9EC9B23729 /* Fl_Valuator.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Valuator.H; path = ../../include/FL/Fl_Valuator.H; sourceTree = SOURCE_ROOT; };
+ FFFB00A23722721DBEF11545 /* Fl_Value_Input.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Value_Input.H; path = ../../include/FL/Fl_Value_Input.H; sourceTree = SOURCE_ROOT; };
+ 35A18038F267FAA130353099 /* Fl_Value_Output.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Value_Output.H; path = ../../include/FL/Fl_Value_Output.H; sourceTree = SOURCE_ROOT; };
+ 2B06757260FC4C5B9969FD77 /* Fl_Value_Slider.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Value_Slider.H; path = ../../include/FL/Fl_Value_Slider.H; sourceTree = SOURCE_ROOT; };
+ F4E542DEE4A2E7981B887081 /* Fl_Widget.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Widget.H; path = ../../include/FL/Fl_Widget.H; sourceTree = SOURCE_ROOT; };
+ 991B3EC591BAEF40C68EDAFD /* Fl_Window.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Window.H; path = ../../include/FL/Fl_Window.H; sourceTree = SOURCE_ROOT; };
+ E540D88B8C0E6249DD134030 /* Fl_Wizard.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_Wizard.H; path = ../../include/FL/Fl_Wizard.H; sourceTree = SOURCE_ROOT; };
+ DA8F9C7F85D36A944119A8DE /* Fl_XBM_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_XBM_Image.H; path = ../../include/FL/Fl_XBM_Image.H; sourceTree = SOURCE_ROOT; };
+ CB4DDE219BB0AD27E17264FB /* Fl_XPM_Image.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl_XPM_Image.H; path = ../../include/FL/Fl_XPM_Image.H; sourceTree = SOURCE_ROOT; };
+ E95FB6E422E859D14DEF3312 /* Fl.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Fl.H; path = ../../include/FL/Fl.H; sourceTree = SOURCE_ROOT; };
+ D551D2105BF588B786DDFF2D /* forms.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = forms.H; path = ../../include/FL/forms.H; sourceTree = SOURCE_ROOT; };
+ D560F60B5C8E1AD032C30316 /* gl_draw.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = gl_draw.H; path = ../../include/FL/gl_draw.H; sourceTree = SOURCE_ROOT; };
+ A3003521FCAC53B1ED663C83 /* gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl.h; path = ../../include/FL/gl.h; sourceTree = SOURCE_ROOT; };
+ 514CC6A173DC99F08B6227EE /* gl2opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2opengl.h; path = ../../include/FL/gl2opengl.h; sourceTree = SOURCE_ROOT; };
+ F05FAB1256B3E1362F5D927A /* glu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glu.h; path = ../../include/FL/glu.h; sourceTree = SOURCE_ROOT; };
+ A946303E60016948D3713293 /* glut.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = glut.H; path = ../../include/FL/glut.H; sourceTree = SOURCE_ROOT; };
+ 45E41528CF088C637C194129 /* mac.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = mac.H; path = ../../include/FL/mac.H; sourceTree = SOURCE_ROOT; };
+ C0D369267559AB3E0894B1E9 /* math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = math.h; path = ../../include/FL/math.h; sourceTree = SOURCE_ROOT; };
+ D9CE10BC0CD03AADDF3FBE37 /* names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = names.h; path = ../../include/FL/names.h; sourceTree = SOURCE_ROOT; };
+ 144D91760D0FFF75663B09F0 /* win32.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = win32.H; path = ../../include/FL/win32.H; sourceTree = SOURCE_ROOT; };
+ C27A56AD403ACA4183729316 /* x.H */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = x.H; path = ../../include/FL/x.H; sourceTree = SOURCE_ROOT; };
+ 774B0776498B870A1AA45DA9 /* Xutf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Xutf8.h; path = ../../include/FL/Xutf8.h; sourceTree = SOURCE_ROOT; };
86C380FE76A739F296A44961 /* fltk3.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = fltk3.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CED790200D16A60047341619 /* all.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = all.h; path = ../../include/fltk3gl/all.h; sourceTree = SOURCE_ROOT; };
53A9932F3639B774F7BAEE86 /* fltk3gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fltk3gl.h; path = ../../include/fltk3gl/fltk3gl.h; sourceTree = SOURCE_ROOT; };
@@ -4741,42 +4741,42 @@
E3A581295196504551F65B80 /* utf8.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = utf8.app; sourceTree = BUILT_PRODUCTS_DIR; };
8C3E04CD4812A22D33320C59 /* valuators.fl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = valuators.fl; path = ../../test/valuators.fl; sourceTree = SOURCE_ROOT; };
F67F39FF8C416A255A6BC345 /* valuators.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = valuators.app; sourceTree = BUILT_PRODUCTS_DIR; };
- A14D4AAC1806F71D66DE7FE2 /* about_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about_panel.h; path = ../../fluid1/about_panel.h; sourceTree = SOURCE_ROOT; };
- 7AF92D80F77A243FD2B7C185 /* alignment_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alignment_panel.h; path = ../../fluid1/alignment_panel.h; sourceTree = SOURCE_ROOT; };
- 59BD7E913943B023749BBF18 /* CodeEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeEditor.h; path = ../../fluid1/CodeEditor.h; sourceTree = SOURCE_ROOT; };
- 97220675F7DB794F1B34AE89 /* comments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = comments.h; path = ../../fluid1/comments.h; sourceTree = SOURCE_ROOT; };
- 68A116FE7263B5C0042DFA76 /* Fl_Type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fl_Type.h; path = ../../fluid1/Fl_Type.h; sourceTree = SOURCE_ROOT; };
- 419968D8BC906476EBAF27C6 /* Fl_Widget_Type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fl_Widget_Type.h; path = ../../fluid1/Fl_Widget_Type.h; sourceTree = SOURCE_ROOT; };
- 91244E359154AF471A939B36 /* Fluid_Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fluid_Image.h; path = ../../fluid1/Fluid_Image.h; sourceTree = SOURCE_ROOT; };
- 31B425710FA67F1E409A0D6C /* function_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = function_panel.h; path = ../../fluid1/function_panel.h; sourceTree = SOURCE_ROOT; };
- C825B5ACCED7BBDEBA698E6C /* print_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = print_panel.h; path = ../../fluid1/print_panel.h; sourceTree = SOURCE_ROOT; };
- EB83E82D5F3890E9B63894DB /* Shortcut_Button.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shortcut_Button.h; path = ../../fluid1/Shortcut_Button.h; sourceTree = SOURCE_ROOT; };
- B0674CA75EFFA1F8A11C82A2 /* template_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = template_panel.h; path = ../../fluid1/template_panel.h; sourceTree = SOURCE_ROOT; };
- 229ACF1CF315FE3A2DC05A91 /* undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = undo.h; path = ../../fluid1/undo.h; sourceTree = SOURCE_ROOT; };
- 553C9CCA73F47236C6A651EE /* widget_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = widget_panel.h; path = ../../fluid1/widget_panel.h; sourceTree = SOURCE_ROOT; };
- ACD15C7E190BF0FDA03C174B /* about_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = about_panel.cxx; path = ../../fluid1/about_panel.cxx; sourceTree = SOURCE_ROOT; };
- C8CEB73F9DFD897A27CE543C /* align_widget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = align_widget.cxx; path = ../../fluid1/align_widget.cxx; sourceTree = SOURCE_ROOT; };
- 8ECFC2BBFAE5202B68FB537C /* alignment_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = alignment_panel.cxx; path = ../../fluid1/alignment_panel.cxx; sourceTree = SOURCE_ROOT; };
- 38CE7EA3E78D254AD5BC8BE8 /* code.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = code.cxx; path = ../../fluid1/code.cxx; sourceTree = SOURCE_ROOT; };
- 8735E62CE2B77E37D6B4B270 /* CodeEditor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CodeEditor.cxx; path = ../../fluid1/CodeEditor.cxx; sourceTree = SOURCE_ROOT; };
- 02922929B1A4738E06214A23 /* factory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = factory.cxx; path = ../../fluid1/factory.cxx; sourceTree = SOURCE_ROOT; };
- 4CE776F4DA28D8B2FC3511D7 /* file.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file.cxx; path = ../../fluid1/file.cxx; sourceTree = SOURCE_ROOT; };
- DC912646F7E4FD6A9E3B0551 /* Fl_Function_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Function_Type.cxx; path = ../../fluid1/Fl_Function_Type.cxx; sourceTree = SOURCE_ROOT; };
- 12CF60788D5D061D698AF983 /* Fl_Group_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Group_Type.cxx; path = ../../fluid1/Fl_Group_Type.cxx; sourceTree = SOURCE_ROOT; };
- F6030FA1B67E9CF6A95CCA63 /* Fl_Menu_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Menu_Type.cxx; path = ../../fluid1/Fl_Menu_Type.cxx; sourceTree = SOURCE_ROOT; };
- D5353FDF84406926BE510DF0 /* Fl_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Type.cxx; path = ../../fluid1/Fl_Type.cxx; sourceTree = SOURCE_ROOT; };
- 054C66854BBA7236992A4513 /* Fl_Widget_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Widget_Type.cxx; path = ../../fluid1/Fl_Widget_Type.cxx; sourceTree = SOURCE_ROOT; };
- 6895E5F0B27851C8897001E0 /* Fl_Window_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Window_Type.cxx; path = ../../fluid1/Fl_Window_Type.cxx; sourceTree = SOURCE_ROOT; };
- E001DE87F971F8210A3418DD /* Fluid_Image.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fluid_Image.cxx; path = ../../fluid1/Fluid_Image.cxx; sourceTree = SOURCE_ROOT; };
- AE76F5A10A6B3E9AA6BEF6EC /* fluid.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fluid.cxx; path = ../../fluid1/fluid.cxx; sourceTree = SOURCE_ROOT; };
- AC8B658782FE6E1208194982 /* function_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = function_panel.cxx; path = ../../fluid1/function_panel.cxx; sourceTree = SOURCE_ROOT; };
- 454F51FCD5F8287ADE39D60C /* print_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = print_panel.cxx; path = ../../fluid1/print_panel.cxx; sourceTree = SOURCE_ROOT; };
- 28DF9870F6B64173111A65EC /* template_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = template_panel.cxx; path = ../../fluid1/template_panel.cxx; sourceTree = SOURCE_ROOT; };
- BCA66AFD55F24BBB5A2531A5 /* undo.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = undo.cxx; path = ../../fluid1/undo.cxx; sourceTree = SOURCE_ROOT; };
- 6013E7F43A4EE8D511C23BDE /* widget_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = widget_panel.cxx; path = ../../fluid1/widget_panel.cxx; sourceTree = SOURCE_ROOT; };
+ 64D3967E6440C1162BD848E6 /* about_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about_panel.h; path = ../../fluid1/about_panel.h; sourceTree = SOURCE_ROOT; };
+ 726936FD87574BA0474FA559 /* alignment_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alignment_panel.h; path = ../../fluid1/alignment_panel.h; sourceTree = SOURCE_ROOT; };
+ 8831B5D01D4DE423E5A5562B /* CodeEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeEditor.h; path = ../../fluid1/CodeEditor.h; sourceTree = SOURCE_ROOT; };
+ 5E28382F4C5D2EB106CBC770 /* comments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = comments.h; path = ../../fluid1/comments.h; sourceTree = SOURCE_ROOT; };
+ 93A80C271399CB94946AC232 /* Fl_Type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fl_Type.h; path = ../../fluid1/Fl_Type.h; sourceTree = SOURCE_ROOT; };
+ 232B044C7042CFC77D3F49CA /* Fl_Widget_Type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fl_Widget_Type.h; path = ../../fluid1/Fl_Widget_Type.h; sourceTree = SOURCE_ROOT; };
+ BA4EE06777D3AC14443FE5C6 /* Fluid_Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fluid_Image.h; path = ../../fluid1/Fluid_Image.h; sourceTree = SOURCE_ROOT; };
+ D3C2240C5E7C3DBD74C47F44 /* function_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = function_panel.h; path = ../../fluid1/function_panel.h; sourceTree = SOURCE_ROOT; };
+ 7A67600005A692AE1784E9FF /* print_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = print_panel.h; path = ../../fluid1/print_panel.h; sourceTree = SOURCE_ROOT; };
+ 20D15C212C7DD1674F4B2C59 /* Shortcut_Button.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shortcut_Button.h; path = ../../fluid1/Shortcut_Button.h; sourceTree = SOURCE_ROOT; };
+ 19267BC894F0A636A7364186 /* template_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = template_panel.h; path = ../../fluid1/template_panel.h; sourceTree = SOURCE_ROOT; };
+ 16E78020D9B74C2947213769 /* undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = undo.h; path = ../../fluid1/undo.h; sourceTree = SOURCE_ROOT; };
+ 2FDFD955C81BF8BC37CB90F9 /* widget_panel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = widget_panel.h; path = ../../fluid1/widget_panel.h; sourceTree = SOURCE_ROOT; };
+ 306CCE5AAF53FB9DE6D10DE7 /* about_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = about_panel.cxx; path = ../../fluid1/about_panel.cxx; sourceTree = SOURCE_ROOT; };
+ C5CB8576EC6F3A4AC76A2473 /* align_widget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = align_widget.cxx; path = ../../fluid1/align_widget.cxx; sourceTree = SOURCE_ROOT; };
+ A9A7B2E62D2C441D1DBB7C6D /* alignment_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = alignment_panel.cxx; path = ../../fluid1/alignment_panel.cxx; sourceTree = SOURCE_ROOT; };
+ C30CED2F533ED69580B02428 /* code.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = code.cxx; path = ../../fluid1/code.cxx; sourceTree = SOURCE_ROOT; };
+ 0B02D03D8A6ADF61E43DA9BA /* CodeEditor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CodeEditor.cxx; path = ../../fluid1/CodeEditor.cxx; sourceTree = SOURCE_ROOT; };
+ AF0BE3D5CB73BB487AAFDC28 /* factory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = factory.cxx; path = ../../fluid1/factory.cxx; sourceTree = SOURCE_ROOT; };
+ 0938A9B51028FAB2E2CEB461 /* file.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file.cxx; path = ../../fluid1/file.cxx; sourceTree = SOURCE_ROOT; };
+ 2BEE2F213603496DFEA1F392 /* Fl_Function_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Function_Type.cxx; path = ../../fluid1/Fl_Function_Type.cxx; sourceTree = SOURCE_ROOT; };
+ E9723D36940403F60F821DB8 /* Fl_Group_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Group_Type.cxx; path = ../../fluid1/Fl_Group_Type.cxx; sourceTree = SOURCE_ROOT; };
+ 58F42D857558B9395E8CA60A /* Fl_Menu_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Menu_Type.cxx; path = ../../fluid1/Fl_Menu_Type.cxx; sourceTree = SOURCE_ROOT; };
+ 9CD4159F47065BB15CEDC4AC /* Fl_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Type.cxx; path = ../../fluid1/Fl_Type.cxx; sourceTree = SOURCE_ROOT; };
+ 0ECFA93DE93B2B36C18A8F11 /* Fl_Widget_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Widget_Type.cxx; path = ../../fluid1/Fl_Widget_Type.cxx; sourceTree = SOURCE_ROOT; };
+ 25DF3A0B599ACF39CE6B3D71 /* Fl_Window_Type.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Window_Type.cxx; path = ../../fluid1/Fl_Window_Type.cxx; sourceTree = SOURCE_ROOT; };
+ 962D10722CB44E2F0FE9F587 /* Fluid_Image.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fluid_Image.cxx; path = ../../fluid1/Fluid_Image.cxx; sourceTree = SOURCE_ROOT; };
+ ECF6093D3231712B6A3E2832 /* fluid.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fluid.cxx; path = ../../fluid1/fluid.cxx; sourceTree = SOURCE_ROOT; };
+ 521DDF390E6AB95575224FF2 /* function_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = function_panel.cxx; path = ../../fluid1/function_panel.cxx; sourceTree = SOURCE_ROOT; };
+ 860D9EFB3FDCE2EE2BB36737 /* print_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = print_panel.cxx; path = ../../fluid1/print_panel.cxx; sourceTree = SOURCE_ROOT; };
+ 823CB0A1F2F5C97F1C8139CA /* template_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = template_panel.cxx; path = ../../fluid1/template_panel.cxx; sourceTree = SOURCE_ROOT; };
+ 84D6B5EC20F2881DD3709722 /* undo.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = undo.cxx; path = ../../fluid1/undo.cxx; sourceTree = SOURCE_ROOT; };
+ 005C9D0D9231A0E0DA45CF8E /* widget_panel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = widget_panel.cxx; path = ../../fluid1/widget_panel.cxx; sourceTree = SOURCE_ROOT; };
DF4E2699FBE76FDC0E372501 /* Fluid1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fluid1.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 5E14846F0BA22D2B313756A3 /* hello.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hello.cxx; path = ../../test1/hello.cxx; sourceTree = SOURCE_ROOT; };
- A78900257F458940835EBF74 /* hello1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello1.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 67329B5738EFA0E9089F55CC /* hello.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hello.cxx; path = ../../test1/hello.cxx; sourceTree = SOURCE_ROOT; };
+ 2A2C0FEDD6E5ABB7D62EDDDC /* hello1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello1.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -5467,7 +5467,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- A5517669D7DF345813DE8F1D /* Frameworks */ = {
+ FF06914829FBF0E008F2A29F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -5558,7 +5558,7 @@
E3A581295196504551F65B80 /* utf8.app */,
F67F39FF8C416A255A6BC345 /* valuators.app */,
DF4E2699FBE76FDC0E372501 /* Fluid1.app */,
- A78900257F458940835EBF74 /* hello1.app */,
+ 2A2C0FEDD6E5ABB7D62EDDDC /* hello1.app */,
);
name = Products;
sourceTree = "<group>";
@@ -5867,7 +5867,7 @@
7679F6CC5391C705D9B921DA /* Window_fullscreen.cxx */,
B5E58AC3929D3ADCBE238301 /* Window_hotspot.cxx */,
C34CF806FAE9E39DDFD23D3B /* Window_iconize.cxx */,
- A84F18440208B2AA809D2871 /* Wizard.cxx */,
+ A84F18440208B2AA809D2871 /* WizardGroup.cxx */,
9A21D7EDE35664C4B0EDD969 /* XBMImage.cxx */,
302A3FA8AB59DE7E5255E28C /* XPMImage.cxx */,
671B96BA5D85D5C6EE31AB76 /* abort.cxx */,
@@ -5950,151 +5950,151 @@
name = Libraries;
sourceTree = "<group>";
};
- 087E08A7484AB2386AA7D827 /* FLTK1CompatibilityHeaders */ = {
+ AB73E96A20B4F760A2DD44D4 /* FLTK1CompatibilityHeaders */ = {
isa = PBXGroup;
children = (
- 439DEA85B7E505E2CD1268CC /* dirent.h */,
- B1A586E1B10239EF08BBA921 /* Enumerations.H */,
- 13B4A9244780367FF89EBBC5 /* filename.H */,
- C4862E6F77CCD703A70AFB40 /* Fl_Adjuster.H */,
- F219E7FD19BC6594B2E92F9E /* fl_ask.H */,
- BDDDD3055259A999F5AA732D /* Fl_Bitmap.H */,
- 4E03DB7CCA01BF60AF20F0C1 /* Fl_BMP_Image.H */,
- 7EDDF78D57064DC3E9BBB984 /* Fl_Box.H */,
- 21F2CBBC8739C8E763BE5128 /* Fl_Browser_.H */,
- B037AB19553B4C3A1FB3781A /* Fl_Browser.H */,
- AFC0DED5D95426476D2B623C /* Fl_Button.H */,
- 6DC17B501DA631C930C6AEC0 /* Fl_Cairo_Window.H */,
- 55B4CDCEF4B09787E7FD25BB /* Fl_Cairo.H */,
- EE19925D86B4E18A2ABA4B72 /* Fl_Chart.H */,
- BEA4818208D31ED50B1C56E7 /* Fl_Check_Browser.H */,
- 59F26B39132872DE688B56DE /* Fl_Check_Button.H */,
- DEEF6347E960D45D61A594F9 /* Fl_Choice.H */,
- 6DCE509AF493A23C55FE0FD9 /* Fl_Clock.H */,
- 0387AB541B67B2B60FD9919A /* Fl_Color_Chooser.H */,
- 5F065F11F3EE9685C02D295C /* Fl_Counter.H */,
- 751ED6A281FB39E15D693701 /* Fl_Device.H */,
- 046814A317B7073B7768385F /* Fl_Dial.H */,
- A7DBE2F499ABB0F4D6C7ECF6 /* Fl_Double_Window.H */,
- 476B2004F912E552D42CDE24 /* fl_draw.H */,
- 1C2E2951B883232E4EC0E841 /* Fl_Export.H */,
- 5F5909D1C69616EC92F5CE74 /* Fl_File_Browser.H */,
- 94D72137FD51BCF01BDD6F8F /* Fl_File_Chooser.H */,
- D8DCB158B7E8DE3C262743E3 /* Fl_File_Icon.H */,
- E573C4B7E9A494DEF90629D3 /* Fl_File_Input.H */,
- C56F2400B8E177E58CACDE80 /* Fl_Fill_Dial.H */,
- 343CA2F0A1A1B6A2D0A9A606 /* Fl_Fill_Slider.H */,
- 06DA1F2D064DBB6E7F70C21A /* Fl_Float_Input.H */,
- 7BC0D43FACFDE8AC7F386E83 /* Fl_FormsBitmap.H */,
- 80874C039FCA9D112DF53128 /* Fl_FormsPixmap.H */,
- 77A92658ED8711C0E7EC3D86 /* Fl_Free.H */,
- F9A9C12F7C34A2FD6D63FA27 /* Fl_GIF_Image.H */,
- 10E9C2D644478A5E0F81B2DF /* Fl_Gl_Window.H */,
- 9E4A0F8C30C6E23F7DC32434 /* Fl_Group.H */,
- 60E45BA2AB334C49760259F9 /* Fl_Help_Dialog.H */,
- 7309CA08B4E6334A6E5D23EA /* Fl_Help_View.H */,
- 545645285CE253BF821E40DD /* Fl_Hold_Browser.H */,
- 526DD9E09265B8764D47D621 /* Fl_Hor_Fill_Slider.H */,
- 2AD2D488CB2FB56DF2B58078 /* Fl_Hor_Nice_Slider.H */,
- 3E9BE577930F8C8926BFB839 /* Fl_Hor_Slider.H */,
- 3D61268FFEC92E286B5D9023 /* Fl_Hor_Value_Slider.H */,
- 466A05708D8BA9418FC4FD25 /* Fl_Image.H */,
- BE55456A4415AB1E89D7C0E1 /* Fl_Input_.H */,
- C2ED282027F1F15A04AC3081 /* Fl_Input_Choice.H */,
- 8E19A974EC938A6FDA453D30 /* Fl_Input.H */,
- AB036590CED7EE46D4FC6C2E /* Fl_Int_Input.H */,
- CD08D56A8407F3B5381E645C /* Fl_JPEG_Image.H */,
- D19D54396CD5FC8E69EECF84 /* Fl_Light_Button.H */,
- 05630C0935D39BDAE99C1488 /* Fl_Line_Dial.H */,
- 40777FF26EE380FDE756415B /* Fl_Menu_.H */,
- 3241B9A996EC15BB88C9CDAA /* Fl_Menu_Bar.H */,
- 13990D44168373A8BD062890 /* Fl_Menu_Button.H */,
- 339DB023BEF387CB77A08103 /* Fl_Menu_Item.H */,
- 8617C24879F7B3CA2652C529 /* Fl_Menu_Window.H */,
- DA0A53B1D87CC356ADBE7049 /* Fl_Menu.H */,
- 2F569BED58DFD0E0822975B3 /* fl_message.H */,
- 578C7EEA0DD33349A6E04D9A /* Fl_Multi_Browser.H */,
- 8FB78C0FE8925BA5FCD43C25 /* Fl_Multi_Label.H */,
- D1B63C925797FF9711133994 /* Fl_Multiline_Input.H */,
- F14D9B932EF4A975FD60E87B /* Fl_Multiline_Output.H */,
- B882FDD5DC45640FFB7C29C7 /* Fl_Native_File_Chooser.H */,
- 93B4695B7D268EBE9B2BDE58 /* Fl_Nice_Slider.H */,
- DB23D2A5E2888F596CD39DDE /* Fl_Object.H */,
- 07AF912D35A52DAC6B7203BA /* Fl_Output.H */,
- 18DD5DAA4B3B10040867B380 /* Fl_Overlay_Window.H */,
- 1EF0C4F284DC1493DC386A4E /* Fl_Pack.H */,
- EB31FE1AB75A9F788FAAB39D /* Fl_Paged_Device.H */,
- 9075C1D161BFFEC0703ED7D8 /* Fl_Pixmap.H */,
- 87B8772E27F71EEDAD947533 /* Fl_Plugin.H */,
- 1014A2127B6531E799CFC91E /* Fl_PNG_Image.H */,
- F87952A979BDF75CDF550CFB /* Fl_PNM_Image.H */,
- 214F4DA7D74384A8EA92B1A6 /* Fl_Positioner.H */,
- 2283A6687E2704797E27DB67 /* Fl_PostScript.H */,
- EBA784ED48809DC8FE06A277 /* Fl_Preferences.H */,
- 30EF7AAA16AA5596148968E0 /* Fl_Printer.H */,
- B7D35985B64D3AA65D627D45 /* Fl_Progress.H */,
- 53B237C1A9AFC215D3599963 /* Fl_Radio_Button.H */,
- 825FD983F073C0759CAB8CA6 /* Fl_Radio_Light_Button.H */,
- F5493C73D7EA50E1A1664A25 /* Fl_Radio_Round_Button.H */,
- 0E58FB5220CCDAB8C72E06AD /* Fl_Repeat_Button.H */,
- 720EF8D754579743BEA87E1A /* Fl_Return_Button.H */,
- 6161F4A36F804A380623236B /* Fl_RGB_Image.H */,
- F6B574F98BE2F4BA0D2D8A0C /* Fl_Roller.H */,
- 896FD44A049C4D2DC7CD1550 /* Fl_Round_Button.H */,
- AF92E4FE86ABDFE3D7027CFC /* Fl_Round_Clock.H */,
- 230472B81D51A13668C6E270 /* Fl_Scroll.H */,
- 645CF555D66678807F68E63F /* Fl_Scrollbar.H */,
- C8A3EB4B97498DF207FA6463 /* Fl_Secret_Input.H */,
- 19B339FBDAB257DAF0AEC8A5 /* Fl_Select_Browser.H */,
- 95BDE5A2E708ED36D3593CF5 /* Fl_Shared_Image.H */,
- 6AA57F121E8D71E89BCB72CC /* fl_show_colormap.H */,
- 488E0B7DE9A923DAE61FF4CA /* fl_show_input.H */,
- 9DEEB873D6A4926F002C2195 /* Fl_Simple_Counter.H */,
- 63AA3252FC4440BF08F5EB73 /* Fl_Single_Window.H */,
- E3F28722F4B0D76C3894B847 /* Fl_Slider.H */,
- 54DFCB067D157B2B6E227147 /* Fl_Spinner.H */,
- CCE1F220EA45EBB59A5194EC /* Fl_Sys_Menu_Bar.H */,
- 7DF0FCA833DF744E4C48C918 /* Fl_Table_Row.H */,
- 3B18C086D0DFBD3715B01BFB /* Fl_Table.H */,
- 42A9E6B22DC843F52F524F47 /* Fl_Tabs.H */,
- 97184624A3F7DE2B6CD96563 /* Fl_Text_Buffer.H */,
- FD0D12C7DC092F03F2E346EF /* Fl_Text_Display.H */,
- 27DB0008CB40F74982D862B1 /* Fl_Text_Editor.H */,
- BE9AC0CC02D28D4F7342082B /* Fl_Tile.H */,
- E3C687781CE6F0D0C89DE7F4 /* Fl_Tiled_Image.H */,
- 65FCC43071F84259EEDCBF51 /* Fl_Timer.H */,
- 32981B5BBD19645E12681E62 /* Fl_Toggle_Button.H */,
- 063A1979FD4A43332C5E8638 /* Fl_Toggle_Light_Button.H */,
- 5D0DE7E03351EF5C859F0173 /* Fl_Toggle_Round_Button.H */,
- 7F44D2B8F644B32A74DC298A /* Fl_Tooltip.H */,
- 8FC0A58335CC7B37A9EB1A39 /* Fl_Tree_Item_Array.H */,
- F2A58128F6C32FA8C1AE9BF9 /* Fl_Tree_Item.H */,
- 7A70BCF3E30FA2957F50EBF2 /* Fl_Tree_Prefs.H */,
- FF90DB87E6CF7C6E1D0D9187 /* Fl_Tree.H */,
- 98333F502D6F3EAF11804409 /* fl_types.h */,
- B147194C498A0A5C8F2D8414 /* fl_utf8.h */,
- 65D052392932FC4922DF688C /* Fl_Valuator.H */,
- A238A124592C9AC9F1616582 /* Fl_Value_Input.H */,
- 4DD87BAD1636E1605A6766CF /* Fl_Value_Output.H */,
- 2AA93056FE96AD23E3ED9224 /* Fl_Value_Slider.H */,
- 24E9531EEF94E11B6A006D4B /* Fl_Widget.H */,
- DD267E3F127787BAC7DEC6E0 /* Fl_Window.H */,
- 43B659A38F5B9A6EC4970FA7 /* Fl_Wizard.H */,
- E34B76A8E7FAFB6F5A9AE6E5 /* Fl_XBM_Image.H */,
- 0CCA35FA3E2B6CD8D4D7174C /* Fl_XPM_Image.H */,
- 4737F685D8B620BE3E364DFD /* Fl.H */,
- 09CEB7C1FB5534E5EAADF81E /* forms.H */,
- 9F66C80FA862C5CC109D65C6 /* gl_draw.H */,
- DED76E7604C977F157865A6E /* gl.h */,
- 440037402CCD9746CA87C7EF /* gl2opengl.h */,
- 24CBD81B778F5F40886AF4F2 /* glu.h */,
- 0FDE8890E7E693799703428F /* glut.H */,
- 7F47EEE9D81BC6F2DFB6687B /* mac.H */,
- 4E4A1470B8A2CF8EFEE0604A /* math.h */,
- 33E47A9280F49940E23BC53F /* names.h */,
- BD04331D0DAE8BA61546C6E9 /* win32.H */,
- 177D0E2DD87973D409A5B211 /* x.H */,
- B1EA671F137EC075DA390451 /* Xutf8.h */,
+ 69C2640C2C5ECAF1C7E312A1 /* dirent.h */,
+ 2A61539D3EBD007731E29C63 /* Enumerations.H */,
+ 4DC4609B92F2D7EE1FDA68C5 /* filename.H */,
+ 00B302AA194587610664E6BA /* Fl_Adjuster.H */,
+ 0CE22D9802C992DCB7783EDC /* fl_ask.H */,
+ E77B050FE3494F0CB9973606 /* Fl_Bitmap.H */,
+ 6F56D851D0A15061D5946F08 /* Fl_BMP_Image.H */,
+ BEB1C8ABCFC203BE03935E85 /* Fl_Box.H */,
+ 71313C2D94965DAF677BC055 /* Fl_Browser_.H */,
+ F732903CD6C6FA6E40F29B6C /* Fl_Browser.H */,
+ 4AB2C29065C6F227129F3127 /* Fl_Button.H */,
+ 85842AFD5224FD34160CDB9D /* Fl_Cairo_Window.H */,
+ 5C06B798B6F732CA8A9E01C8 /* Fl_Cairo.H */,
+ DC0E6F03D49478A28DE4B358 /* Fl_Chart.H */,
+ 27F4C25CD138343780F5B6CE /* Fl_Check_Browser.H */,
+ 91F1EFD856FBEAAE31385807 /* Fl_Check_Button.H */,
+ DFDEF18502380DAB06EC9DD0 /* Fl_Choice.H */,
+ 92027C6C9B7C86F938351ECF /* Fl_Clock.H */,
+ 55D02511AEA8D4201C372B91 /* Fl_Color_Chooser.H */,
+ D241A08F70ED1F9E0093E79C /* Fl_Counter.H */,
+ 65FF490FE9113F8EE81F233F /* Fl_Device.H */,
+ CBE81F3C581680C49B41F7F1 /* Fl_Dial.H */,
+ 87F0AFB3A41B67F0CBC79A70 /* Fl_Double_Window.H */,
+ F7A42D5C15154741C59E003C /* fl_draw.H */,
+ BE71AC43179373EE75B58A45 /* Fl_Export.H */,
+ 058CF809E8D182747AF5F6AE /* Fl_File_Browser.H */,
+ E61D7ACA404961CC2CDAEE9F /* Fl_File_Chooser.H */,
+ 78D3101F571600871964C2D6 /* Fl_File_Icon.H */,
+ 685EAC951ACBB169C208B102 /* Fl_File_Input.H */,
+ 6B3F4A01294B4032421E5363 /* Fl_Fill_Dial.H */,
+ 2C4D6B12586FAE028394176E /* Fl_Fill_Slider.H */,
+ EEBE1CEBFD43C4F061F5B202 /* Fl_Float_Input.H */,
+ 332FE193FCC1EF68990A5AD4 /* Fl_FormsBitmap.H */,
+ DB27CF0A2151280913575F93 /* Fl_FormsPixmap.H */,
+ 09229795A7E8ACF905079D5E /* Fl_Free.H */,
+ 8279907DE5F20C88EEBE4DF9 /* Fl_GIF_Image.H */,
+ D6B0E605662B681E14976AAB /* Fl_Gl_Window.H */,
+ C4990598C2720AA2F95673FB /* Fl_Group.H */,
+ BB525EC719F2E59F58A7ECE9 /* Fl_Help_Dialog.H */,
+ CBB24D4125A3C325617AB3E5 /* Fl_Help_View.H */,
+ 7CA5999FE08C978ABC8CFFAE /* Fl_Hold_Browser.H */,
+ D2C99DC9193E6A63910A7968 /* Fl_Hor_Fill_Slider.H */,
+ BD2E49722D1C39BF1A403B12 /* Fl_Hor_Nice_Slider.H */,
+ E7DB83951C5AAB5731026A71 /* Fl_Hor_Slider.H */,
+ A920632C391B871DA0A0E658 /* Fl_Hor_Value_Slider.H */,
+ 817C39C4AC25E54409493656 /* Fl_Image.H */,
+ 595C6BDED7E0A8F4E5F3F560 /* Fl_Input_.H */,
+ E44655EF447B741518B014FF /* Fl_Input_Choice.H */,
+ 3EBBDADB5EF5A2D4007649E7 /* Fl_Input.H */,
+ B4E3234B3A6621D860C34C83 /* Fl_Int_Input.H */,
+ AC005208484203D2D5ADAFCB /* Fl_JPEG_Image.H */,
+ AE6F44AAE35658A34D8D751C /* Fl_Light_Button.H */,
+ 51D58233E27816478FEE5D07 /* Fl_Line_Dial.H */,
+ A77E94067A8A1D24F5F0435E /* Fl_Menu_.H */,
+ 6CEAABB6FC6325E1DBE9700C /* Fl_Menu_Bar.H */,
+ 5A734DC58B7CD71D291E6F88 /* Fl_Menu_Button.H */,
+ 62771243064473A7FF5FD90F /* Fl_Menu_Item.H */,
+ C1C8D29F56834FC6A107181A /* Fl_Menu_Window.H */,
+ 7902E947B20BA38F82AA343A /* Fl_Menu.H */,
+ 5CB532035A71674B34A0B587 /* fl_message.H */,
+ 49897D39A4A3EE8F26E9E799 /* Fl_Multi_Browser.H */,
+ F5A281BE9B792478A463B364 /* Fl_Multi_Label.H */,
+ 038DF62263523AD26F0914F7 /* Fl_Multiline_Input.H */,
+ 94988F7EECD00403D2066F43 /* Fl_Multiline_Output.H */,
+ CDE17641B8319026AE2B5EBB /* Fl_Native_File_Chooser.H */,
+ A1FC281A358355A0713C7288 /* Fl_Nice_Slider.H */,
+ 3C311650275E771ACB11D045 /* Fl_Object.H */,
+ B80E807F36FD92CEB48316FC /* Fl_Output.H */,
+ 82A293C1F7DF7BA71DABD3BB /* Fl_Overlay_Window.H */,
+ 29FCB84A346AD43E101DEC3E /* Fl_Pack.H */,
+ 95C56134C758F02F1F0EF7F2 /* Fl_Paged_Device.H */,
+ A6F9E504EA5F550300B75683 /* Fl_Pixmap.H */,
+ 0102E6CCF6280F255D9AA91C /* Fl_Plugin.H */,
+ 5467CA024E9383D4E7653D80 /* Fl_PNG_Image.H */,
+ DED22221073FF943CCCCFBFE /* Fl_PNM_Image.H */,
+ E9578F0FFDE406AF0C74F13E /* Fl_Positioner.H */,
+ CECC3FE216A0682640B43C4E /* Fl_PostScript.H */,
+ E9A3D7D3E6F498C2C46AB9BB /* Fl_Preferences.H */,
+ 1DAE8C73702CE0BB56F14E60 /* Fl_Printer.H */,
+ B1FF391AECD6C5B8061ADABF /* Fl_Progress.H */,
+ 66D17798853EA874252C6D65 /* Fl_Radio_Button.H */,
+ 966E2FF91F3467B361B6E16B /* Fl_Radio_Light_Button.H */,
+ 8E4CFCE3B850F4FD0A527E59 /* Fl_Radio_Round_Button.H */,
+ EE72F5D68BD65EB1E9F4782C /* Fl_Repeat_Button.H */,
+ B3BBE04F7C92FA3B28F724EC /* Fl_Return_Button.H */,
+ 466AD506D4D6762D81A862E2 /* Fl_RGB_Image.H */,
+ 5FDBBC03AEA34E4EEAA7FBC7 /* Fl_Roller.H */,
+ 69F20A36BB53FC3AF8588C9A /* Fl_Round_Button.H */,
+ F1F4A71594A073F418560995 /* Fl_Round_Clock.H */,
+ 92232DB006AC569BF640873F /* Fl_Scroll.H */,
+ 635FF7C56A5EA8BAF16CD8C0 /* Fl_Scrollbar.H */,
+ B3C148D99C258B9FF22A5727 /* Fl_Secret_Input.H */,
+ 94AA62F05929DE9224CBF735 /* Fl_Select_Browser.H */,
+ BAFF106B06358E4A609B3603 /* Fl_Shared_Image.H */,
+ 4518F2ABE2E70C3D07FCB294 /* fl_show_colormap.H */,
+ B387DD9EAF7DFB71B96E8A80 /* fl_show_input.H */,
+ 59CCADE43992C44AF13AB964 /* Fl_Simple_Counter.H */,
+ 3626245257FD9D66D9804FDE /* Fl_Single_Window.H */,
+ 954820449B90567D9E96BE7F /* Fl_Slider.H */,
+ 461F9B57C5B1974DCAD17CF7 /* Fl_Spinner.H */,
+ F9DD9F6BEEDBE419712531A8 /* Fl_Sys_Menu_Bar.H */,
+ 172A93EC6CEA842985B5CDAE /* Fl_Table_Row.H */,
+ 8552D223DB794B3B8440E031 /* Fl_Table.H */,
+ DB3D34A155A44817966E5408 /* Fl_Tabs.H */,
+ 3C1743152E54AB995BE69A64 /* Fl_Text_Buffer.H */,
+ DA86EE88CED70542546C574D /* Fl_Text_Display.H */,
+ 91C64F56C5C66C5A6A58C7A4 /* Fl_Text_Editor.H */,
+ 5A9B1312F3DD6B28B098E8EA /* Fl_Tile.H */,
+ 3B55011D3AA5D9BCF4C7E94A /* Fl_Tiled_Image.H */,
+ 3E03CB40C4EDEA0D94DC95C7 /* Fl_Timer.H */,
+ F482A9D31687CDC37521E61C /* Fl_Toggle_Button.H */,
+ A41E656F6E814AD04230FFA3 /* Fl_Toggle_Light_Button.H */,
+ 69A3CA0C3A897CC1E5F1F087 /* Fl_Toggle_Round_Button.H */,
+ 18970CCA07610CC910212A36 /* Fl_Tooltip.H */,
+ 3D31C2BD61250F8A8A4979F7 /* Fl_Tree_Item_Array.H */,
+ 0FB68D65062FF711B5F43FC3 /* Fl_Tree_Item.H */,
+ B57FD83797A0DD89BCA0EE19 /* Fl_Tree_Prefs.H */,
+ FCD4D0F3E5BA3ABF6744AFF7 /* Fl_Tree.H */,
+ 35D125ED0115B48E04288485 /* fl_types.h */,
+ 3B6E01EB829DC7CB277B7DD3 /* fl_utf8.h */,
+ 3286D14FDDEE0E9EC9B23729 /* Fl_Valuator.H */,
+ FFFB00A23722721DBEF11545 /* Fl_Value_Input.H */,
+ 35A18038F267FAA130353099 /* Fl_Value_Output.H */,
+ 2B06757260FC4C5B9969FD77 /* Fl_Value_Slider.H */,
+ F4E542DEE4A2E7981B887081 /* Fl_Widget.H */,
+ 991B3EC591BAEF40C68EDAFD /* Fl_Window.H */,
+ E540D88B8C0E6249DD134030 /* Fl_Wizard.H */,
+ DA8F9C7F85D36A944119A8DE /* Fl_XBM_Image.H */,
+ CB4DDE219BB0AD27E17264FB /* Fl_XPM_Image.H */,
+ E95FB6E422E859D14DEF3312 /* Fl.H */,
+ D551D2105BF588B786DDFF2D /* forms.H */,
+ D560F60B5C8E1AD032C30316 /* gl_draw.H */,
+ A3003521FCAC53B1ED663C83 /* gl.h */,
+ 514CC6A173DC99F08B6227EE /* gl2opengl.h */,
+ F05FAB1256B3E1362F5D927A /* glu.h */,
+ A946303E60016948D3713293 /* glut.H */,
+ 45E41528CF088C637C194129 /* mac.H */,
+ C0D369267559AB3E0894B1E9 /* math.h */,
+ D9CE10BC0CD03AADDF3FBE37 /* names.h */,
+ 144D91760D0FFF75663B09F0 /* win32.H */,
+ C27A56AD403ACA4183729316 /* x.H */,
+ 774B0776498B870A1AA45DA9 /* Xutf8.h */,
);
name = FLTK1CompatibilityHeaders;
sourceTree = "<group>";
@@ -6105,7 +6105,7 @@
C2F00625A4037FEE3D17629D /* Headers */,
91990322480BD14240EE5AB1 /* Sources */,
5495DB626BB4FF300FD9E613 /* Libraries */,
- 087E08A7484AB2386AA7D827 /* FLTK1CompatibilityHeaders */,
+ AB73E96A20B4F760A2DD44D4 /* FLTK1CompatibilityHeaders */,
);
name = fltk3;
sourceTree = "<group>";
@@ -7050,19 +7050,19 @@
B2CB319BEE83281D54619F47 /* Headers */ = {
isa = PBXGroup;
children = (
- A14D4AAC1806F71D66DE7FE2 /* about_panel.h */,
- 7AF92D80F77A243FD2B7C185 /* alignment_panel.h */,
- 59BD7E913943B023749BBF18 /* CodeEditor.h */,
- 97220675F7DB794F1B34AE89 /* comments.h */,
- 68A116FE7263B5C0042DFA76 /* Fl_Type.h */,
- 419968D8BC906476EBAF27C6 /* Fl_Widget_Type.h */,
- 91244E359154AF471A939B36 /* Fluid_Image.h */,
- 31B425710FA67F1E409A0D6C /* function_panel.h */,
- C825B5ACCED7BBDEBA698E6C /* print_panel.h */,
- EB83E82D5F3890E9B63894DB /* Shortcut_Button.h */,
- B0674CA75EFFA1F8A11C82A2 /* template_panel.h */,
- 229ACF1CF315FE3A2DC05A91 /* undo.h */,
- 553C9CCA73F47236C6A651EE /* widget_panel.h */,
+ 64D3967E6440C1162BD848E6 /* about_panel.h */,
+ 726936FD87574BA0474FA559 /* alignment_panel.h */,
+ 8831B5D01D4DE423E5A5562B /* CodeEditor.h */,
+ 5E28382F4C5D2EB106CBC770 /* comments.h */,
+ 93A80C271399CB94946AC232 /* Fl_Type.h */,
+ 232B044C7042CFC77D3F49CA /* Fl_Widget_Type.h */,
+ BA4EE06777D3AC14443FE5C6 /* Fluid_Image.h */,
+ D3C2240C5E7C3DBD74C47F44 /* function_panel.h */,
+ 7A67600005A692AE1784E9FF /* print_panel.h */,
+ 20D15C212C7DD1674F4B2C59 /* Shortcut_Button.h */,
+ 19267BC894F0A636A7364186 /* template_panel.h */,
+ 16E78020D9B74C2947213769 /* undo.h */,
+ 2FDFD955C81BF8BC37CB90F9 /* widget_panel.h */,
);
name = Headers;
sourceTree = "<group>";
@@ -7070,26 +7070,26 @@
5410377A7E863F2E21C6EC86 /* Sources */ = {
isa = PBXGroup;
children = (
- ACD15C7E190BF0FDA03C174B /* about_panel.cxx */,
- C8CEB73F9DFD897A27CE543C /* align_widget.cxx */,
- 8ECFC2BBFAE5202B68FB537C /* alignment_panel.cxx */,
- 38CE7EA3E78D254AD5BC8BE8 /* code.cxx */,
- 8735E62CE2B77E37D6B4B270 /* CodeEditor.cxx */,
- 02922929B1A4738E06214A23 /* factory.cxx */,
- 4CE776F4DA28D8B2FC3511D7 /* file.cxx */,
- DC912646F7E4FD6A9E3B0551 /* Fl_Function_Type.cxx */,
- 12CF60788D5D061D698AF983 /* Fl_Group_Type.cxx */,
- F6030FA1B67E9CF6A95CCA63 /* Fl_Menu_Type.cxx */,
- D5353FDF84406926BE510DF0 /* Fl_Type.cxx */,
- 054C66854BBA7236992A4513 /* Fl_Widget_Type.cxx */,
- 6895E5F0B27851C8897001E0 /* Fl_Window_Type.cxx */,
- E001DE87F971F8210A3418DD /* Fluid_Image.cxx */,
- AE76F5A10A6B3E9AA6BEF6EC /* fluid.cxx */,
- AC8B658782FE6E1208194982 /* function_panel.cxx */,
- 454F51FCD5F8287ADE39D60C /* print_panel.cxx */,
- 28DF9870F6B64173111A65EC /* template_panel.cxx */,
- BCA66AFD55F24BBB5A2531A5 /* undo.cxx */,
- 6013E7F43A4EE8D511C23BDE /* widget_panel.cxx */,
+ 306CCE5AAF53FB9DE6D10DE7 /* about_panel.cxx */,
+ C5CB8576EC6F3A4AC76A2473 /* align_widget.cxx */,
+ A9A7B2E62D2C441D1DBB7C6D /* alignment_panel.cxx */,
+ C30CED2F533ED69580B02428 /* code.cxx */,
+ 0B02D03D8A6ADF61E43DA9BA /* CodeEditor.cxx */,
+ AF0BE3D5CB73BB487AAFDC28 /* factory.cxx */,
+ 0938A9B51028FAB2E2CEB461 /* file.cxx */,
+ 2BEE2F213603496DFEA1F392 /* Fl_Function_Type.cxx */,
+ E9723D36940403F60F821DB8 /* Fl_Group_Type.cxx */,
+ 58F42D857558B9395E8CA60A /* Fl_Menu_Type.cxx */,
+ 9CD4159F47065BB15CEDC4AC /* Fl_Type.cxx */,
+ 0ECFA93DE93B2B36C18A8F11 /* Fl_Widget_Type.cxx */,
+ 25DF3A0B599ACF39CE6B3D71 /* Fl_Window_Type.cxx */,
+ 962D10722CB44E2F0FE9F587 /* Fluid_Image.cxx */,
+ ECF6093D3231712B6A3E2832 /* fluid.cxx */,
+ 521DDF390E6AB95575224FF2 /* function_panel.cxx */,
+ 860D9EFB3FDCE2EE2BB36737 /* print_panel.cxx */,
+ 823CB0A1F2F5C97F1C8139CA /* template_panel.cxx */,
+ 84D6B5EC20F2881DD3709722 /* undo.cxx */,
+ 005C9D0D9231A0E0DA45CF8E /* widget_panel.cxx */,
);
name = Sources;
sourceTree = "<group>";
@@ -7111,19 +7111,19 @@
name = Fluid1;
sourceTree = "<group>";
};
- 9A781D1AAE60CFF74D1C178E /* hello1 */ = {
+ 0DBCFC132E4198E749B40DE0 /* hello1 */ = {
isa = PBXGroup;
children = (
- 5E14846F0BA22D2B313756A3 /* hello.cxx */,
+ 67329B5738EFA0E9089F55CC /* hello.cxx */,
);
name = hello1;
sourceTree = "<group>";
};
- 345BE42F22286060671BB5B7 /* FLTK1CompatibilityTests */ = {
+ C7412C67FFC5B8E0BDD01D70 /* FLTK1CompatibilityTests */ = {
isa = PBXGroup;
children = (
9C81FC9E8877722D98478169 /* Fluid1 */,
- 9A781D1AAE60CFF74D1C178E /* hello1 */,
+ 0DBCFC132E4198E749B40DE0 /* hello1 */,
);
name = FLTK1CompatibilityTests;
sourceTree = "<group>";
@@ -7134,7 +7134,7 @@
137F861A12AE20DE1A17F780 /* Applications */,
AFD010B3963A1F9730BD3B73 /* Libraries */,
5B388C4AE4DDC4A9DA628E4D /* Tests */,
- 345BE42F22286060671BB5B7 /* FLTK1CompatibilityTests */,
+ C7412C67FFC5B8E0BDD01D70 /* FLTK1CompatibilityTests */,
A3B55F76BA67AD3D583213A1 /* Products */,
);
name = FLTK;
@@ -9004,24 +9004,24 @@
productReference = DF4E2699FBE76FDC0E372501 /* Fluid1.app */;
productType = "com.apple.product-type.application";
};
- 9C2207246743391358D3DF8A /* hello1 */ = {
+ A6770FA5791A03ABA22BB717 /* hello1 */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 61FD002C359278634234D50D /* Build configuration list for PBXNativeTarget "hello1" */;
+ buildConfigurationList = A876391F51078D8AB70A641A /* Build configuration list for PBXNativeTarget "hello1" */;
buildPhases = (
- 0DB67870160841E113EF9502 /* Resources */,
- 2E7C77F56773F442DC24351F /* Sources */,
- A5517669D7DF345813DE8F1D /* Frameworks */,
- 61B6DC735A28DB6F9A42AF6F /* CopyFiles */,
+ EBB6C61EE814096190C7050E /* Resources */,
+ 69C7BE9873DAB24E14654B59 /* Sources */,
+ FF06914829FBF0E008F2A29F /* Frameworks */,
+ 7A31AD2EE86FD99225F3440C /* CopyFiles */,
);
buildRules = (
- FD4ECA653484C2FBC1EA555F /* PBXBuildRule */,
+ 5448D2856BBC95A8FE0610CE /* PBXBuildRule */,
);
dependencies = (
78C56F7A323EC19AFB427676 /* fltk3 */,
);
name = hello1;
productName = hello1;
- productReference = A78900257F458940835EBF74 /* hello1.app */;
+ productReference = 2A2C0FEDD6E5ABB7D62EDDDC /* hello1.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -9121,7 +9121,7 @@
FAD13873C55C68CA34763ED0 /* utf8 */,
5392AA2CD0F94CD3E4A31577 /* valuators */,
E7B7690D3DC6F55F6E77EB13 /* Fluid1 */,
- 9C2207246743391358D3DF8A /* hello1 */,
+ A6770FA5791A03ABA22BB717 /* hello1 */,
);
};
/* End PBXProject section */
@@ -9666,7 +9666,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 0DB67870160841E113EF9502 /* Resources */ = {
+ EBB6C61EE814096190C7050E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -9795,7 +9795,7 @@
C62F4F9E13B7E78D46033106 /* Window_fullscreen.cxx in Sources */,
A76E032AD9B13380163BB493 /* Window_hotspot.cxx in Sources */,
E373B7F46315E6D1F6D255E9 /* Window_iconize.cxx in Sources */,
- 72DEB4A9569C0F11C103EF90 /* Wizard.cxx in Sources */,
+ 72DEB4A9569C0F11C103EF90 /* WizardGroup.cxx in Sources */,
F4974EC29CF042D6AEB0CC0D /* XBMImage.cxx in Sources */,
A7891F57744007954D70C5D4 /* XPMImage.cxx in Sources */,
230F7BA09DDFC95489B89DFF /* abort.cxx in Sources */,
@@ -10570,33 +10570,33 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 98FEA99FF5D417760C05B0AC /* about_panel.cxx in Sources */,
- 9AACE33F046D7DFFAD12F289 /* align_widget.cxx in Sources */,
- 3BEBFD3CA30A0FBD54024733 /* alignment_panel.cxx in Sources */,
- FB120483438F0030E673CCDD /* code.cxx in Sources */,
- 2C5C05846D84B2B61448D6FC /* CodeEditor.cxx in Sources */,
- 87F59897DDE5A82A887DBD9F /* factory.cxx in Sources */,
- FB3511138D51CD7ABBDC45BC /* file.cxx in Sources */,
- CC6ACE19414238882783B98E /* Fl_Function_Type.cxx in Sources */,
- D5BF8F9771531AEBB51AFB08 /* Fl_Group_Type.cxx in Sources */,
- 90A6580F5E546F4A86240B24 /* Fl_Menu_Type.cxx in Sources */,
- 941139DB8ED1F0882F1C1E3A /* Fl_Type.cxx in Sources */,
- D5D5232D75CA9B15D024E066 /* Fl_Widget_Type.cxx in Sources */,
- 3C494A99A375BC093A0FC7FA /* Fl_Window_Type.cxx in Sources */,
- B248C2FBD85135C32A56C6F6 /* Fluid_Image.cxx in Sources */,
- 499AE4EDF0C6D87B8F95DAD5 /* fluid.cxx in Sources */,
- 220FB0CD2E0D573E602D7BCD /* function_panel.cxx in Sources */,
- 52154211513B6338E22DC1EB /* template_panel.cxx in Sources */,
- 9052CD0A4CEFCD66CD7C398A /* undo.cxx in Sources */,
- 26D9C9FD5E5FB96DAB7EB27C /* widget_panel.cxx in Sources */,
+ 286E1BECA332E18FFB5E8D5A /* about_panel.cxx in Sources */,
+ 9D3D5714162C973B87D0869B /* align_widget.cxx in Sources */,
+ ADD6A2D4CB9ACCA2C246C168 /* alignment_panel.cxx in Sources */,
+ 045289856CA56E8AF10AAE4E /* code.cxx in Sources */,
+ 445FC3218A91EB6D0019408C /* CodeEditor.cxx in Sources */,
+ 3F826F26E0A8ADA2E0337AB9 /* factory.cxx in Sources */,
+ 796D9FBAC3FC7CDF524791BC /* file.cxx in Sources */,
+ A2C02CC7955344573D9A1BE7 /* Fl_Function_Type.cxx in Sources */,
+ A01BA10AB474EF6177B9C833 /* Fl_Group_Type.cxx in Sources */,
+ 3E26787BC7C636971F47DB60 /* Fl_Menu_Type.cxx in Sources */,
+ 40EBCD429B40E5CF74C1D8F0 /* Fl_Type.cxx in Sources */,
+ B4E8EE6D4842A2C991320A52 /* Fl_Widget_Type.cxx in Sources */,
+ 1E67B658780514E04B65E01F /* Fl_Window_Type.cxx in Sources */,
+ 268F7ED7F499BCA9FAD1BD92 /* Fluid_Image.cxx in Sources */,
+ 90FBAAF4DC21EBD7CD3A9671 /* fluid.cxx in Sources */,
+ 1B6D836B56E0E57994D31417 /* function_panel.cxx in Sources */,
+ 24335B202003A9F9472EBA8A /* template_panel.cxx in Sources */,
+ ADDF50A553020B87963DB494 /* undo.cxx in Sources */,
+ F13AB62EBD91CAC5BA974D76 /* widget_panel.cxx in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
- 2E7C77F56773F442DC24351F /* Sources */ = {
+ 69C7BE9873DAB24E14654B59 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 02BBDAFADA373D9076DB6E47 /* hello.cxx in Sources */,
+ 0BD4FB8DBDFE375AC93A7242 /* hello.cxx in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -17175,7 +17175,7 @@
};
name = Release;
};
- 9084B23CC445BF6C8F372352 /* Debug */ = {
+ 0F717A36F09D77DC65EB545A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -17211,7 +17211,7 @@
};
name = Debug;
};
- B1D684A99F575F3ED53439A8 /* Release */ = {
+ E4E57B16FEE492FF1058385D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -17968,11 +17968,11 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 61FD002C359278634234D50D /* Build configuration list for PBXNativeTarget "hello1" */ = {
+ A876391F51078D8AB70A641A /* Build configuration list for PBXNativeTarget "hello1" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 9084B23CC445BF6C8F372352 /* Debug */,
- B1D684A99F575F3ED53439A8 /* Release */,
+ 0F717A36F09D77DC65EB545A /* Debug */,
+ E4E57B16FEE492FF1058385D /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
Modified: branches/branch-3.0/include/FL/Fl_Help_View.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Help_View.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Help_View.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -43,6 +43,11 @@
typedef const char *(Fl_Help_Func)(Fl_Widget *, const char *);
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Help_View, HelpView)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Help_View, HelpView)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
#if 0 // FIXME: 123
struct Fl_Help_Block {
@@ -127,9 +132,11 @@
class FL_EXPORT Fl_Help_View : public Fl_Group {
public:
-
+
+ FLTK3_WIDGET_VCALLS(HelpView)
+
Fl_Help_View(int xx, int yy, int ww, int hh, const char *l = 0) {
- _p = new fltk3::HelpView(xx, yy, ww, hh, l);
+ _p = new fltk3::HelpView_I(xx, yy, ww, hh, l);
_p->wrapper(this);
}
@@ -153,8 +160,6 @@
return ((fltk3::HelpView*)_p)->load(f);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(HelpView, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
int size() const {
return ((fltk3::HelpView*)_p)->size();
}
Modified: branches/branch-3.0/include/FL/Fl_Hold_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hold_Browser.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Hold_Browser.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,14 +32,22 @@
#include <fltk3/HoldBrowser.h>
#include "Fl_Browser.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Hold_Browser, HoldBrowser)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Hold_Browser, HoldBrowser)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Hold_Browser : public Fl_Browser {
public:
+ FLTK3_WIDGET_VCALLS(HoldBrowser)
+
Fl_Hold_Browser() { /* empty */ }
Fl_Hold_Browser(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HoldBrowser(X, Y, W, H, l);
+ _p = new fltk3::HoldBrowser_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,13 +32,22 @@
#include <fltk3/HorFillSlider.h>
#include "Fl_Slider.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Hor_Fill_Slider, HorFillSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Hor_Fill_Slider, HorFillSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Hor_Fill_Slider : public Fl_Slider {
public:
+
+ FLTK3_WIDGET_VCALLS(HorFillSlider)
+
Fl_Hor_Fill_Slider() { /* empty */ }
Fl_Hor_Fill_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::HorFillSlider(x, y, w, h, l);
+ _p = new fltk3::HorFillSlider_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,14 +32,22 @@
#include <fltk3/HorNiceSlider.h>
#include "Fl_Slider.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Hor_Nice_Slider, HorNiceSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Hor_Nice_Slider, HorNiceSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Hor_Nice_Slider : public Fl_Slider {
public:
-
+
+ FLTK3_WIDGET_VCALLS(HorNiceSlider)
+
Fl_Hor_Nice_Slider() {}
Fl_Hor_Nice_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::HorNiceSlider(x, y, w, h, l);
+ _p = new fltk3::HorNiceSlider_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Hor_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,14 +32,22 @@
#include <fltk3/HorSlider.h>
#include "Fl_Slider.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Hor_Slider, HorSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Hor_Slider, HorSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class Fl_Hor_Slider : public Fl_Slider {
public:
+ FLTK3_WIDGET_VCALLS(HorSlider)
+
Fl_Hor_Slider() {}
Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HorSlider(X, Y, W, H, l);
+ _p = new fltk3::HorSlider_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,14 +32,22 @@
#include <fltk3/HorValueSlider.h>
#include "Fl_Value_Slider.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Hor_Value_Slider, HorValueSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Hor_Value_Slider, HorValueSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Hor_Value_Slider : public Fl_Value_Slider {
public:
+ FLTK3_WIDGET_VCALLS(HorValueSlider)
+
Fl_Hor_Value_Slider() {}
Fl_Hor_Value_Slider(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HorValueSlider(X, Y, W, H, l);
+ _p = new fltk3::HorValueSlider_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Input.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,20 +32,22 @@
#include <fltk3/Input.h>
#include "Fl_Input_.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Input, Input)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Input, Input)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Input : public Fl_Input_ {
-
-protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(Input, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Input, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(Input)
Fl_Input() { /* empty */ }
Fl_Input(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Input(x, y, w, h, label);
+ _p = new fltk3::Input_I(x, y, w, h, label);
_p->wrapper(this);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Input_.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input_.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Input_.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -47,70 +47,75 @@
#define FL_MULTILINE_OUTPUT_WRAP (FL_MULTILINE_INPUT | FL_INPUT_READONLY | FL_INPUT_WRAP)
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Input_, Input_)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Input_, Input_)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Input_ : public Fl_Widget {
protected:
int word_start(int i) const {
- return ((fltk3::Input_*)_p)->word_start(i);
+ return ((fltk3::Input__I*)_p)->word_start(i);
}
int word_end(int i) const {
- return ((fltk3::Input_*)_p)->word_end(i);
+ return ((fltk3::Input__I*)_p)->word_end(i);
}
int line_start(int i) const {
- return ((fltk3::Input_*)_p)->line_start(i);
+ return ((fltk3::Input__I*)_p)->line_start(i);
}
int line_end(int i) const {
- return ((fltk3::Input_*)_p)->line_end(i);
+ return ((fltk3::Input__I*)_p)->line_end(i);
}
void drawtext(int x, int y, int w, int h) {
- ((fltk3::Input_*)_p)->drawtext(x, y, w, h);
+ ((fltk3::Input__I*)_p)->drawtext(x, y, w, h);
}
int up_down_position(int a, int b=0) {
- return ((fltk3::Input_*)_p)->up_down_position(a, b);
+ return ((fltk3::Input__I*)_p)->up_down_position(a, b);
}
void handle_mouse(int a, int b, int c, int d, int e=0) {
- ((fltk3::Input_*)_p)->handle_mouse(a, b, c, d, e);
+ ((fltk3::Input__I*)_p)->handle_mouse(a, b, c, d, e);
}
int handletext(int a, int b, int c, int d, int e) {
- return ((fltk3::Input_*)_p)->handletext(a, b, c, d, e);
+ return ((fltk3::Input__I*)_p)->handletext(a, b, c, d, e);
}
void maybe_do_callback() {
- ((fltk3::Input_*)_p)->maybe_do_callback();
+ ((fltk3::Input__I*)_p)->maybe_do_callback();
}
int xscroll() const {
- return ((fltk3::Input_*)_p)->xscroll();
+ return ((fltk3::Input__I*)_p)->xscroll();
}
int yscroll() const {
- return ((fltk3::Input_*)_p)->yscroll();
+ return ((fltk3::Input__I*)_p)->yscroll();
}
void yscroll(int y) {
- ((fltk3::Input_*)_p)->yscroll(y);
+ ((fltk3::Input__I*)_p)->yscroll(y);
}
int linesPerPage() {
- return ((fltk3::Input_*)_p)->linesPerPage();
+ return ((fltk3::Input__I*)_p)->linesPerPage();
}
public:
- FLTK3_WRAPPER_VCALLS_OBJECT(Input_, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
+ FLTK3_WIDGET_VCALLS(Input_)
Fl_Input_() { /* empty */ }
Fl_Input_(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Input_(x, y, w, h, label);
+ _p = new fltk3::Input__I(x, y, w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Input_Choice.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input_Choice.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Input_Choice.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -44,14 +44,21 @@
#include <string.h>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Input_Choice, InputChoice)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Input_Choice, InputChoice)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Input_Choice : public Fl_Group {
public:
+ FLTK3_WIDGET_VCALLS(InputChoice)
+
Fl_Input_Choice() { /* empty */ }
Fl_Input_Choice (int x,int y,int w,int h,const char*l=0) {
- _p = new fltk3::InputChoice(x, y, w, h, l);
+ _p = new fltk3::InputChoice_I(x, y, w, h, l);
_p->wrapper(this);
}
@@ -92,8 +99,6 @@
((fltk3::InputChoice*)_p)->menu((fltk3::MenuItem*)m);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(InputChoice, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
Fl_Font textfont() const {
return fltk3::_3to1_font( ((fltk3::InputChoice*)_p)->textfont() );
}
Modified: branches/branch-3.0/include/FL/Fl_Int_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Int_Input.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Int_Input.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,14 +34,21 @@
#include "Fl_Input.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Int_Input, IntInput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Int_Input, IntInput)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Int_Input : public Fl_Input {
public:
-
+
+ FLTK3_WIDGET_VCALLS(IntInput)
+
Fl_Int_Input() { /* empty */ }
Fl_Int_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::IntInput(X, Y, W, H, l);
+ _p = new fltk3::IntInput_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Light_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Light_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Light_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,20 +33,23 @@
#include "Fl_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Light_Button, LightButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Light_Button, LightButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Light_Button : public Fl_Button {
protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(LightButton, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, LightButton, handle(int event), handle(event), Handle)
-
+ FLTK3_WIDGET_VCALLS(LightButton)
+
Fl_Light_Button() { /* empty */ }
Fl_Light_Button(int x,int y,int w,int h,const char *l = 0) {
- _p = new fltk3::LightButton(x, y, w, h, l);
+ _p = new fltk3::LightButton_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Line_Dial.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Line_Dial.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Line_Dial.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,14 +34,21 @@
#include "Fl_Dial.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Line_Dial, LineDial)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Line_Dial, LineDial)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Line_Dial : public Fl_Dial {
public:
+ FLTK3_WIDGET_VCALLS(LineDial)
+
Fl_Line_Dial() { /* empty */ }
Fl_Line_Dial(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::LineDial(x, y, w, h, l);
+ _p = new fltk3::LineDial_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Menu_.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,14 +34,21 @@
#include "Fl_Menu_Item.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Menu_, Menu_)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Menu_, Menu_)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Menu_ : public Fl_Widget {
public:
+ FLTK3_WIDGET_VCALLS(Menu_)
+
Fl_Menu_() { /* empty */ }
Fl_Menu_(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::Menu_(x, y, w, h, label);
+ _p = new fltk3::Menu__I(x, y, w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_Bar.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_Bar.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Menu_Bar.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,20 +33,21 @@
#include "Fl_Menu_.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Menu_Bar, MenuBar)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Menu_Bar, MenuBar)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Menu_Bar : public Fl_Menu_ {
-protected:
+public:
- FLTK3_WRAPPER_VCALLS_OBJECT(MenuBar, draw(), draw(), Draw)
+ FLTK3_WIDGET_VCALLS(MenuBar)
-public:
-
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, MenuBar, handle(int event), handle(event), Handle)
-
Fl_Menu_Bar() {}
Fl_Menu_Bar(int X, int Y, int W, int H,const char *l=0) {
- _p = new fltk3::MenuBar(X, Y, W, H, l);
+ _p = new fltk3::MenuBar_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Menu_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,12 +33,13 @@
#include "Fl_Menu_.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Menu_Button, MenuButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Menu_Button, MenuButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Menu_Button : public Fl_Menu_ {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(MenuButton, draw(), draw(), Draw)
-
public:
enum popup_buttons {
@@ -51,14 +52,14 @@
POPUP123
};
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, MenuButton, handle(int e), handle(e), Handle)
-
const Fl_Menu_Item* popup() {
return (Fl_Menu_Item*) ((fltk3::MenuButton*)_p)->popup();
}
+ FLTK3_WIDGET_VCALLS(MenuButton)
+
Fl_Menu_Button(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::MenuButton(x, y, w, h, label);
+ _p = new fltk3::MenuButton_I(x, y, w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_Window.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Menu_Window.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,18 @@
#include "Fl_Single_Window.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Menu_Window, MenuWindow)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Menu_Window, MenuWindow)
+FLTK3_WRAPPER_INTERFACE_WINDOW(Fl_Menu_Window, MenuWindow)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Menu_Window : public Fl_Single_Window {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT(MenuWindow, hide(), hide(), Hide)
+ FLTK3_WINDOW_VCALLS(MenuWindow)
- FLTK3_WRAPPER_VCALLS_OBJECT(MenuWindow, show(), show(), Show)
-
void erase() {
((fltk3::MenuWindow*)_p)->erase();
}
@@ -64,12 +68,12 @@
Fl_Menu_Window() { /* empty */ }
Fl_Menu_Window(int W, int H, const char *l = 0) {
- _p = new fltk3::MenuWindow(W, H, l);
+ _p = new fltk3::MenuWindow_I(W, H, l);
_p->wrapper(this);
}
Fl_Menu_Window(int X, int Y, int W, int H, const char *l = 0) {
- _p = new fltk3::MenuWindow(X, Y, W, H, l);
+ _p = new fltk3::MenuWindow_I(X, Y, W, H, l);
_p->wrapper(this);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Multi_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Multi_Browser.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Multi_Browser.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Browser.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Multi_Browser, MultiBrowser)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Multi_Browser, MultiBrowser)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Multi_Browser : public Fl_Browser {
public:
+ FLTK3_WIDGET_VCALLS(MultiBrowser)
+
Fl_Multi_Browser() {}
Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0) {
- _p = new fltk3::MultiBrowser(X, Y, W, H, L);
+ _p = new fltk3::MultiBrowser_I(X, Y, W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Multiline_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Multiline_Input.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Multiline_Input.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,22 @@
#include <fltk3/MultilineInput.h>
#include "Fl_Input.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Multiline_Input, MultilineInput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Multiline_Input, MultilineInput)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Multiline_Input : public Fl_Input {
public:
+ FLTK3_WIDGET_VCALLS(MultilineInput)
+
Fl_Multiline_Input() { /* empty */ }
Fl_Multiline_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::MultilineInput(X, Y, W, H, l);
+ _p = new fltk3::MultilineInput_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Multiline_Output.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Multiline_Output.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Multiline_Output.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Output.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Multiline_Output, MultilineOutput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Multiline_Output, MultilineOutput)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Multiline_Output : public Fl_Output {
public:
+ FLTK3_WIDGET_VCALLS(MultilineOutput)
+
Fl_Multiline_Output() { /* emty */ }
Fl_Multiline_Output(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::MultilineOutput(X, Y, W, H, l);
+ _p = new fltk3::MultilineOutput_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Nice_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Nice_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Nice_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -32,12 +32,20 @@
#include <fltk3/NiceSlider.h>
#include "Fl_Slider.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Nice_Slider, NiceSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Nice_Slider, NiceSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Nice_Slider : public Fl_Slider {
public:
+ FLTK3_WIDGET_VCALLS(NiceSlider)
+
Fl_Nice_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::NiceSlider(x, y, w, h, l);
+ _p = new fltk3::NiceSlider_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Output.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Output.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Output.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Input.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Output, Output)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Output, Output)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class Fl_Output : public Fl_Input {
public:
+ FLTK3_WIDGET_VCALLS(Output)
+
Fl_Output() { /* empty */ }
Fl_Output(int X,int Y,int W,int H, const char *l = 0) {
- _p = new fltk3::Output(X, Y, W, H, l);
+ _p = new fltk3::Output_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Pack.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Pack.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Pack.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,11 @@
#include <FL/Fl_Group.H>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Pack, PackedGroup)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Pack, PackedGroup)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Pack : public Fl_Group {
public:
@@ -42,16 +47,12 @@
HORIZONTAL = 1
};
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(PackedGroup, draw(), draw(), Draw)
+ FLTK3_WIDGET_VCALLS(PackedGroup)
-public:
-
Fl_Pack() {}
Fl_Pack(int x,int y,int w ,int h,const char *l = 0) {
- _p = new fltk3::PackedGroup(x, y, w, h, l);
+ _p = new fltk3::PackedGroup_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Positioner.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Positioner.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Positioner.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,28 +33,33 @@
#include "Fl_Widget.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Positioner, Positioner)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Positioner, Positioner)
+ void draw(int x, int y, int w, int h) { Positioner::draw(x, y, w, h); }
+ int handle(int e, int x, int y, int w, int h) { return Positioner::handle(e, x, y, w, h); }
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Positioner : public Fl_Widget {
protected:
void draw(int x, int y, int w, int h) {
- ((fltk3::Positioner*)_p)->draw(x, y, w, h);
+ ((fltk3::Positioner_I*)_p)->draw(x, y, w, h);
}
int handle(int e, int x, int y, int w, int h) {
- ((fltk3::Positioner*)_p)->handle(e, x, y, w, h);
+ ((fltk3::Positioner_I*)_p)->handle(e, x, y, w, h);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Positioner, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Positioner, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(Positioner)
Fl_Positioner() { }
Fl_Positioner(int x,int y,int w,int h, const char *l=0) {
- _p = new fltk3::Positioner(x, y, w, h, l);
+ _p = new fltk3::Positioner_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Progress.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Progress.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Progress.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,13 +33,16 @@
#include "Fl_Widget.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Progress, Progress)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Progress, Progress)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Progress : public Fl_Widget {
-
-protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(Progress, draw(), draw(), Draw)
-
public:
+
+ FLTK3_WIDGET_VCALLS(Progress)
Fl_Progress() { }
Modified: branches/branch-3.0/include/FL/Fl_Radio_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Radio_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Radio_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -36,14 +36,21 @@
#include "Fl_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Radio_Button, RadioButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Radio_Button, RadioButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Radio_Button : public Fl_Button {
public:
+ FLTK3_WIDGET_VCALLS(RadioButton)
+
Fl_Radio_Button() { /* empty */ }
Fl_Radio_Button(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::RadioButton(x, y, w, h, l);
+ _p = new fltk3::RadioButton_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Light_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Radio_Light_Button, RadioLightButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Radio_Light_Button, RadioLightButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Radio_Light_Button : public Fl_Light_Button {
public:
+ FLTK3_WIDGET_VCALLS(RadioLightButton)
+
Fl_Radio_Light_Button() { /* blank */ }
Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::RadioLightButton(X, Y, W, H, l);
+ _p = new fltk3::RadioLightButton_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Round_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Radio_Round_Button, RadioRoundButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Radio_Round_Button, RadioRoundButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Radio_Round_Button : public Fl_Round_Button {
public:
+ FLTK3_WIDGET_VCALLS(RadioRoundButton)
+
Fl_Radio_Round_Button() {}
Fl_Radio_Round_Button(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::RadioRoundButton(x, y, w, h, l);
+ _p = new fltk3::RadioRoundButton_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Repeat_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Repeat_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Repeat_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -35,16 +35,21 @@
#include "Fl_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Repeat_Button, RepeatButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Repeat_Button, RepeatButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Repeat_Button : public Fl_Button {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, RepeatButton, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(RepeatButton)
Fl_Repeat_Button() {}
Fl_Repeat_Button(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::RepeatButton(X, Y, W, H, l);
+ _p = new fltk3::RepeatButton_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Return_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Return_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Return_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,20 +33,21 @@
#include "Fl_Button.H"
-class FL_EXPORT Fl_Return_Button : public Fl_Button {
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Return_Button, ReturnButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Return_Button, ReturnButton)
+FLTK3_WRAPPER_INTERFACE_END()
-protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(ReturnButton, draw(), draw(), Draw)
+class FL_EXPORT Fl_Return_Button : public Fl_Button {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, ReturnButton, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(ReturnButton)
Fl_Return_Button() {}
Fl_Return_Button(int X, int Y, int W, int H,const char *l=0) {
- _p = new fltk3::ReturnButton(X, Y, W, H, l);
+ _p = new fltk3::ReturnButton_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Roller.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Roller.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Roller.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,20 +33,21 @@
#include "Fl_Valuator.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Roller, Roller)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Roller, Roller)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Roller : public Fl_Valuator {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Roller, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Roller, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(Roller)
Fl_Roller() {}
Fl_Roller(int X,int Y,int W,int H,const char* L=0) {
- _p = new fltk3::Roller(X, Y, W, H, L);
+ _p = new fltk3::Roller_I(X, Y, W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Round_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Round_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Round_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Light_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Round_Button, RoundButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Round_Button, RoundButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Round_Button : public Fl_Light_Button {
public:
+ FLTK3_WIDGET_VCALLS(RoundButton)
+
Fl_Round_Button() {}
Fl_Round_Button(int x,int y,int w,int h,const char *l = 0) {
- _p = new fltk3::RoundButton(x, y, w, h, l);
+ _p = new fltk3::RoundButton_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Round_Clock.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Round_Clock.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Round_Clock.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,12 +33,19 @@
#include "Fl_Clock.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Round_Clock, RoundClock)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Round_Clock, RoundClock)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Round_Clock : public Fl_Clock {
public:
+ FLTK3_WIDGET_VCALLS(RoundClock)
+
Fl_Round_Clock(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::RoundClock(x, y, w, h, l);
+ _p = new fltk3::RoundClock_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Scroll.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Scroll.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Scroll.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -35,30 +35,31 @@
#include "Fl_Scrollbar.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Scroll, ScrollGroup)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Scroll, ScrollGroup)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Scroll : public Fl_Group {
protected:
void bbox(int &x, int &y, int &w, int &h) {
- ((fltk3::ScrollGroup*)_p)->bbox(x, y, w, h);
+ ((fltk3::ScrollGroup_I*)_p)->bbox(x, y, w, h);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(ScrollGroup, draw(), draw(), Draw)
-
public:
+ FLTK3_WIDGET_VCALLS(ScrollGroup)
+
// FIXME: 123 - Fl_Scrollbar scrollbar;
// FIXME: 123 - Fl_Scrollbar hscrollbar;
- FLTK3_WRAPPER_VCALLS_OBJECT(ScrollGroup, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, ScrollGroup, handle(int event), handle(event), Handle)
-
Fl_Scroll() {}
Fl_Scroll(int X,int Y,int W,int H,const char*l=0) {
- _p = new fltk3::ScrollGroup(X, Y, W, H, l);
+ _p = new fltk3::ScrollGroup_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Scrollbar.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Scrollbar.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Scrollbar.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,23 +33,24 @@
#include "Fl_Slider.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Scrollbar, Scrollbar)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Scrollbar, Scrollbar)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Scrollbar : public Fl_Slider {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Scrollbar, draw(), draw(), Draw)
-
public:
+ FLTK3_WIDGET_VCALLS(Scrollbar)
+
Fl_Scrollbar() { /* empty */ }
Fl_Scrollbar(int X,int Y,int W,int H, const char *L = 0) {
- _p = new fltk3::Scrollbar(X, Y, W, H, L);
+ _p = new fltk3::Scrollbar_I(X, Y, W, H, L);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Scrollbar, handle(int event), handle(event), Handle)
-
int value() const {
return ((fltk3::Scrollbar*)_p)->value();
}
Modified: branches/branch-3.0/include/FL/Fl_Secret_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Secret_Input.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Secret_Input.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Input.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Secret_Input, SecretInput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Secret_Input, SecretInput)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Secret_Input : public Fl_Input {
public:
+
+ FLTK3_WIDGET_VCALLS(SecretInput)
Fl_Secret_Input() {}
Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::SecretInput(X, Y, W, H, l);
+ _p = new fltk3::SecretInput_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Select_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Select_Browser.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Select_Browser.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Browser.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Select_Browser, SelectBrowser)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Select_Browser, SelectBrowser)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Select_Browser : public Fl_Browser {
public:
+ FLTK3_WIDGET_VCALLS(SelectBrowser)
+
Fl_Select_Browser() {}
Fl_Select_Browser(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::SelectBrowser(X, Y, W, H, l);
+ _p = new fltk3::SelectBrowser_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Simple_Counter.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Simple_Counter.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Simple_Counter.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Counter.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Simple_Counter, SimpleCounter)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Simple_Counter, SimpleCounter)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Simple_Counter : public Fl_Counter {
public:
+ FLTK3_WIDGET_VCALLS(SimpleCounter)
+
Fl_Simple_Counter() {}
Fl_Simple_Counter(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::SimpleCounter(x, y, w, h, l);
+ _p = new fltk3::SimpleCounter_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Single_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Single_Window.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Single_Window.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,11 +33,18 @@
#include "Fl_Window.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Single_Window, SingleWindow)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Single_Window, SingleWindow)
+FLTK3_WRAPPER_INTERFACE_WINDOW(Fl_Single_Window, SingleWindow)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
+
class FL_EXPORT Fl_Single_Window : public Fl_Window {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT(SingleWindow, show(), show(), Show)
+ FLTK3_WINDOW_VCALLS(SingleWindow)
void show(int a, char **b) {
((fltk3::SingleWindow*)_p)->show(a, b);
@@ -50,12 +57,12 @@
Fl_Single_Window() {}
Fl_Single_Window(int W, int H, const char *l=0) {
- _p = new fltk3::SingleWindow(W, H, l);
+ _p = new fltk3::SingleWindow_I(W, H, l);
_p->wrapper(this);
}
Fl_Single_Window(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::SingleWindow(X, Y, W, H, l);
+ _p = new fltk3::SingleWindow_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -40,31 +40,39 @@
#define FL_HOR_NICE_SLIDER 5
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Slider, Slider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Slider, Slider)
+ void draw(int x, int y, int w, int h) { Slider::draw(x, y, w, h); }
+ int handle(int e, int x, int y, int w, int h) { return Slider::handle(e, x, y, w, h); }
+ Slider_I(uchar t, int X,int Y,int W,int H, const char *L = 0) : Slider(t, X, Y, W, H, L) {}
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Slider : public Fl_Valuator {
protected:
void draw(int x, int y, int w, int h) {
- ((fltk3::Slider*)_p)->draw(x, y, w, h);
+ ((fltk3::Slider_I*)_p)->draw(x, y, w, h);
}
int handle(int e, int x, int y, int w, int h) {
- return ((fltk3::Slider*)_p)->handle(e, x, y, w, h);
+ return ((fltk3::Slider_I*)_p)->handle(e, x, y, w, h);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Slider, draw(), draw(), Draw)
-
public:
+
+ FLTK3_WIDGET_VCALLS(Slider)
Fl_Slider() { /* empty */ }
Fl_Slider(int X,int Y,int W,int H, const char *L = 0) {
- _p = new fltk3::Slider(X, Y, W, H, L);
+ _p = new fltk3::Slider_I(X, Y, W, H, L);
_p->wrapper(this);
}
Fl_Slider(uchar t, int X,int Y,int W,int H, const char *L = 0) {
- _p = new fltk3::Slider(t, X, Y, W, H, L);
+ _p = new fltk3::Slider_I(t, X, Y, W, H, L);
_p->wrapper(this);
}
@@ -72,8 +80,6 @@
((fltk3::Slider*)_p)->bounds(a, b);
}
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Slider, handle(int event), handle(event), Handle)
-
int scrollvalue(int pos,int size,int first,int total) {
return ((fltk3::Slider*)_p)->scrollvalue(pos, size, first, total);
}
Modified: branches/branch-3.0/include/FL/Fl_Spinner.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Spinner.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Spinner.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,19 +33,24 @@
#include <FL/Fl_Group.H>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Spinner, Spinner)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Spinner, Spinner)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Spinner : public Fl_Group {
public:
+ FLTK3_WIDGET_VCALLS(Spinner)
+
Fl_Spinner() {}
Fl_Spinner(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::Spinner(X, Y, W, H, L);
+ _p = new fltk3::Spinner_I(X, Y, W, H, L);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Spinner, handle(int event), handle(event), Handle)
-
const char *format() {
return ((fltk3::Spinner*)_p)->format();
}
@@ -74,8 +79,6 @@
((fltk3::Spinner*)_p)->range(a, b);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Spinner, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
double step() const {
return ((fltk3::Spinner*)_p)->step();
}
Modified: branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -35,16 +35,20 @@
#if defined(__APPLE__)
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Sys_Menu_Bar, SysMenuBar)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Sys_Menu_Bar, SysMenuBar)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Sys_Menu_Bar : public Fl_Menu_Bar {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(SysMenuBar, draw(), draw(), Draw)
-
public:
+ FLTK3_WIDGET_VCALLS(SysMenuBar)
+
Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::SysMenuBar(x, y, w, h, l);
+ _p = new fltk3::SysMenuBar_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Table.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Table.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Table.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -48,6 +48,11 @@
#include <FL/Fl_Scrollbar.H>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Table, Table)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Table, Table)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Table : public Fl_Group {
public:
@@ -93,8 +98,10 @@
public:
+ FLTK3_WIDGET_VCALLS(Table)
+
Fl_Table(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::Table(X, Y, W, H, l);
+ _p = new fltk3::Table_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Table_Row.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Table_Row.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Table_Row.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -35,6 +35,12 @@
#include <fltk3/TableRow.h>
#include "Fl_Table.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Table_Row, TableRow)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Table_Row, TableRow)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Table_Row : public Fl_Table {
public:
@@ -56,8 +62,10 @@
public:
+ FLTK3_WIDGET_VCALLS(TableRow)
+
Fl_Table_Row(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::TableRow(X, Y, W, H, l);
+ _p = new fltk3::TableRow_I(X, Y, W, H, l);
_p->wrapper(this);
}
@@ -86,11 +94,6 @@
return(_selectmode);
}
- /**
- Checks to see if 'row' is selected. Returns 1 if selected, 0 if not. You can
- change the selection of a row by clicking on it, or by using
- select_row(row, flag)
- */
#endif
int row_selected(int row) {
Modified: branches/branch-3.0/include/FL/Fl_Tabs.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tabs.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Tabs.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,19 +33,22 @@
#include "Fl_Group.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Tabs, TabGroup)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Tabs, TabGroup)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Tabs : public Fl_Group {
protected:
void redraw_tabs() {
- ((fltk3::TabGroup*)_p)->redraw_tabs();
+ ((fltk3::TabGroup_I*)_p)->redraw_tabs();
}
- FLTK3_WRAPPER_VCALLS_OBJECT(TabGroup, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, TabGroup, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(TabGroup)
Fl_Widget *value() {
return fltk3::_3to1_widget( ((fltk3::TabGroup*)_p)->value() );
@@ -66,7 +69,7 @@
Fl_Tabs() {}
Fl_Tabs(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::TabGroup(x, y, w, h, label);
+ _p = new fltk3::TabGroup_I(x, y, w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Text_Display.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Text_Display.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Text_Display.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -36,6 +36,11 @@
#include "Fl_Group.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Text_Display, TextDisplay)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Text_Display, TextDisplay)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Text_Display: public Fl_Group {
public:
@@ -80,15 +85,15 @@
unsigned attr;
};
+ FLTK3_WIDGET_VCALLS(TextDisplay)
+
Fl_Text_Display() {}
Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0) {
- _p = new fltk3::TextDisplay(X, Y, W, H, l);
+ _p = new fltk3::TextDisplay_I(X, Y, W, H, l);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, TextDisplay, handle(int event), handle(event), Handle)
-
void buffer(Fl_Text_Buffer* buf) {
((fltk3::TextDisplay*)_p)->buffer(buf);
}
@@ -102,11 +107,11 @@
}
void styleBuffer(Fl_Text_Buffer* buf) {
- ((fltk3::TextDisplay*)_p)->mStyleBuffer = buf;
+ ((fltk3::TextDisplay_I*)_p)->mStyleBuffer = buf;
}
Fl_Text_Buffer* styleBuffer() const {
- return (Fl_Text_Buffer*) ((fltk3::TextDisplay*)_p)->mStyleBuffer;
+ return (Fl_Text_Buffer*) ((fltk3::TextDisplay_I*)_p)->mStyleBuffer;
}
void redisplay_range(int start, int end) {
@@ -293,8 +298,6 @@
((fltk3::TextDisplay*)_p)->wrap_mode(wrap, wrap_margin);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(TextDisplay, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
double x_to_col(double x) const {
return ((fltk3::TextDisplay*)_p)->x_to_col(x);
}
@@ -305,32 +308,30 @@
protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(TextDisplay, draw(), draw(), Draw)
-
void draw_text(int X, int Y, int W, int H) {
- ((fltk3::TextDisplay*)_p)->draw_text(X, Y, W, H);
+ ((fltk3::TextDisplay_I*)_p)->draw_text(X, Y, W, H);
}
void draw_range(int start, int end) {
- ((fltk3::TextDisplay*)_p)->draw_range(start, end);
+ ((fltk3::TextDisplay_I*)_p)->draw_range(start, end);
}
void draw_cursor(int a, int b) {
- ((fltk3::TextDisplay*)_p)->draw_cursor(a, b);
+ ((fltk3::TextDisplay_I*)_p)->draw_cursor(a, b);
}
void draw_string(int style, int x, int y, int toX, const char *string, int nChars) const {
- ((fltk3::TextDisplay*)_p)->draw_string(style, x, y, toX, string, nChars);
+ ((fltk3::TextDisplay_I*)_p)->draw_string(style, x, y, toX, string, nChars);
}
void draw_vline(int visLineNum, int leftClip, int rightClip,
int leftCharIndex, int rightCharIndex) {
- ((fltk3::TextDisplay*)_p)->draw_vline(visLineNum, leftClip, rightClip,
+ ((fltk3::TextDisplay_I*)_p)->draw_vline(visLineNum, leftClip, rightClip,
leftCharIndex, rightCharIndex);
}
int find_x(const char *s, int len, int style, int x) const {
- return ((fltk3::TextDisplay*)_p)->find_x(s, len, style, x);
+ return ((fltk3::TextDisplay_I*)_p)->find_x(s, len, style, x);
}
enum {
@@ -344,62 +345,62 @@
int lineStart, int lineLen, int leftChar, int rightChar,
int topClip, int bottomClip,
int leftClip, int rightClip) const {
- return ((fltk3::TextDisplay*)_p)->handle_vline(mode,
+ return ((fltk3::TextDisplay_I*)_p)->handle_vline(mode,
lineStart, lineLen, leftChar, rightChar,
topClip, bottomClip,
leftClip, rightChar);
}
void draw_line_numbers(bool clearAll) {
- ((fltk3::TextDisplay*)_p)->draw_line_numbers(clearAll);
+ ((fltk3::TextDisplay_I*)_p)->draw_line_numbers(clearAll);
}
void clear_rect(int style, int x, int y, int width, int height) const {
- ((fltk3::TextDisplay*)_p)->clear_rect(style, x, y, width, height);
+ ((fltk3::TextDisplay_I*)_p)->clear_rect(style, x, y, width, height);
}
void display_insert() {
- ((fltk3::TextDisplay*)_p)->display_insert();
+ ((fltk3::TextDisplay_I*)_p)->display_insert();
}
void offset_line_starts(int newTopLineNum) {
- ((fltk3::TextDisplay*)_p)->offset_line_starts(newTopLineNum);
+ ((fltk3::TextDisplay_I*)_p)->offset_line_starts(newTopLineNum);
}
void calc_line_starts(int startLine, int endLine) {
- ((fltk3::TextDisplay*)_p)->calc_line_starts(startLine, endLine);
+ ((fltk3::TextDisplay_I*)_p)->calc_line_starts(startLine, endLine);
}
void update_line_starts(int pos, int charsInserted, int charsDeleted,
int linesInserted, int linesDeleted, int *scrolled) {
- ((fltk3::TextDisplay*)_p)->update_line_starts(pos, charsInserted, charsDeleted,
+ ((fltk3::TextDisplay_I*)_p)->update_line_starts(pos, charsInserted, charsDeleted,
linesInserted, linesDeleted, scrolled);
}
void calc_last_char() {
- ((fltk3::TextDisplay*)_p)->calc_last_char();
+ ((fltk3::TextDisplay_I*)_p)->calc_last_char();
}
int position_to_line( int pos, int* lineNum ) const {
- return ((fltk3::TextDisplay*)_p)->position_to_line(pos, lineNum);
+ return ((fltk3::TextDisplay_I*)_p)->position_to_line(pos, lineNum);
}
double string_width(const char* string, int length, int style) const {
- return ((fltk3::TextDisplay*)_p)->string_width(string, length, style);
+ return ((fltk3::TextDisplay_I*)_p)->string_width(string, length, style);
}
static void scroll_timer_cb(void *v) {
- fltk3::TextDisplay::scroll_timer_cb(v);
+ fltk3::TextDisplay_I::scroll_timer_cb(v);
}
static void buffer_predelete_cb(int pos, int nDeleted, void* cbArg) {
- fltk3::TextDisplay::buffer_predelete_cb(pos, nDeleted, cbArg);
+ fltk3::TextDisplay_I::buffer_predelete_cb(pos, nDeleted, cbArg);
}
static void buffer_modified_cb(int pos, int nInserted, int nDeleted,
int nRestyled, const char* deletedText,
void* cbArg) {
- fltk3::TextDisplay::buffer_modified_cb(pos, nInserted, nDeleted,
+ fltk3::TextDisplay_I::buffer_modified_cb(pos, nInserted, nDeleted,
nRestyled, deletedText,
cbArg);
}
@@ -409,67 +410,67 @@
// FIXME: 123 - static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d) {
void update_v_scrollbar() {
- ((fltk3::TextDisplay*)_p)->update_v_scrollbar();
+ ((fltk3::TextDisplay_I*)_p)->update_v_scrollbar();
}
void update_h_scrollbar() {
- ((fltk3::TextDisplay*)_p)->update_h_scrollbar();
+ ((fltk3::TextDisplay_I*)_p)->update_h_scrollbar();
}
int measure_vline(int visLineNum) const {
- return ((fltk3::TextDisplay*)_p)->measure_vline(visLineNum);
+ return ((fltk3::TextDisplay_I*)_p)->measure_vline(visLineNum);
}
int longest_vline() const {
- return ((fltk3::TextDisplay*)_p)->longest_vline();
+ return ((fltk3::TextDisplay_I*)_p)->longest_vline();
}
int empty_vlines() const {
- return ((fltk3::TextDisplay*)_p)->empty_vlines();
+ return ((fltk3::TextDisplay_I*)_p)->empty_vlines();
}
int vline_length(int visLineNum) const {
- return ((fltk3::TextDisplay*)_p)->vline_length(visLineNum);
+ return ((fltk3::TextDisplay_I*)_p)->vline_length(visLineNum);
}
int xy_to_position(int x, int y, int PosType = CHARACTER_POS) const {
- return ((fltk3::TextDisplay*)_p)->xy_to_position(x, y, PosType);
+ return ((fltk3::TextDisplay_I*)_p)->xy_to_position(x, y, PosType);
}
void xy_to_rowcol(int x, int y, int* row, int* column, int PosType = CHARACTER_POS) const {
- ((fltk3::TextDisplay*)_p)->xy_to_rowcol(x, y, row, column, PosType);
+ ((fltk3::TextDisplay_I*)_p)->xy_to_rowcol(x, y, row, column, PosType);
}
void maintain_absolute_top_line_number(int state) {
- ((fltk3::TextDisplay*)_p)->maintain_absolute_top_line_number(state);
+ ((fltk3::TextDisplay_I*)_p)->maintain_absolute_top_line_number(state);
}
int get_absolute_top_line_number() const {
- return ((fltk3::TextDisplay*)_p)->get_absolute_top_line_number();
+ return ((fltk3::TextDisplay_I*)_p)->get_absolute_top_line_number();
}
void absolute_top_line_number(int oldFirstChar) {
- ((fltk3::TextDisplay*)_p)->absolute_top_line_number(oldFirstChar);
+ ((fltk3::TextDisplay_I*)_p)->absolute_top_line_number(oldFirstChar);
}
int maintaining_absolute_top_line_number() const {
- return ((fltk3::TextDisplay*)_p)->maintaining_absolute_top_line_number();
+ return ((fltk3::TextDisplay_I*)_p)->maintaining_absolute_top_line_number();
}
void reset_absolute_top_line_number() {
- ((fltk3::TextDisplay*)_p)->reset_absolute_top_line_number();
+ ((fltk3::TextDisplay_I*)_p)->reset_absolute_top_line_number();
}
int position_to_linecol(int pos, int* lineNum, int* column) const {
- return ((fltk3::TextDisplay*)_p)->position_to_linecol(pos, lineNum, column);
+ return ((fltk3::TextDisplay_I*)_p)->position_to_linecol(pos, lineNum, column);
}
int scroll_(int topLineNum, int horizOffset) {
- return ((fltk3::TextDisplay*)_p)->scroll_(topLineNum, horizOffset);
+ return ((fltk3::TextDisplay_I*)_p)->scroll_(topLineNum, horizOffset);
}
void extend_range_for_styles(int* start, int* end) {
- ((fltk3::TextDisplay*)_p)->extend_range_for_styles(start, end);
+ ((fltk3::TextDisplay_I*)_p)->extend_range_for_styles(start, end);
}
void find_wrap_range(const char *deletedText, int pos, int nInserted,
@@ -477,7 +478,7 @@
int *linesInserted, int *linesDeleted);
void measure_deleted_lines(int pos, int nDeleted) {
- ((fltk3::TextDisplay*)_p)->measure_deleted_lines(pos, nDeleted);
+ ((fltk3::TextDisplay_I*)_p)->measure_deleted_lines(pos, nDeleted);
}
void wrapped_line_counter(Fl_Text_Buffer *buf, int startPos, int maxPos,
@@ -485,7 +486,7 @@
int styleBufOffset, int *retPos, int *retLines,
int *retLineStart, int *retLineEnd,
bool countLastLineMissingNewLine = true) const {
- ((fltk3::TextDisplay*)_p)->wrapped_line_counter((fltk3::TextBuffer*)buf,
+ ((fltk3::TextDisplay_I*)_p)->wrapped_line_counter((fltk3::TextBuffer*)buf,
startPos, maxPos,
maxLines, startPosIsLineStart,
styleBufOffset, retPos, retLines,
@@ -494,15 +495,15 @@
}
void find_line_end(int pos, bool start_pos_is_line_start, int *lineEnd, int *nextLineStart) const {
- ((fltk3::TextDisplay*)_p)->find_line_end(pos, start_pos_is_line_start, lineEnd, nextLineStart);
+ ((fltk3::TextDisplay_I*)_p)->find_line_end(pos, start_pos_is_line_start, lineEnd, nextLineStart);
}
double measure_proportional_character(const char *s, int colNum, int pos) const {
- return ((fltk3::TextDisplay*)_p)->measure_proportional_character(s, colNum, pos);
+ return ((fltk3::TextDisplay_I*)_p)->measure_proportional_character(s, colNum, pos);
}
int wrap_uses_character(int lineEndPos) const {
- return ((fltk3::TextDisplay*)_p)->wrap_uses_character(lineEndPos);
+ return ((fltk3::TextDisplay_I*)_p)->wrap_uses_character(lineEndPos);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Text_Editor.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Text_Editor.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Text_Editor.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -38,6 +38,11 @@
#define FL_TEXT_EDITOR_ANY_STATE (-1L)
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Text_Editor, TextEditor)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Text_Editor, TextEditor)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display {
public:
@@ -51,15 +56,15 @@
Key_Binding* next; ///< next key binding in the list
};
+ FLTK3_WIDGET_VCALLS(TextEditor)
+
Fl_Text_Editor() { /* empty */ }
Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0) {
- _p = new fltk3::TextEditor(X, Y, W, H, l);
+ _p = new fltk3::TextEditor_I(X, Y, W, H, l);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, TextEditor, handle(int event), handle(event), Handle)
-
void insert_mode(int b) {
((fltk3::TextEditor*)_p)->insert_mode(b);
}
@@ -212,11 +217,11 @@
protected:
int handle_key() {
- return ((fltk3::TextEditor*)_p)->handle_key();
+ return ((fltk3::TextEditor_I*)_p)->handle_key();
}
void maybe_do_callback() {
- ((fltk3::TextEditor*)_p)->maybe_do_callback();
+ ((fltk3::TextEditor_I*)_p)->maybe_do_callback();
}
};
Modified: branches/branch-3.0/include/FL/Fl_Tile.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tile.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Tile.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,21 +33,24 @@
#include "Fl_Group.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Tile, TiledGroup)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Tile, TiledGroup)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Tile : public Fl_Group {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, TiledGroup, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(TiledGroup)
Fl_Tile() {}
Fl_Tile(int X,int Y,int W,int H,const char*l=0) {
- _p = new fltk3::TiledGroup(X, Y, W, H, l);
+ _p = new fltk3::TiledGroup_I(X, Y, W, H, l);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(TiledGroup, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
void position(int a, int b, int c, int d) {
((fltk3::TiledGroup*)_p)->position(a, b, c, d);
}
Modified: branches/branch-3.0/include/FL/Fl_Timer.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Timer.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Timer.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -37,18 +37,20 @@
#define FL_HIDDEN_TIMER 2
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Timer, Timer)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Timer, Timer)
+ Timer_I(uchar t,int x,int y,int w,int h, const char *l) : Timer(t, x, y, w, h) {}
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Timer : public Fl_Widget {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Timer, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Timer, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(Timer)
Fl_Timer(uchar t,int x,int y,int w,int h, const char *l) {
- _p = new fltk3::Timer(t, x, y, w, h, l);
+ _p = new fltk3::Timer_I(t, x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Toggle_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Toggle_Button.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Toggle_Button.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,14 +33,21 @@
#include "Fl_Button.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Toggle_Button, ToggleButton)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Toggle_Button, ToggleButton)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Toggle_Button : public Fl_Button {
public:
+ FLTK3_WIDGET_VCALLS(ToggleButton)
+
Fl_Toggle_Button() {}
Fl_Toggle_Button(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::ToggleButton(X, Y, W, H, l);
+ _p = new fltk3::ToggleButton_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Tree.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Tree.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -49,6 +49,11 @@
};
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Tree, Tree)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Tree, Tree)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Tree : public Fl_Group {
protected:
@@ -56,7 +61,7 @@
// Fl_Scrollbar *_vscroll;
void item_clicked(Fl_Tree_Item* val) {
- ((fltk3::Tree*)_p)->item_clicked( (fltk3::TreeItem*)val );
+ ((fltk3::Tree_I*)_p)->item_clicked( (fltk3::TreeItem*)val );
}
//void do_callback_for_item(Fl_Tree_Item* item, Fl_Tree_Reason reason) {
@@ -65,15 +70,13 @@
public:
+ FLTK3_WIDGET_VCALLS(Tree)
+
Fl_Tree(int X, int Y, int W, int H, const char *L=0) {
- _p = new fltk3::Widget(X, Y, W, H, L);
+ _p = new fltk3::Tree_I(X, Y, W, H, L);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Tree, draw(), draw(), Draw)
-
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Tree, handle(int event), handle(event), Handle)
-
void root_label(const char *new_label) {
((fltk3::Tree*)_p)->root_label(new_label);
}
Modified: branches/branch-3.0/include/FL/Fl_Valuator.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Valuator.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Valuator.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -36,6 +36,11 @@
#define FL_HORIZONTAL 1
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Valuator, Valuator)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Valuator, Valuator)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Valuator : public Fl_Widget {
protected:
@@ -43,112 +48,114 @@
Fl_Valuator() { /* empty */ }
Fl_Valuator(int X, int Y, int W, int H, const char* L) {
- _p = new fltk3::Valuator(X, Y, W, H, L);
+ _p = new fltk3::Valuator_I(X, Y, W, H, L);
_p->wrapper(this);
}
int horizontal() const {
- return ((fltk3::Valuator*)_p)->horizontal();
+ return ((fltk3::Valuator_I*)_p)->horizontal();
}
double previous_value() const {
- return ((fltk3::Valuator*)_p)->previous_value();
+ return ((fltk3::Valuator_I*)_p)->previous_value();
}
void handle_push() {
- ((fltk3::Valuator*)_p)->handle_push();
+ ((fltk3::Valuator_I*)_p)->handle_push();
}
double softclamp(double v) {
- return ((fltk3::Valuator*)_p)->softclamp(v);
+ return ((fltk3::Valuator_I*)_p)->softclamp(v);
}
void handle_drag(double newvalue) {
- ((fltk3::Valuator*)_p)->handle_drag(newvalue);
+ ((fltk3::Valuator_I*)_p)->handle_drag(newvalue);
}
void handle_release() {
- ((fltk3::Valuator*)_p)->handle_release();
+ ((fltk3::Valuator_I*)_p)->handle_release();
}
// FIXME: 123 - this method was virtual
void value_damage() {
- ((fltk3::Valuator*)_p)->value_damage();
+ ((fltk3::Valuator_I*)_p)->value_damage();
}
void set_value(double v) {
- ((fltk3::Valuator*)_p)->set_value(v);
+ ((fltk3::Valuator_I*)_p)->set_value(v);
}
public:
+
+ FLTK3_WIDGET_VCALLS(Valuator)
void bounds(double a, double b) {
- ((fltk3::Valuator*)_p)->bounds(a, b);
+ ((fltk3::Valuator_I*)_p)->bounds(a, b);
}
double minimum() const {
- return ((fltk3::Valuator*)_p)->minimum();
+ return ((fltk3::Valuator_I*)_p)->minimum();
}
void minimum(double a) {
- ((fltk3::Valuator*)_p)->minimum(a);
+ ((fltk3::Valuator_I*)_p)->minimum(a);
}
double maximum() const {
- return ((fltk3::Valuator*)_p)->maximum();
+ return ((fltk3::Valuator_I*)_p)->maximum();
}
void maximum(double a) {
- ((fltk3::Valuator*)_p)->maximum(a);
+ ((fltk3::Valuator_I*)_p)->maximum(a);
}
void range(double a, double b) {
- ((fltk3::Valuator*)_p)->range(a, b);
+ ((fltk3::Valuator_I*)_p)->range(a, b);
}
void step(int a) {
- ((fltk3::Valuator*)_p)->step(a);
+ ((fltk3::Valuator_I*)_p)->step(a);
}
void step(double a, int b) {
- ((fltk3::Valuator*)_p)->step(a, b);
+ ((fltk3::Valuator_I*)_p)->step(a, b);
}
void step(double s) {
- ((fltk3::Valuator*)_p)->step(s);
+ ((fltk3::Valuator_I*)_p)->step(s);
}
double step() const {
- return ((fltk3::Valuator*)_p)->step();
+ return ((fltk3::Valuator_I*)_p)->step();
}
void precision(int x) {
- ((fltk3::Valuator*)_p)->precision(x);
+ ((fltk3::Valuator_I*)_p)->precision(x);
}
double value() const {
- return ((fltk3::Valuator*)_p)->value();
+ return ((fltk3::Valuator_I*)_p)->value();
}
int value(double v) {
- return ((fltk3::Valuator*)_p)->value(v);
+ return ((fltk3::Valuator_I*)_p)->value(v);
}
// FIXME: 123 - this method was virtual
int format(char *f) {
- return ((fltk3::Valuator*)_p)->format(f);
+ return ((fltk3::Valuator_I*)_p)->format(f);
}
double round(double v) {
- return ((fltk3::Valuator*)_p)->round(v);
+ return ((fltk3::Valuator_I*)_p)->round(v);
}
double clamp(double v) {
- return ((fltk3::Valuator*)_p)->clamp(v);
+ return ((fltk3::Valuator_I*)_p)->clamp(v);
}
double increment(double v, int x) {
- return ((fltk3::Valuator*)_p)->increment(v, x);
+ return ((fltk3::Valuator_I*)_p)->increment(v, x);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Value_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Value_Input.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Value_Input.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,22 +34,21 @@
#include "Fl_Input.H"
-class FL_EXPORT Fl_Value_Input : public Fl_Valuator {
-
-protected:
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Value_Input, ValueInput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Value_Input, ValueInput)
+FLTK3_WRAPPER_INTERFACE_END()
- FLTK3_WRAPPER_VCALLS_OBJECT(ValueInput, draw(), draw(), Draw)
+class FL_EXPORT Fl_Value_Input : public Fl_Valuator {
+
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, ValueInput, handle(int event), handle(event), Handle)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(ValueInput, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
+ FLTK3_WIDGET_VCALLS(ValueInput)
+
Fl_Value_Input() {}
Fl_Value_Input(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::ValueInput(x, y, w, h, l);
+ _p = new fltk3::ValueInput_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Value_Output.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Value_Output.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Value_Output.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,18 +33,19 @@
#include "Fl_Valuator.H"
-class FL_EXPORT Fl_Value_Output : public Fl_Valuator {
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Value_Output, ValueOutput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Value_Output, ValueOutput)
+FLTK3_WRAPPER_INTERFACE_END()
-protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(ValueOutput, draw(), draw(), Draw)
+class FL_EXPORT Fl_Value_Output : public Fl_Valuator {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, ValueOutput, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(ValueOutput)
Fl_Value_Output(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::ValueOutput(x, y, w, h, l);
+ _p = new fltk3::ValueOutput_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Value_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Value_Slider.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Value_Slider.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,20 +33,21 @@
#include "Fl_Slider.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Value_Slider, ValueSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Value_Slider, ValueSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Value_Slider : public Fl_Slider {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(ValueSlider, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, ValueSlider, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(ValueSlider)
Fl_Value_Slider() {}
Fl_Value_Slider(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::ValueSlider(x, y, w, h, l);
+ _p = new fltk3::ValueSlider_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Widget.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Widget.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Widget.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -75,10 +75,12 @@
};
#endif
+
FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Widget, Widget)
FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Widget, Widget)
FLTK3_WRAPPER_INTERFACE_END()
+
class FL_EXPORT Fl_Widget : public fltk3::WidgetWrapper {
friend class Fl_Group;
Modified: branches/branch-3.0/include/FL/Fl_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Window.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Window.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -37,6 +37,13 @@
#define FL_WINDOW 0xF0 ///< window type id all subclasses have type() >= this
#define FL_DOUBLE_WINDOW 0xF1 ///< double window type id
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Window, Window)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Window, Window)
+FLTK3_WRAPPER_INTERFACE_WINDOW(Fl_Window, Window)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class Fl_X;
class FL_EXPORT Fl_Window : public Fl_Group {
@@ -44,43 +51,33 @@
protected:
void flush() {
- ((fltk3::Window*)_p)->flush();
+ ((fltk3::Window_I*)_p)->flush();
}
void force_position(int force) {
- ((fltk3::Window*)_p)->force_position(force);
+ ((fltk3::Window_I*)_p)->force_position(force);
}
int force_position() const {
- return ((fltk3::Window*)_p)->force_position();
+ return ((fltk3::Window_I*)_p)->force_position();
}
public:
- FLTK3_WRAPPER_VCALLS_OBJECT(Window, draw_overlay(), draw_overlay(), DrawOverlay)
+ FLTK3_WINDOW_VCALLS(Window)
Fl_Window() { /* empty */ }
Fl_Window(int w, int h, const char* label = 0) {
- _p = new fltk3::Window(w, h, label);
+ _p = new fltk3::Window_I(w, h, label);
_p->wrapper(this);
}
Fl_Window(int x, int y, int w, int h, const char* label = 0) {
- _p = new fltk3::Window(x, y, w, h, label);
+ _p = new fltk3::Window_I(x, y, w, h, label);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Window, resize(int x, int y, int w, int h), resize(x, y, w, h), Resize)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Window, hide(), hide(), Hide)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Window, show(), show(), Show)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Window, draw(), draw(), Draw)
-
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Window, handle(int event), handle(event), Handle)
-
void border(int b) {
((fltk3::Window*)_p)->border(b);
}
Modified: branches/branch-3.0/include/FL/Fl_Wizard.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Wizard.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/Fl_Wizard.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,12 +33,19 @@
#include <FL/Fl_Group.H>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Wizard, WizardGroup)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Wizard, WizardGroup)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Wizard : public Fl_Group {
public:
+ FLTK3_WIDGET_VCALLS(WizardGroup)
+
Fl_Wizard(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::WizardGroup(x, y, w, h, label);
+ _p = new fltk3::WizardGroup_I(x, y, w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/glut.H
===================================================================
--- branches/branch-3.0/include/FL/glut.H 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/FL/glut.H 2011-09-18 20:11:00 UTC (rev 9048)
@@ -35,18 +35,18 @@
#include "Fl_Gl_Window.H"
-class FL_EXPORT Fl_Glut_Window : public Fl_Gl_Window {
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Glut_Window, GlutWindow)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Glut_Window, GlutWindow)
+FLTK3_WRAPPER_INTERFACE_WINDOW(Fl_Glut_Window, GlutWindow)
+FLTK3_WRAPPER_INTERFACE_END()
-protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(GlutWindow, draw(), draw(), Draw)
+class FL_EXPORT Fl_Glut_Window : public Fl_Gl_Window {
- FLTK3_WRAPPER_VCALLS_OBJECT(GlutWindow, draw_overlay(), draw_overlay(), DrawOverlay)
+public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, GlutWindow, handle(int event), handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(GlutWindow)
-public:
-
void make_current() {
((fltk3::GlutWindow*)_p)->make_current();
}
@@ -65,12 +65,12 @@
#endif
Fl_Glut_Window(int w, int h, const char *l) {
- _p = new fltk3::GlutWindow(w, h, l);
+ _p = new fltk3::GlutWindow_I(w, h, l);
_p->wrapper(this);
}
Fl_Glut_Window(int x, int y, int w, int h, const char *l) {
- _p = new fltk3::GlutWindow(x, y, w, h, l);
+ _p = new fltk3::GlutWindow_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/fltk3/HelpView.h
===================================================================
--- branches/branch-3.0/include/fltk3/HelpView.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/HelpView.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -44,6 +44,7 @@
# include "SharedImage.h"
# include "filename.h"
+
namespace fltk3 {
//
@@ -209,6 +210,7 @@
*/
class FLTK3_EXPORT HelpView : public fltk3::Group { // Help viewer widget
+ protected:
enum { RIGHT = -1, CENTER, LEFT }; ///< Alignments
char title_[1024]; ///< Title string
Modified: branches/branch-3.0/include/fltk3/HoldBrowser.h
===================================================================
--- branches/branch-3.0/include/fltk3/HoldBrowser.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/HoldBrowser.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,7 @@
#include "Browser.h"
+
namespace fltk3 {
/**
Modified: branches/branch-3.0/include/fltk3/Input_.h
===================================================================
--- branches/branch-3.0/include/fltk3/Input_.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Input_.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Widget.h"
-class Fl_Input_;
-
-
namespace fltk3 {
const uchar NORMAL_INPUT = 0;
@@ -105,8 +102,6 @@
*/
class FLTK3_EXPORT Input_ : public fltk3::Widget {
- friend class ::Fl_Input_;
-
/** \internal Storage for the text field. */
const char* value_;
Modified: branches/branch-3.0/include/fltk3/LightButton.h
===================================================================
--- branches/branch-3.0/include/fltk3/LightButton.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/LightButton.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,7 +33,6 @@
#include "Button.h"
-class Fl_Light_Button;
namespace fltk3 {
@@ -49,7 +48,6 @@
\image latex fltk3::LightButton.png "fltk3::LightButton" width=4cm
*/
class FLTK3_EXPORT LightButton : public Button {
- friend class ::Fl_Light_Button;
protected:
virtual void draw();
public:
Modified: branches/branch-3.0/include/fltk3/MenuBar.h
===================================================================
--- branches/branch-3.0/include/fltk3/MenuBar.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/MenuBar.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,7 +33,6 @@
#include "Menu_.h"
-class Fl_Menu_Bar;
namespace fltk3 {
@@ -65,12 +64,12 @@
*/
class FLTK3_EXPORT MenuBar : public fltk3::Menu_ {
- friend class ::Fl_Menu_Bar;
-
protected:
void draw();
+
public:
int handle(int);
+
/**
Creates a new fltk3::MenuBar widget using the given position,
size, and label string. The default boxtype is fltk3::UP_BOX.
Modified: branches/branch-3.0/include/fltk3/MenuButton.h
===================================================================
--- branches/branch-3.0/include/fltk3/MenuButton.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/MenuButton.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,7 +33,6 @@
#include "Menu_.h"
-class Fl_Menu_Button;
namespace fltk3 {
@@ -62,8 +61,6 @@
*/
class FLTK3_EXPORT MenuButton : public fltk3::Menu_ {
- friend class ::Fl_Menu_Button;
-
protected:
void draw();
public:
Modified: branches/branch-3.0/include/fltk3/MultiBrowser.h
===================================================================
--- branches/branch-3.0/include/fltk3/MultiBrowser.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/MultiBrowser.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,7 @@
#include "Browser.h"
+
namespace fltk3 {
/**
Modified: branches/branch-3.0/include/fltk3/MultilineInput.h
===================================================================
--- branches/branch-3.0/include/fltk3/MultilineInput.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/MultilineInput.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,6 +34,7 @@
#include "Input.h"
+
namespace fltk3 {
/**
Modified: branches/branch-3.0/include/fltk3/MultilineOutput.h
===================================================================
--- branches/branch-3.0/include/fltk3/MultilineOutput.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/MultilineOutput.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,7 @@
#include "Output.h"
+
namespace fltk3 {
/**
Modified: branches/branch-3.0/include/fltk3/PackedGroup.h
===================================================================
--- branches/branch-3.0/include/fltk3/PackedGroup.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/PackedGroup.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include <fltk3/Group.h>
-class Fl_Pack;
-
-
namespace fltk3 {
/**
@@ -57,8 +54,6 @@
*/
class FLTK3_EXPORT PackedGroup : public fltk3::Group {
- friend class ::Fl_Pack;
-
int spacing_;
public:
Modified: branches/branch-3.0/include/fltk3/Positioner.h
===================================================================
--- branches/branch-3.0/include/fltk3/Positioner.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Positioner.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,7 @@
#include "Widget.h"
+
namespace fltk3 {
/**
Modified: branches/branch-3.0/include/fltk3/Progress.h
===================================================================
--- branches/branch-3.0/include/fltk3/Progress.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Progress.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -38,9 +38,6 @@
#include "Widget.h"
-class Fl_Progress;
-
-
namespace fltk3 {
//
@@ -51,8 +48,6 @@
*/
class FLTK3_EXPORT Progress : public fltk3::Widget {
- friend class ::Fl_Progress;
-
float value_,
minimum_,
maximum_;
Modified: branches/branch-3.0/include/fltk3/ReturnButton.h
===================================================================
--- branches/branch-3.0/include/fltk3/ReturnButton.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/ReturnButton.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Button.h"
-class Fl_Return_Button;
-
-
namespace fltk3 {
/**
The fltk3::ReturnButton is a subclass of fltk3::Button that
@@ -47,10 +44,9 @@
*/
class FLTK3_EXPORT ReturnButton : public Button {
- friend class ::Fl_Return_Button;
-
protected:
void draw();
+
public:
int handle(int);
/**
Modified: branches/branch-3.0/include/fltk3/Roller.h
===================================================================
--- branches/branch-3.0/include/fltk3/Roller.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Roller.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Valuator.h"
-class Fl_Roller;
-
-
namespace fltk3 {
/**
@@ -47,10 +44,9 @@
*/
class FLTK3_EXPORT Roller : public fltk3::Valuator {
- friend class ::Fl_Roller;
-
protected:
void draw();
+
public:
int handle(int);
Roller(int X,int Y,int W,int H,const char* L=0);
Modified: branches/branch-3.0/include/fltk3/ScrollGroup.h
===================================================================
--- branches/branch-3.0/include/fltk3/ScrollGroup.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/ScrollGroup.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -35,9 +35,6 @@
#include "Scrollbar.h"
-class Fl_Scroll;
-
-
namespace fltk3 {
/**
@@ -101,8 +98,6 @@
*/
class FLTK3_EXPORT ScrollGroup : public fltk3::Group {
- friend class ::Fl_Scroll;
-
int xposition_, yposition_;
int oldx, oldy;
int scrollbar_size_;
Modified: branches/branch-3.0/include/fltk3/Slider.h
===================================================================
--- branches/branch-3.0/include/fltk3/Slider.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Slider.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Valuator.h"
-class Fl_Slider;
-
-
namespace fltk3 {
// values for type(), lowest bit indicate horizontal:
@@ -74,8 +71,6 @@
*/
class FLTK3_EXPORT Slider : public fltk3::Valuator {
- friend class ::Fl_Slider;
-
float slider_size_;
uchar slider_;
void _Slider();
Modified: branches/branch-3.0/include/fltk3/Spinner.h
===================================================================
--- branches/branch-3.0/include/fltk3/Spinner.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Spinner.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -159,7 +159,6 @@
void format(const char *f) { format_ = f; update(); }
int handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
switch (event) {
case fltk3::KEYDOWN :
case fltk3::SHORTCUT :
Modified: branches/branch-3.0/include/fltk3/TabGroup.h
===================================================================
--- branches/branch-3.0/include/fltk3/TabGroup.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/TabGroup.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Group.h"
-class Fl_Tabs;
-
-
namespace fltk3 {
/**
@@ -67,8 +64,6 @@
*/
class FLTK3_EXPORT TabGroup : public fltk3::Group {
- friend class ::Fl_Tabs;
-
fltk3::Widget *value_;
fltk3::Widget *push_;
int *tab_pos; // array of x-offsets of tabs per child + 1
Modified: branches/branch-3.0/include/fltk3/TextDisplay.h
===================================================================
--- branches/branch-3.0/include/fltk3/TextDisplay.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/TextDisplay.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -40,9 +40,6 @@
#include "TextBuffer.h"
-class Fl_Text_Display;
-
-
namespace fltk3 {
/**
@@ -55,8 +52,6 @@
*/
class FLTK3_EXPORT TextDisplay: public fltk3::Group {
-friend class ::Fl_Text_Display;
-
public:
/**
Modified: branches/branch-3.0/include/fltk3/TextEditor.h
===================================================================
--- branches/branch-3.0/include/fltk3/TextEditor.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/TextEditor.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -37,9 +37,6 @@
#include "TextDisplay.h"
-class Fl_Text_Editor;
-
-
namespace fltk3 {
// key will match in any state
@@ -54,8 +51,6 @@
*/
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);
Modified: branches/branch-3.0/include/fltk3/TiledGroup.h
===================================================================
--- branches/branch-3.0/include/fltk3/TiledGroup.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/TiledGroup.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,7 @@
#include "Group.h"
+
namespace fltk3 {
/**
Modified: branches/branch-3.0/include/fltk3/ToggleButton.h
===================================================================
--- branches/branch-3.0/include/fltk3/ToggleButton.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/ToggleButton.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,6 +33,7 @@
#include "Button.h"
+
namespace fltk3 {
/**
The toggle button is a push button that needs to be clicked once
Modified: branches/branch-3.0/include/fltk3/Tree.h
===================================================================
--- branches/branch-3.0/include/fltk3/Tree.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Tree.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -13,7 +13,6 @@
#include <fltk3/TreeItem.h>
#include <fltk3/TreePrefs.h>
-class Fl_Tree;
namespace fltk3 {
@@ -202,8 +201,6 @@
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)
Modified: branches/branch-3.0/include/fltk3/Valuator.h
===================================================================
--- branches/branch-3.0/include/fltk3/Valuator.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Valuator.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,7 +33,6 @@
#include "Widget.h"
-class Fl_Valuator;
namespace fltk3 {
@@ -56,8 +55,6 @@
*/
class FLTK3_EXPORT Valuator : public fltk3::Widget {
- friend class ::Fl_Valuator;
-
double value_;
double previous_value_;
double min, max; // truncates to this range *after* rounding
Modified: branches/branch-3.0/include/fltk3/ValueInput.h
===================================================================
--- branches/branch-3.0/include/fltk3/ValueInput.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/ValueInput.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,7 +34,6 @@
#include "Valuator.h"
#include "Input.h"
-class Fl_Value_Input;
namespace fltk3 {
@@ -68,8 +67,6 @@
*/
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 */
Modified: branches/branch-3.0/include/fltk3/ValueOutput.h
===================================================================
--- branches/branch-3.0/include/fltk3/ValueOutput.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/ValueOutput.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Valuator.h"
-class Fl_Value_Output;
-
-
namespace fltk3 {
/**
@@ -53,8 +50,6 @@
*/
class FLTK3_EXPORT ValueOutput : public fltk3::Valuator {
- friend class ::Fl_Value_Output;
-
uchar soft_;
protected:
Modified: branches/branch-3.0/include/fltk3/ValueSlider.h
===================================================================
--- branches/branch-3.0/include/fltk3/ValueSlider.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/ValueSlider.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,9 +34,6 @@
#include "Slider.h"
-class Fl_Value_Slider;
-
-
namespace fltk3 {
/**
@@ -47,8 +44,6 @@
*/
class FLTK3_EXPORT ValueSlider : public fltk3::Slider {
- friend class ::Fl_Value_Slider;
-
protected:
void draw();
public:
Modified: branches/branch-3.0/include/fltk3/Window.h
===================================================================
--- branches/branch-3.0/include/fltk3/Window.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/Window.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -36,7 +36,6 @@
class Fl_X;
-class Fl_Window;
namespace fltk3 {
@@ -62,7 +61,6 @@
*/
class FLTK3_EXPORT Window : public Group {
- friend class ::Fl_Window;
friend class WidgetWrapper;
static char *default_xclass_;
Modified: branches/branch-3.0/include/fltk3/WizardGroup.h
===================================================================
--- branches/branch-3.0/include/fltk3/WizardGroup.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3/WizardGroup.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -26,7 +26,7 @@
//
/* \file
- fltk3::WizardGroup widget . */
+ fltk3::WizardGroup widget . */
//
// Include necessary header files...
@@ -37,33 +37,36 @@
# include <fltk3/Group.h>
+
namespace fltk3 {
-
-/**
- This widget is based off the fltk3::TabGroup
- widget, but instead of displaying tabs it only changes "tabs" under
- program control. Its primary purpose is to support "wizards" that
- step a user through configuration or troubleshooting tasks.
-
- <P>As with fltk3::TabGroup, wizard panes are composed of child (usually
- fltk3::Group) widgets. Navigation buttons must be added separately.
-*/
-class FLTK3_EXPORT WizardGroup : public fltk3::Group {
-
- fltk3::Widget *value_;
-
- void draw();
-
+
+ /**
+ This widget is based off the fltk3::TabGroup
+ widget, but instead of displaying tabs it only changes "tabs" under
+ program control. Its primary purpose is to support "wizards" that
+ step a user through configuration or troubleshooting tasks.
+
+ <P>As with fltk3::TabGroup, wizard panes are composed of child (usually
+ fltk3::Group) widgets. Navigation buttons must be added separately.
+ */
+ class FLTK3_EXPORT WizardGroup : public fltk3::Group {
+
+ protected:
+
+ fltk3::Widget *value_;
+
+ void draw();
+
public:
-
- WizardGroup(int, int, int, int, const char * = 0);
-
- void next();
- void prev();
- fltk3::Widget *value();
- void value(fltk3::Widget *);
-};
-
+
+ WizardGroup(int, int, int, int, const char * = 0);
+
+ void next();
+ void prev();
+ fltk3::Widget *value();
+ void value(fltk3::Widget *);
+ };
+
}
#endif // !_Fl_Wizard_H_
Modified: branches/branch-3.0/include/fltk3gl/glut.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/glut.h 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/include/fltk3gl/glut.h 2011-09-18 20:11:00 UTC (rev 9048)
@@ -45,7 +45,6 @@
#include <fltk3/run.h>
#include "GLWindow.h"
-class Fl_Glut_Window;
namespace fltk3 {
@@ -54,9 +53,6 @@
(plus several more static variables hidden in glut_compatability.cxx):
*/
class FLTK3_EXPORT GlutWindow : public GLWindow {
-
- friend class ::Fl_Glut_Window;
-
void _init();
int mouse_down;
protected:
Modified: branches/branch-3.0/src/Makefile
===================================================================
--- branches/branch-3.0/src/Makefile 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/Makefile 2011-09-18 20:11:00 UTC (rev 9048)
@@ -105,7 +105,7 @@
fltk3/Window_fullscreen.cxx \
fltk3/Window_hotspot.cxx \
fltk3/Window_iconize.cxx \
- fltk3/Wizard.cxx \
+ fltk3/WizardGroup.cxx \
fltk3/XBMImage.cxx \
fltk3/XPMImage.cxx \
fltk3/abort.cxx \
Modified: branches/branch-3.0/src/fltk3/HelpView.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/HelpView.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/HelpView.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -437,7 +437,6 @@
void
fltk3::HelpView::draw()
{
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
int i; // Looping var
const fltk3::HelpBlock *block; // Pointer to current block
const char *ptr, // Pointer to text in block
@@ -2945,7 +2944,6 @@
int // O - 1 if we handled it, 0 otherwise
fltk3::HelpView::handle(int event) // I - Event to handle
{
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
static fltk3::HelpLink *linkp; // currently clicked link
int xx = fltk3::event_x() - x() + leftline_;
Modified: branches/branch-3.0/src/fltk3/Input.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Input.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Input.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -55,7 +55,6 @@
void fltk3::Input::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (input_type() == fltk3::HIDDEN_INPUT) return;
fltk3::Boxtype b = box();
if (damage() & fltk3::DAMAGE_ALL) draw_box(b, color());
@@ -594,7 +593,6 @@
}
int fltk3::Input::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
static int dnd_save_position, dnd_save_mark, drag_start = -1, newpos;
static fltk3::Widget *dnd_save_focus;
switch (event) {
Modified: branches/branch-3.0/src/fltk3/LightButton.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/LightButton.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/LightButton.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -38,7 +38,6 @@
#include "flstring.h"
void fltk3::LightButton::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
fltk3::Color col;
if (this==fltk3::pushed()) {
col = fltk3::color_average(fltk3::BLACK, color(), 0.2f);
@@ -156,7 +155,6 @@
}
int fltk3::LightButton::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
switch (event) {
case fltk3::RELEASE:
if (box()) redraw();
Modified: branches/branch-3.0/src/fltk3/MenuBar.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/MenuBar.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/MenuBar.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -30,7 +30,6 @@
#include <fltk3/draw.h>
void fltk3::MenuBar::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
draw_box();
if (!menu() || !menu()->text) return;
const fltk3::MenuItem* m;
@@ -53,7 +52,6 @@
}
int fltk3::MenuBar::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
const fltk3::MenuItem* v;
if (menu() && menu()->text) switch (event) {
case fltk3::ENTER:
Modified: branches/branch-3.0/src/fltk3/MenuButton.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/MenuButton.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/MenuButton.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,7 +34,6 @@
static fltk3::MenuButton *pressed_menu_button_ = 0;
void fltk3::MenuButton::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (!box() || type()) return;
int H = (labelsize()-3)&-2;
int X = x()+w()-H*2;
@@ -73,7 +72,6 @@
}
int fltk3::MenuButton::handle(int e) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(e), Handle)
if (!menu() || !menu()->text) return 0;
switch (e) {
case fltk3::ENTER: /* FALLTHROUGH */
Modified: branches/branch-3.0/src/fltk3/PackedGroup.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/PackedGroup.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/PackedGroup.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -80,7 +80,6 @@
}
void fltk3::PackedGroup::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
int tx = x()+fltk3::box_dx(box());
int ty = y()+fltk3::box_dy(box());
int tw = w()-fltk3::box_dw(box());
Modified: branches/branch-3.0/src/fltk3/Positioner.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Positioner.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Positioner.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -54,7 +54,6 @@
}
void fltk3::Positioner::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
draw(x(), y(), w(), h());
draw_label();
}
@@ -123,7 +122,6 @@
}
int fltk3::Positioner::handle(int e) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(e), Handle)
return handle(e, x(), y(), w(), h());
}
Modified: branches/branch-3.0/src/fltk3/Progress.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Progress.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Progress.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -53,7 +53,6 @@
/** Draws the progress bar. */
void fltk3::Progress::draw()
{
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
int progress; // Size of progress bar...
int bx, by, bw, bh; // Box areas...
int tx, tw; // Temporary X + width
Modified: branches/branch-3.0/src/fltk3/RepeatButton.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/RepeatButton.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/RepeatButton.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -38,7 +38,6 @@
}
int fltk3::RepeatButton::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
int newval;
switch (event) {
case fltk3::HIDE:
Modified: branches/branch-3.0/src/fltk3/ReturnButton.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/ReturnButton.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/ReturnButton.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -48,7 +48,6 @@
}
void fltk3::ReturnButton::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (type() == fltk3::HIDDEN_BUTTON) return;
draw_box(value() ? (down_box()?down_box():fltk3::down(box())) : box(),
value() ? selection_color() : color());
@@ -60,7 +59,6 @@
}
int fltk3::ReturnButton::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
if (event == fltk3::SHORTCUT &&
(fltk3::event_key() == fltk3::EnterKey || fltk3::event_key() == fltk3::KPEnterKey)) {
simulate_key_action();
Modified: branches/branch-3.0/src/fltk3/Roller.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Roller.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Roller.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -33,7 +33,6 @@
#include <math.h>
int fltk3::Roller::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
static int ipos;
int newpos = horizontal() ? fltk3::event_x() : fltk3::event_y();
switch (event) {
@@ -88,7 +87,6 @@
}
void fltk3::Roller::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (damage()&fltk3::DAMAGE_ALL) draw_box();
int X = x()+fltk3::box_dx(box());
int Y = y()+fltk3::box_dy(box());
Modified: branches/branch-3.0/src/fltk3/ScrollGroup.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/ScrollGroup.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/ScrollGroup.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -244,7 +244,6 @@
}
void fltk3::ScrollGroup::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
fix_scrollbar_order();
int X,Y,W,H; bbox(X,Y,W,H);
@@ -412,7 +411,6 @@
}
int fltk3::ScrollGroup::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
fix_scrollbar_order();
return Group::handle(event);
}
Modified: branches/branch-3.0/src/fltk3/Scrollbar.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Scrollbar.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Scrollbar.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -73,7 +73,6 @@
}
int fltk3::Scrollbar::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
// area of scrollbar:
int area;
int X=x(); int Y=y(); int W=w(); int H=h();
@@ -208,7 +207,6 @@
}
void fltk3::Scrollbar::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (damage()&fltk3::DAMAGE_ALL) draw_box();
int X = x()+fltk3::box_dx(box());
int Y = y()+fltk3::box_dy(box());
Modified: branches/branch-3.0/src/fltk3/Slider.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Slider.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Slider.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -218,7 +218,6 @@
}
void fltk3::Slider::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (damage()&fltk3::DAMAGE_ALL) draw_box();
draw(x()+fltk3::box_dx(box()),
y()+fltk3::box_dy(box()),
@@ -357,7 +356,6 @@
}
int fltk3::Slider::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
if (event == fltk3::PUSH && fltk3::visible_focus()) {
fltk3::focus(this);
redraw();
Modified: branches/branch-3.0/src/fltk3/TabGroup.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/TabGroup.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/TabGroup.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -159,8 +159,6 @@
}
int fltk3::TabGroup::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
-
fltk3::Widget *o;
int i;
@@ -317,7 +315,6 @@
enum {LEFT, RIGHT, SELECTED};
void fltk3::TabGroup::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
fltk3::Widget *v = value();
int H = tab_height();
Modified: branches/branch-3.0/src/fltk3/Table.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Table.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Table.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -698,7 +698,6 @@
// Handle FLTK events
int fltk3::Table::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
PRINTEVENT;
int ret = Group::handle(event); // let FLTK group handle events first
if (ret) {
@@ -1118,7 +1117,6 @@
// Then tell the group to draw over us.
//
void fltk3::Table::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
// Check if scrollbar size changed
if ( ( vscrollbar && (SCROLLBAR_SIZE != vscrollbar->w()) ) ||
( hscrollbar && (SCROLLBAR_SIZE != hscrollbar->h()) ) ) {
Modified: branches/branch-3.0/src/fltk3/TableRow.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/TableRow.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/TableRow.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -166,8 +166,6 @@
// Handle events
int fltk3::TableRow::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
-
// fprintf(stderr, "** EVENT: %s: EVENT XY=%d,%d\n",
// eventnames[event], fltk3::event_x(), fltk3::event_y()); // debugging
Modified: branches/branch-3.0/src/fltk3/TextDisplay.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/TextDisplay.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/TextDisplay.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -3606,7 +3606,6 @@
\brief Event handling.
*/
int fltk3::TextDisplay::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
if (!buffer()) return 0;
// This isn't very elegant!
if (!fltk3::event_inside(text_area.x, text_area.y, text_area.w, text_area.h) &&
Modified: branches/branch-3.0/src/fltk3/TextEditor.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/TextEditor.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/TextEditor.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -559,7 +559,6 @@
}
int fltk3::TextEditor::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
static int dndCursorPos;
if (!buffer()) return 0;
Modified: branches/branch-3.0/src/fltk3/TiledGroup.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/TiledGroup.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/TiledGroup.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -122,7 +122,6 @@
fltk3::CURSOR_MOVE};
int fltk3::TiledGroup::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
static int sdrag;
static int sdx, sdy;
static int sx, sy;
Modified: branches/branch-3.0/src/fltk3/Tree.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Tree.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Tree.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -265,7 +265,6 @@
/// Standard FLTK draw() method, handles draws the tree widget.
void fltk3::Tree::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
// Let group draw box+label but *NOT* children.
// We handle drawing children ourselves by calling each item's draw()
//
@@ -501,7 +500,6 @@
/// Standard FLTK event handler for this widget.
int fltk3::Tree::handle(int e) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(e), Handle)
int ret = 0;
// Developer note: fltk3::Browser_::handle() used for reference here..
// #include <fltk3/names.h> // for event debugging
Modified: branches/branch-3.0/src/fltk3/ValueInput.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/ValueInput.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/ValueInput.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -49,7 +49,6 @@
}
void fltk3::ValueInput::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (damage()&~fltk3::DAMAGE_CHILD) input.clear_damage(fltk3::DAMAGE_ALL);
input.box(box());
input.color(color(), selection_color());
@@ -70,7 +69,6 @@
}
int fltk3::ValueInput::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
double v;
int delta;
int mx = fltk3::event_x_root();
Modified: branches/branch-3.0/src/fltk3/ValueOutput.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/ValueOutput.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/ValueOutput.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -34,7 +34,6 @@
#include <fltk3/draw.h>
void fltk3::ValueOutput::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
fltk3::Boxtype b = box() ? box() : fltk3::DOWN_BOX;
int X = x()+fltk3::box_dx(b);
int Y = y()+fltk3::box_dy(b);
@@ -54,7 +53,6 @@
}
int fltk3::ValueOutput::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
if (!step()) return 0;
double v;
int delta;
Modified: branches/branch-3.0/src/fltk3/ValueSlider.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/ValueSlider.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/ValueSlider.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -43,7 +43,6 @@
}
void fltk3::ValueSlider::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
int sxx = x(), syy = y(), sww = w(), shh = h();
int bxx = x(), byy = y(), bww = w(), bhh = h();
if (horizontal()) {
@@ -66,7 +65,6 @@
}
int fltk3::ValueSlider::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
if (event == fltk3::PUSH && fltk3::visible_focus()) {
fltk3::focus(this);
redraw();
Modified: branches/branch-3.0/src/fltk3/Window.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Window.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/Window.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -103,8 +103,6 @@
}
void fltk3::Window::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
-
// The following is similar to fltk3::Group::draw(), but ...
// - we draw the box with x=0 and y=0 instead of x() and y()
// - we don't draw a label
Deleted: branches/branch-3.0/src/fltk3/Wizard.cxx
Copied: branches/branch-3.0/src/fltk3/WizardGroup.cxx (from rev 9045, branches/branch-3.0/src/fltk3/Wizard.cxx)
===================================================================
--- branches/branch-3.0/src/fltk3/WizardGroup.cxx (rev 0)
+++ branches/branch-3.0/src/fltk3/WizardGroup.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -0,0 +1,191 @@
+//
+// "$Id$"
+//
+// fltk3::WizardGroup widget routines.
+//
+// Copyright 1997-2010 by Easy Software Products.
+//
+// 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
+//
+// Contents:
+
+//
+// fltk3::WizardGroup::WizardGroup() - Create an fltk3::WizardGroup widget.
+// fltk3::WizardGroup::draw() - Draw the wizard border and visible child.
+// fltk3::WizardGroup::next() - Show the next child.
+// fltk3::WizardGroup::prev() - Show the previous child.
+// fltk3::WizardGroup::value() - Return the current visible child.
+// fltk3::WizardGroup::value() - Set the visible child.
+//
+
+//
+// Include necessary header files...
+//
+
+#include <fltk3/WizardGroup.h>
+#include <fltk3/Window.h>
+#include <fltk3/draw.h>
+
+
+//
+// 'fltk3::WizardGroup::WizardGroup()' - Create an fltk3::WizardGroup widget.
+//
+
+/**
+ The constructor creates the fltk3::WizardGroup widget at the specified
+ position and size.
+ <P>The inherited destructor destroys the widget and its children.
+*/
+fltk3::WizardGroup::WizardGroup(int xx, // I - Lefthand position
+ int yy, // I - Upper position
+ int ww, // I - Width
+ int hh, // I - Height
+ const char *l) : // I - Label
+ fltk3::Group(xx, yy, ww, hh, l)
+{
+ box(fltk3::THIN_UP_BOX);
+
+ value_ = (fltk3::Widget *)0;
+}
+
+
+//
+/** Draws the wizard border and visible child. */
+void fltk3::WizardGroup::draw() {
+ fltk3::Widget *kid; // Visible child
+ kid = value();
+ if (damage() & fltk3::DAMAGE_ALL)
+ {
+ // Redraw everything...
+ if (kid)
+ {
+ draw_box(box(), x(), y(), w(), h(), kid->color());
+ draw_child(*kid);
+ }
+ else
+ draw_box(box(), x(), y(), w(), h(), color());
+ }
+ else if (kid)
+ update_child(*kid);
+}
+
+
+/**
+ This method shows the next child of the wizard. If the last child
+ is already visible, this function does nothing.
+*/
+void fltk3::WizardGroup::next() {
+ int num_kids;
+ fltk3::Widget * const *kids;
+
+
+ if ((num_kids = children()) == 0)
+ return;
+
+ for (kids = array(); num_kids > 0; kids ++, num_kids --)
+ if ((*kids)->visible())
+ break;
+
+ if (num_kids > 1)
+ value(kids[1]);
+}
+
+/** Shows the previous child.*/
+void fltk3::WizardGroup::prev()
+{
+ int num_kids;
+ fltk3::Widget * const *kids;
+
+
+ if ((num_kids = children()) == 0)
+ return;
+
+ for (kids = array(); num_kids > 0; kids ++, num_kids --)
+ if ((*kids)->visible())
+ break;
+
+ if (num_kids > 0 && num_kids < children())
+ value(kids[-1]);
+}
+
+/** Gets the current visible child widget. */
+fltk3::Widget* fltk3::WizardGroup::value()
+{
+ int num_kids;
+ fltk3::Widget * const *kids;
+ fltk3::Widget *kid;
+
+
+ if ((num_kids = children()) == 0)
+ return ((fltk3::Widget *)0);
+
+ for (kids = array(), kid = (fltk3::Widget *)0; num_kids > 0; kids ++, num_kids --)
+ {
+ if ((*kids)->visible())
+ {
+ if (kid)
+ (*kids)->hide();
+ else
+ kid = *kids;
+ }
+ }
+
+ if (!kid)
+ {
+ kids --;
+ kid = *kids;
+ kid->show();
+ }
+
+ return (kid);
+}
+
+/** Sets the child widget that is visible.*/
+void fltk3::WizardGroup::value(fltk3::Widget *kid)
+{
+ int num_kids;
+ fltk3::Widget * const *kids;
+
+
+ if ((num_kids = children()) == 0)
+ return;
+
+ for (kids = array(); num_kids > 0; kids ++, num_kids --)
+ {
+ if (*kids == kid)
+ {
+ if (!kid->visible())
+ kid->show();
+ }
+ else
+ (*kids)->hide();
+ }
+
+ // This will restore the mouse pointer to the window's default cursor
+ // whenever the wizard pane is changed. Otherwise text widgets that
+ // show the next pane may leave the cursor set to the I beam, etc...
+ if (window()) window()->cursor(fltk3::CURSOR_DEFAULT);
+}
+
+
+
+//
+// End of "$Id$".
+//
Modified: branches/branch-3.0/src/fltk3/run.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/run.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/run.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -1482,7 +1482,6 @@
int fltk3::Window::handle(int ev)
{
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(ev), Handle)
if (parent()) {
switch (ev) {
case fltk3::SHOW:
Modified: branches/branch-3.0/src/fltk3/show_colormap.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/show_colormap.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3/show_colormap.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -74,7 +74,6 @@
}
void ColorMenu::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (damage() != fltk3::DAMAGE_CHILD) {
fltk3::draw_box(fltk3::UP_BOX,0,0,w(),h(),color());
for (int c = 0; c < 256; c++) drawbox((fltk3::Color)c);
@@ -86,7 +85,6 @@
}
int ColorMenu::handle(int e) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(e), Handle)
fltk3::Color c = which;
switch (e) {
case fltk3::PUSH:
Modified: branches/branch-3.0/src/fltk3gl/glut_compatability.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/glut_compatability.cxx 2011-09-18 16:44:11 UTC (rev 9047)
+++ branches/branch-3.0/src/fltk3gl/glut_compatability.cxx 2011-09-18 20:11:00 UTC (rev 9048)
@@ -68,7 +68,6 @@
static int indraw;
void fltk3::GlutWindow::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
glut_window = this;
indraw = 1;
if (!valid()) {reshape(w(),h()); valid(1);}
@@ -89,7 +88,6 @@
static void domenu(int, int, int);
int fltk3::GlutWindow::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
make_current();
int ex = fltk3::event_x();
int ey = fltk3::event_y();
[ Direct Link to Message ] | |
