Author: matt
Date: 2012-05-17 10:27:02 -0700 (Thu, 17 May 2012)
New Revision: 9517
Log:
Added Symbol class in preparation of porting FLTK 2 symbols and boxtypes to
FLTK3.
Added:
branches/branch-3.0/include/fltk3/Symbol.h
branches/branch-3.0/src/fltk3/Symbol.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/src/Makefile
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2012-05-17 17:20:40 UTC (rev 9516)
+++ branches/branch-3.0/fltk.flw 2012-05-17 17:27:02 UTC (rev 9517)
@@ -315,7 +315,7 @@
folder Libraries {open
uuid_Xcode4_Group {AFD010B3-DA64-4C5E-9682-891530BD3B73}
} {
- lib_target fltk3 {
+ lib_target fltk3 {open
uuid_Xcode4_BuildConfigurationList {F8A317C2-0F96-4681-8A97-DA6FDEF118E2}
uuid_Xcode4_DebugBuildConfiguration
{034870F2-FE15-4D23-AD0D-62ED38449392}
uuid_Xcode4_ReleaseBuildConfiguration
{D584B52C-FED3-4E71-A47E-A60BA05375B9}
@@ -333,7 +333,7 @@
target_path lib
makefile_path src
} {
- folder Headers {
+ folder Headers {open
uuid_Xcode4_Group {C2F00625-E401-4002-85F6-FA183D17629D}
} {
file_ref {all.h} {
@@ -1152,6 +1152,14 @@
list_env 124
filename_and_path {include/fltk3/Style.h}
}
+ file_ref {Symbol.h} {
+ uuid_Xcode4_BuildFile {6EEB01E1-267A-46E1-B1D8-05F0273ADC3D}
+ uuid_Xcode4_FileRef {CB9F9BA9-B77D-4AD1-BD75-2E531758DFD7}
+ uuid_Xcode4_BuildFileInHeaders {D1CD7CF8-7BF5-4F05-9231-EFC286F2FC84}
+ build_env 96
+ list_env 124
+ filename_and_path {include/fltk3/Symbol.h}
+ }
file_ref {SysMenuBar.h} {
uuid_Xcode4_BuildFile {F9CF92AB-336C-4D0A-BFF4-835EC59F6CD1}
uuid_Xcode4_FileRef {A76F03E8-29AB-434C-A057-DA682A140721}
@@ -1417,7 +1425,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} {
@@ -1787,6 +1795,12 @@
uuid_Xcode4_BuildFileInSources {19513486-168E-430B-88A7-6896DF857E7B}
filename_and_path {src/fltk3/Style.cxx}
}
+ file_ref {Symbol.cxx} {selected
+ uuid_Xcode4_BuildFile {4C99D47E-B0FF-41D9-A0D6-6E83035FE0CA}
+ uuid_Xcode4_FileRef {C1CF3831-C842-4935-AAF0-D3E14C1ADF24}
+ uuid_Xcode4_BuildFileInSources {E40F07C5-F71B-4790-BDA6-8E0B9EF93F20}
+ filename_and_path {src/fltk3/Symbol.cxx}
+ }
file_ref {Table.cxx} {
uuid_Xcode4_BuildFile {BFA14DC7-600F-49DF-99DF-24A48C8142E6}
uuid_Xcode4_FileRef {02584243-5408-4D4A-96A5-3FA806F5BCFA}
@@ -8330,7 +8344,7 @@
target_path test2
makefile_path test2
} {
- file_ref {adjuster.cxx} {selected
+ file_ref {adjuster.cxx} {
uuid_Xcode4_BuildFileInSources {638CAE7C-A7DF-490E-811D-4A5E65C16AE3}
uuid_Xcode4_FileRef {92B55871-2766-4F0C-BBC4-BE3540567DBF}
build_env 64
Modified: branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3.vcproj 2012-05-17 17:20:40 UTC
(rev 9516)
+++ branches/branch-3.0/ide/VisualC2008/fltk3.vcproj 2012-05-17 17:27:02 UTC
(rev 9517)
@@ -1449,6 +1449,29 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\src\fltk3\Symbol.cxx"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\src\fltk3\Table.cxx"
>
<FileConfiguration
Modified: branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj 2012-05-17 17:20:40 UTC
(rev 9516)
+++ branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj 2012-05-17 17:27:02 UTC
(rev 9517)
@@ -485,6 +485,13 @@
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <ClCompile Include="..\..\src\fltk3\Symbol.cxx">
+ <Optimization
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
<ClCompile Include="..\..\src\fltk3\Table.cxx">
<Optimization
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Modified: branches/branch-3.0/ide/VisualC6/fltk3.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3.dsp 2012-05-17 17:20:40 UTC (rev
9516)
+++ branches/branch-3.0/ide/VisualC6/fltk3.dsp 2012-05-17 17:27:02 UTC (rev
9517)
@@ -307,6 +307,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\src\fltk3\Symbol.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\fltk3\Table.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
2012-05-17 17:20:40 UTC (rev 9516)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2012-05-17 17:27:02 UTC (rev 9517)
@@ -104,6 +104,7 @@
550F71EE23A3D8E00A890F88 /* SingleWindow.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 17A03BA54D8D67397D8BDCEE /* SingleWindow.cxx */;
};
052ACB65AAC112E4DFA7B7C1 /* Slider.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 085FAF82201B9FD1927A8BAA /* Slider.cxx */; };
195134865585E031DF857E7B /* Style.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = CAA3AD964456E0912791C783 /* Style.cxx */; };
+ E40F07C5B08B33AD9EF93F20 /* Symbol.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C1CF3831817779114C1ADF24 /* Symbol.cxx */; };
E0D6CAE34DC85454B5C61EBA /* Table.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 025842431942A90D06F5BCFA /* Table.cxx */; };
56C8DD01C98608D164F2047B /* TableRow.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 7097EA09B5B8FCFEEBE28CA8 /* TableRow.cxx */; };
135F22ECC6C16457F223E1EA /* TabGroup.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 7712638143B8C0B51FF6A61B /* TabGroup.cxx */; };
@@ -302,6 +303,7 @@
58F214FCF3D78AEA6EBE814F /* Slider.h in Headers */ = {isa =
PBXBuildFile; fileRef = 7BDF52555005D838492790A2 /* Slider.h */; };
32F02A4A0503D782BF4AC7AF /* Spinner.h in Headers */ = {isa =
PBXBuildFile; fileRef = CAC6AA7711A18CC39662C445 /* Spinner.h */; };
4D7A7651D8484CBB4F5ACD8B /* Style.h in Headers */ = {isa =
PBXBuildFile; fileRef = 14D65E2CE0929E7D80EBE3A6 /* Style.h */; };
+ D1CD7CF834F07DF386F2FC84 /* Symbol.h in Headers */ = {isa =
PBXBuildFile; fileRef = CB9F9BA9FDAC93261758DFD7 /* Symbol.h */; };
52D66EE74C4F004504F481BE /* SysMenuBar.h in Headers */ = {isa =
PBXBuildFile; fileRef = A76F03E86AE77A3F2A140721 /* SysMenuBar.h */; };
2ABC0F5B9F7C4012195F0A58 /* TabGroup.h in Headers */ = {isa =
PBXBuildFile; fileRef = 789EF90B6C6E5D44F4E6A32F /* TabGroup.h */; };
0F97400005C5CEA32C40A1AB /* Table.h in Headers */ = {isa =
PBXBuildFile; fileRef = B367CABCC2161E23D1F55A5C /* Table.h */; };
@@ -4533,6 +4535,7 @@
7BDF52555005D838492790A2 /* Slider.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Slider.h; path = ../../include/fltk3/Slider.h; sourceTree = SOURCE_ROOT; };
CAC6AA7711A18CC39662C445 /* Spinner.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Spinner.h; path = ../../include/fltk3/Spinner.h; sourceTree = SOURCE_ROOT; };
14D65E2CE0929E7D80EBE3A6 /* Style.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Style.h; path = ../../include/fltk3/Style.h; sourceTree = SOURCE_ROOT; };
+ CB9F9BA9FDAC93261758DFD7 /* Symbol.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Symbol.h; path = ../../include/fltk3/Symbol.h; sourceTree = SOURCE_ROOT; };
A76F03E86AE77A3F2A140721 /* SysMenuBar.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SysMenuBar.h; path = ../../include/fltk3/SysMenuBar.h; sourceTree =
SOURCE_ROOT; };
789EF90B6C6E5D44F4E6A32F /* TabGroup.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
TabGroup.h; path = ../../include/fltk3/TabGroup.h; sourceTree = SOURCE_ROOT; };
B367CABCC2161E23D1F55A5C /* Table.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Table.h; path = ../../include/fltk3/Table.h; sourceTree = SOURCE_ROOT; };
@@ -4626,6 +4629,7 @@
17A03BA54D8D67397D8BDCEE /* SingleWindow.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = SingleWindow.cxx; path = ../../src/fltk3/SingleWindow.cxx; sourceTree =
SOURCE_ROOT; };
085FAF82201B9FD1927A8BAA /* Slider.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Slider.cxx; path = ../../src/fltk3/Slider.cxx; sourceTree = SOURCE_ROOT;
};
CAA3AD964456E0912791C783 /* Style.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Style.cxx; path = ../../src/fltk3/Style.cxx; sourceTree = SOURCE_ROOT; };
+ C1CF3831817779114C1ADF24 /* Symbol.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Symbol.cxx; path = ../../src/fltk3/Symbol.cxx; sourceTree = SOURCE_ROOT;
};
025842431942A90D06F5BCFA /* Table.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Table.cxx; path = ../../src/fltk3/Table.cxx; sourceTree = SOURCE_ROOT; };
7097EA09B5B8FCFEEBE28CA8 /* TableRow.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = TableRow.cxx; path = ../../src/fltk3/TableRow.cxx; sourceTree =
SOURCE_ROOT; };
7712638143B8C0B51FF6A61B /* TabGroup.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = TabGroup.cxx; path = ../../src/fltk3/TabGroup.cxx; sourceTree =
SOURCE_ROOT; };
@@ -6390,6 +6394,7 @@
7BDF52555005D838492790A2 /* Slider.h */,
CAC6AA7711A18CC39662C445 /* Spinner.h */,
14D65E2CE0929E7D80EBE3A6 /* Style.h */,
+ CB9F9BA9FDAC93261758DFD7 /* Symbol.h */,
A76F03E86AE77A3F2A140721 /* SysMenuBar.h */,
789EF90B6C6E5D44F4E6A32F /* TabGroup.h */,
B367CABCC2161E23D1F55A5C /* Table.h */,
@@ -6490,6 +6495,7 @@
17A03BA54D8D67397D8BDCEE /* SingleWindow.cxx */,
085FAF82201B9FD1927A8BAA /* Slider.cxx */,
CAA3AD964456E0912791C783 /* Style.cxx */,
+ C1CF3831817779114C1ADF24 /* Symbol.cxx */,
025842431942A90D06F5BCFA /* Table.cxx */,
7097EA09B5B8FCFEEBE28CA8 /* TableRow.cxx */,
7712638143B8C0B51FF6A61B /* TabGroup.cxx */,
@@ -8118,6 +8124,7 @@
58F214FCF3D78AEA6EBE814F /* Slider.h in Headers
*/,
32F02A4A0503D782BF4AC7AF /* Spinner.h in
Headers */,
4D7A7651D8484CBB4F5ACD8B /* Style.h in Headers
*/,
+ D1CD7CF834F07DF386F2FC84 /* Symbol.h in Headers
*/,
52D66EE74C4F004504F481BE /* SysMenuBar.h in
Headers */,
2ABC0F5B9F7C4012195F0A58 /* TabGroup.h in
Headers */,
0F97400005C5CEA32C40A1AB /* Table.h in Headers
*/,
@@ -10996,6 +11003,7 @@
550F71EE23A3D8E00A890F88 /* SingleWindow.cxx in
Sources */,
052ACB65AAC112E4DFA7B7C1 /* Slider.cxx in
Sources */,
195134865585E031DF857E7B /* Style.cxx in
Sources */,
+ E40F07C5B08B33AD9EF93F20 /* Symbol.cxx in
Sources */,
E0D6CAE34DC85454B5C61EBA /* Table.cxx in
Sources */,
56C8DD01C98608D164F2047B /* TableRow.cxx in
Sources */,
135F22ECC6C16457F223E1EA /* TabGroup.cxx in
Sources */,
Added: branches/branch-3.0/include/fltk3/Symbol.h
===================================================================
--- branches/branch-3.0/include/fltk3/Symbol.h (rev 0)
+++ branches/branch-3.0/include/fltk3/Symbol.h 2012-05-17 17:27:02 UTC (rev
9517)
@@ -0,0 +1,41 @@
+
+//
+// "$Id: Symbol.h 9300 2012-03-23 20:36:00Z ianmacarthur $"
+//
+// Symbol header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2012 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+/** \file
+ fltk3::Symbol class . */
+
+#ifndef FLTK3_SYMBOL_H
+#define FLTK3_SYMBOL_H
+
+
+
+#endif
+
+//
+// End of "$Id: Style.h 9300 2012-03-23 20:36:00Z ianmacarthur $".
+//
Modified: branches/branch-3.0/src/Makefile
===================================================================
--- branches/branch-3.0/src/Makefile 2012-05-17 17:20:40 UTC (rev 9516)
+++ branches/branch-3.0/src/Makefile 2012-05-17 17:27:02 UTC (rev 9517)
@@ -82,6 +82,7 @@
fltk3/SingleWindow.cxx \
fltk3/Slider.cxx \
fltk3/Style.cxx \
+ fltk3/Symbol.cxx \
fltk3/Table.cxx \
fltk3/TableRow.cxx \
fltk3/TabGroup.cxx \
Added: branches/branch-3.0/src/fltk3/Symbol.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Symbol.cxx (rev 0)
+++ branches/branch-3.0/src/fltk3/Symbol.cxx 2012-05-17 17:27:02 UTC (rev
9517)
@@ -0,0 +1,33 @@
+//
+// "$Id: Symbol.cxx 9041 2011-09-16 21:30:05Z matt $"
+//
+// Symbol widget class for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2012 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+#include <fltk3/Symbol.h>
+
+
+//
+// End of "$Id: Symbol.cxx 9041 2011-09-16 21:30:05Z matt $".
+//
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
