Author: matt
Date: 2011-08-22 03:39:40 -0700 (Mon, 22 Aug 2011)
New Revision: 8989
Log:
FLTK3: tested adding a new source file (Style, which will contains the very
useful FLTK2 style setup).
Added:
branches/branch-3.0/fltk3/Style.h
branches/branch-3.0/src/Style.cxx
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/Fl_Type.cxx
branches/branch-3.0/fluid/Fl_Type.h
branches/branch-3.0/fluid/file_visualc_2010.cxx
branches/branch-3.0/fluid/fluid.cxx
branches/branch-3.0/ide/VisualC2008/fltk.vcproj
branches/branch-3.0/ide/VisualC2010/fltk.vcxproj
branches/branch-3.0/ide/VisualC6/fltk.dsp
branches/branch-3.0/ide/VisualC6/fltkdll.dsp
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/src/CMakeLists.txt
branches/branch-3.0/src/Makefile
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-21 16:41:02 UTC (rev 8988)
+++ branches/branch-3.0/fltk.flw 2011-08-22 10:39:40 UTC (rev 8989)
@@ -2,7 +2,7 @@
version 3.0000
header_name {.h}
code_name {.cxx}
-workspace FLTK {open selected
+workspace FLTK {open
uuid_Xcode4_Root {2204C862-3EAB-44CD-B0A8-6DF16FFDC8F4}
uuid_Xcode4_ProductsGroup {A3B55F76-F5F9-4F9E-8A45-2778583213A1}
uuid_Xcode4_Group {341D2CD3-06FB-47E4-B35C-D1F9B51C7293}
@@ -12,7 +12,6 @@
uuid_Xcode4_ReleaseBuildConfiguration {C5259E66-FBF8-43A2-B30F-8D59BBE3CF16}
uuid_VC2008_Workspace {D21EA206-7BBC-4F5B-8518-A798E56EE0FC}
uuid_VC2010_Workspace {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
- build_env 1
} {
folder Applications {open
uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
@@ -316,7 +315,7 @@
folder Libraries {open
uuid_Xcode4_Group {AFD010B3-DA64-4C5E-9682-891530BD3B73}
} {
- lib_target fltk {
+ lib_target fltk {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}
@@ -334,7 +333,7 @@
target_path lib
makefile_path src
} {
- folder Headers {
+ folder Headers {open selected
uuid_Xcode4_Group {C2F00625-E401-4002-85F6-FA183D17629D}
} {
file_ref {Adjuster.h} {
@@ -1225,6 +1224,14 @@
list_env 124
filename_and_path {fltk3/Spinner.h}
}
+ file_ref {Style.h} {
+ uuid_Xcode4_BuildFile {3E5FDE91-66B5-4D67-8BB6-92C0A8FA56D7}
+ uuid_Xcode4_FileRef {14D65E2C-A6C4-4656-A8EF-369280EBE3A6}
+ uuid_Xcode4_BuildFileInHeaders {4D7A7651-910F-4947-9747-DBFC4F5ACD8B}
+ build_env 96
+ list_env 124
+ filename_and_path {fltk3/Style.h}
+ }
file_ref {SysMenuBar.h} {
uuid_Xcode4_BuildFile {F9CF92AB-336C-4D0A-BFF4-835EC59F6CD1}
uuid_Xcode4_FileRef {A76F03E8-29AB-434C-A057-DA682A140721}
@@ -1490,7 +1497,7 @@
filename_and_path {fltk3/Xutf8.h}
}
}
- folder Sources {
+ folder Sources {open
uuid_Xcode4_Group {91990322-0AF9-42F2-A077-713540EE5AB1}
} {
file_ref {Fl_cocoa.mm} {
@@ -1847,6 +1854,12 @@
uuid_Xcode4_BuildFileInSources {052ACB65-EF8A-454B-AFDB-BD3FDFA7B7C1}
filename_and_path {src/Fl_Slider.cxx}
}
+ file_ref {Style.cxx} {
+ uuid_Xcode4_BuildFile {DD895EB1-D352-4D09-99D7-D9DE1758D9F9}
+ uuid_Xcode4_FileRef {CAA3AD96-0CC5-4893-8893-68022791C783}
+ uuid_Xcode4_BuildFileInSources {19513486-168E-430B-88A7-6896DF857E7B}
+ filename_and_path {src/Style.cxx}
+ }
file_ref {Fl_Sys_Menu_Bar.cxx} {
uuid_Xcode4_BuildFile {FC5F7A11-9A94-4596-BCF0-458EB54BF587}
uuid_Xcode4_FileRef {43C12A4D-7C89-4BAE-B250-C5E2307220CC}
Copied: branches/branch-3.0/fltk3/Style.h (from rev 8988,
branches/branch-3.0/fltk3/Widget.h)
===================================================================
--- branches/branch-3.0/fltk3/Style.h (rev 0)
+++ branches/branch-3.0/fltk3/Style.h 2011-08-22 10:39:40 UTC (rev 8989)
@@ -0,0 +1,39 @@
+//
+// "$Id: Style.h 8623 2011-04-24 17:09:41Z AlbrechtS $"
+//
+// Style header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+/** \file
+ fltk3::Style class . */
+
+#ifndef FLTK3_STYLE_H
+#define FLTK3_STYLE_H
+
+
+#endif
+
+//
+// End of "$Id: Style.h 8623 2011-04-24 17:09:41Z AlbrechtS $".
+//
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-08-21 16:41:02 UTC (rev
8988)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-08-22 10:39:40 UTC (rev
8989)
@@ -202,6 +202,7 @@
extern int show_comments;
extern Fl_Panel *the_file_panel;
+extern char *get_temporary_return_buffer(int size);
////////////////////////////////////////////////////////////////
@@ -288,7 +289,9 @@
// Generate a descriptive text for this item, to put in browser & window titles
const char* Fl_Type::title() {
- const char* c = name(); if (c) return c;
+ const char* c = name();
+ if (c)
+ return c;
return type_name();
}
@@ -1166,7 +1169,7 @@
}
const char *Fl_Tool_Type::get_UUID_Xcode(const char *name) {
- static char buf[25];
+ char *buf = get_temporary_return_buffer(25);
const char *uuid = get_UUID(name);
// 937C4900-51AA-4C11-8DD3-7AB5 9944F03E
unsigned int a, b, c, d, e, f;
@@ -1238,8 +1241,8 @@
}
// add the file 's' to this item
if (e!=s) {
- char buf[2048];
- fltk3::filename_relative(buf, 2048, s, basedir);
+ char buf[FLTK3_PATH_MAX];
+ fltk3::filename_relative(buf, FLTK3_PATH_MAX, s, basedir);
Fl_File_Type *o = new Fl_File_Type();
o->filename(buf);
o->add(this);
@@ -1388,35 +1391,33 @@
return 0L;
}
-// Note: we assume that the name is not longer than 63 characters... .
// Note: we do not deal with UTF8 chracters here!
const char *Fl_Target_Type::caps_name() {
- if (!pAltName) pAltName = (char*)malloc(64);
const char *s = name();
- char *d = pAltName;
+ char *buf = get_temporary_return_buffer(strlen(s)+1);
+ char *d = buf;
while (*s) {
*d++ = toupper(*s++);
}
*d++ = 0;
- return pAltName;
+ return buf;
}
-// Note: we assume that the name is not longer than 63 characters... .
// Note: we do not deal with UTF8 chracters here!
const char *Fl_Target_Type::lowercase_name() {
- if (!pAltName) pAltName = (char*)malloc(64);
const char *s = name();
- char *d = pAltName;
+ char *buf = get_temporary_return_buffer(strlen(s)+1);
+ char *d = buf;
while (*s) {
*d++ = tolower(*s++);
}
*d++ = 0;
- return pAltName;
+ return buf;
}
Fl_Target_Type *Fl_Target_Type::find(const char *name, char end) {
// find a partial string, if 'end' is set to a character
- char buf[2048];
+ char buf[FLTK3_PATH_MAX];
strcpy(buf, name);
if (end) {
char *sep = strchr(buf, end);
@@ -1749,13 +1750,13 @@
}
const char *Fl_File_Type::filename_relative(const char *fnbase, const char
*tgtbase) {
- char src_name[2048];
- static char result[2048];
+ char src_name[FLTK3_PATH_MAX];
+ char *result = get_temporary_return_buffer(FLTK3_PATH_MAX);
const char *fn = filename();
if (fn) {
strcpy(src_name, fnbase);
strcat(src_name, fn);
- fltk3::filename_relative(result, 2048, src_name, tgtbase);
+ fltk3::filename_relative(result, FLTK3_PATH_MAX, src_name, tgtbase);
return result;
} else {
return 0;
Modified: branches/branch-3.0/fluid/Fl_Type.h
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.h 2011-08-21 16:41:02 UTC (rev 8988)
+++ branches/branch-3.0/fluid/Fl_Type.h 2011-08-22 10:39:40 UTC (rev 8989)
@@ -335,13 +335,11 @@
class Fl_Target_Type : public Fl_Tool_Type {
char *pTargetPath;
char *pMakefilePath;
- char *pAltName;
public:
Fl_Target_Type() :
Fl_Tool_Type(),
pTargetPath(0),
- pMakefilePath(0),
- pAltName(0)
+ pMakefilePath(0)
{
pTargetPath = strdup("");
pMakefilePath = strdup("");
@@ -349,7 +347,6 @@
~Fl_Target_Type() {
if (pTargetPath) free(pTargetPath);
if (pMakefilePath) free(pMakefilePath);
- if (pAltName) free(pAltName);
}
const char *type_name() { return "target"; }
const char *caps_name();
Modified: branches/branch-3.0/fluid/file_visualc_2010.cxx
===================================================================
--- branches/branch-3.0/fluid/file_visualc_2010.cxx 2011-08-21 16:41:02 UTC
(rev 8988)
+++ branches/branch-3.0/fluid/file_visualc_2010.cxx 2011-08-22 10:39:40 UTC
(rev 8989)
@@ -41,11 +41,12 @@
static const char *VC2010_Project = "VC2010_Project";
extern const char *filename;
+extern char *get_temporary_return_buffer(int size);
// ------------ file conversion
------------------------------------------------
const char *DOS_path(const char *filename) {
- static char buf[2048];
+ char *buf = get_temporary_return_buffer(FLTK3_PATH_MAX);
char *c;
strcpy(buf, filename);
for (c=buf;;c++) {
Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx 2011-08-21 16:41:02 UTC (rev 8988)
+++ branches/branch-3.0/fluid/fluid.cxx 2011-08-22 10:39:40 UTC (rev 8989)
@@ -119,6 +119,29 @@
////////////////////////////////////////////////////////////////
+// this little helper class allows us to return C strings without the need for
+// static buffers. When using this, the same function can be called and used
+// as an argument for another function call, for example:
+// printf("%s %s %s\n", file->name(), file->DOS_name(), file->caps_name())'
+
+const int MAX_RET_BUF = 10;
+char *tmp_ret_buf[MAX_RET_BUF];
+int tmp_ret_sze[MAX_RET_BUF];
+int curr_ret_buf = 0;
+
+char *get_temporary_return_buffer(int size) {
+ int i = curr_ret_buf;
+ curr_ret_buf++;
+ if (curr_ret_buf>=MAX_RET_BUF) curr_ret_buf = 0;
+ if (!tmp_ret_buf[i] || tmp_ret_sze[i]<size) {
+ tmp_ret_buf[i] = (char*)realloc(tmp_ret_buf[i], size);
+ tmp_ret_sze[i] = size;
+ }
+ return tmp_ret_buf[i];
+}
+
+////////////////////////////////////////////////////////////////
+
const char *filename;
void set_filename(const char *c);
void set_modflag(int mf);
@@ -1839,8 +1862,8 @@
}
#endif
-
int main(int argc,char **argv) {
+
int i = 1;
if (!fltk3::args(argc,argv,i,arg) || i < argc-1) {
Modified: branches/branch-3.0/ide/VisualC2008/fltk.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk.vcproj 2011-08-21 16:41:02 UTC
(rev 8988)
+++ branches/branch-3.0/ide/VisualC2008/fltk.vcproj 2011-08-22 10:39:40 UTC
(rev 8989)
@@ -1426,6 +1426,29 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\src\Style.cxx"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\src\Fl_Sys_Menu_Bar.cxx"
>
<FileConfiguration
Modified: branches/branch-3.0/ide/VisualC2010/fltk.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk.vcxproj 2011-08-21 16:41:02 UTC
(rev 8988)
+++ branches/branch-3.0/ide/VisualC2010/fltk.vcxproj 2011-08-22 10:39:40 UTC
(rev 8989)
@@ -478,6 +478,13 @@
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <ClCompile Include="..\..\src\Style.cxx">
+ <Optimization
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
<ClCompile Include="..\..\src\Fl_Sys_Menu_Bar.cxx">
<Optimization
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Modified: branches/branch-3.0/ide/VisualC6/fltk.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk.dsp 2011-08-21 16:41:02 UTC (rev
8988)
+++ branches/branch-3.0/ide/VisualC6/fltk.dsp 2011-08-22 10:39:40 UTC (rev
8989)
@@ -303,6 +303,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\src\Style.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\Fl_Sys_Menu_Bar.cxx
# End Source File
# Begin Source File
Modified: branches/branch-3.0/ide/VisualC6/fltkdll.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltkdll.dsp 2011-08-21 16:41:02 UTC
(rev 8988)
+++ branches/branch-3.0/ide/VisualC6/fltkdll.dsp 2011-08-22 10:39:40 UTC
(rev 8989)
@@ -311,6 +311,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\src\Style.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\Fl_Sys_Menu_Bar.cxx
# End Source File
# Begin Source File
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-21 16:41:02 UTC (rev 8988)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-22 10:39:40 UTC (rev 8989)
@@ -102,6 +102,7 @@
7CB9D27B0F1CE28C828F280B /* Fl_Shared_Image.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 8580401C9D38395ECAD127AC /* Fl_Shared_Image.cxx
*/; };
550F71EE23A3D8E00A890F88 /* Fl_Single_Window.cxx in Sources */
= {isa = PBXBuildFile; fileRef = 17A03BA54D8D67397D8BDCEE /*
Fl_Single_Window.cxx */; };
052ACB65AAC112E4DFA7B7C1 /* Fl_Slider.cxx in Sources */ = {isa
= PBXBuildFile; fileRef = 085FAF82201B9FD1927A8BAA /* Fl_Slider.cxx */; };
+ 195134865585E031DF857E7B /* Style.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = CAA3AD964456E0912791C783 /* Style.cxx */; };
B7E4B117D093ED504AD5127B /* Fl_Sys_Menu_Bar.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 43C12A4D372777B2307220CC /* Fl_Sys_Menu_Bar.cxx
*/; };
E0D6CAE34DC85454B5C61EBA /* Fl_Table.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 025842431942A90D06F5BCFA /* Fl_Table.cxx */; };
56C8DD01C98608D164F2047B /* Fl_Table_Row.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 7097EA09B5B8FCFEEBE28CA8 /* Fl_Table_Row.cxx */;
};
@@ -307,6 +308,7 @@
6B6E93959C26469571F9DFD1 /* SingleWindow.h in Headers */ = {isa
= PBXBuildFile; fileRef = 632C7A3607B6D6DF36ACC513 /* SingleWindow.h */; };
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 */; };
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 */; };
@@ -3907,6 +3909,7 @@
632C7A3607B6D6DF36ACC513 /* SingleWindow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SingleWindow.h; path = ../../fltk3/SingleWindow.h; sourceTree = SOURCE_ROOT; };
7BDF52555005D838492790A2 /* Slider.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Slider.h; path = ../../fltk3/Slider.h; sourceTree = SOURCE_ROOT; };
CAC6AA7711A18CC39662C445 /* Spinner.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Spinner.h; path = ../../fltk3/Spinner.h; sourceTree = SOURCE_ROOT; };
+ 14D65E2CE0929E7D80EBE3A6 /* Style.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Style.h; path = ../../fltk3/Style.h; sourceTree = SOURCE_ROOT; };
A76F03E86AE77A3F2A140721 /* SysMenuBar.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SysMenuBar.h; path = ../../fltk3/SysMenuBar.h; sourceTree = SOURCE_ROOT; };
789EF90B6C6E5D44F4E6A32F /* TabGroup.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
TabGroup.h; path = ../../fltk3/TabGroup.h; sourceTree = SOURCE_ROOT; };
B367CABCC2161E23D1F55A5C /* Table.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
Table.h; path = ../../fltk3/Table.h; sourceTree = SOURCE_ROOT; };
@@ -3998,6 +4001,7 @@
8580401C9D38395ECAD127AC /* Fl_Shared_Image.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Fl_Shared_Image.cxx; path = ../../src/Fl_Shared_Image.cxx; sourceTree =
SOURCE_ROOT; };
17A03BA54D8D67397D8BDCEE /* Fl_Single_Window.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Fl_Single_Window.cxx; path = ../../src/Fl_Single_Window.cxx; sourceTree
= SOURCE_ROOT; };
085FAF82201B9FD1927A8BAA /* Fl_Slider.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Fl_Slider.cxx; path = ../../src/Fl_Slider.cxx; sourceTree = SOURCE_ROOT;
};
+ CAA3AD964456E0912791C783 /* Style.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Style.cxx; path = ../../src/Style.cxx; sourceTree = SOURCE_ROOT; };
43C12A4D372777B2307220CC /* Fl_Sys_Menu_Bar.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Fl_Sys_Menu_Bar.cxx; path = ../../src/Fl_Sys_Menu_Bar.cxx; sourceTree =
SOURCE_ROOT; };
025842431942A90D06F5BCFA /* Fl_Table.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Fl_Table.cxx; path = ../../src/Fl_Table.cxx; sourceTree = SOURCE_ROOT; };
7097EA09B5B8FCFEEBE28CA8 /* Fl_Table_Row.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = Fl_Table_Row.cxx; path = ../../src/Fl_Table_Row.cxx; sourceTree =
SOURCE_ROOT; };
@@ -5318,6 +5322,7 @@
632C7A3607B6D6DF36ACC513 /* SingleWindow.h */,
7BDF52555005D838492790A2 /* Slider.h */,
CAC6AA7711A18CC39662C445 /* Spinner.h */,
+ 14D65E2CE0929E7D80EBE3A6 /* Style.h */,
A76F03E86AE77A3F2A140721 /* SysMenuBar.h */,
789EF90B6C6E5D44F4E6A32F /* TabGroup.h */,
B367CABCC2161E23D1F55A5C /* Table.h */,
@@ -5416,6 +5421,7 @@
8580401C9D38395ECAD127AC /* Fl_Shared_Image.cxx
*/,
17A03BA54D8D67397D8BDCEE /*
Fl_Single_Window.cxx */,
085FAF82201B9FD1927A8BAA /* Fl_Slider.cxx */,
+ CAA3AD964456E0912791C783 /* Style.cxx */,
43C12A4D372777B2307220CC /* Fl_Sys_Menu_Bar.cxx
*/,
025842431942A90D06F5BCFA /* Fl_Table.cxx */,
7097EA09B5B8FCFEEBE28CA8 /* Fl_Table_Row.cxx */,
@@ -6566,6 +6572,7 @@
6B6E93959C26469571F9DFD1 /* SingleWindow.h in
Headers */,
58F214FCF3D78AEA6EBE814F /* Slider.h in Headers
*/,
32F02A4A0503D782BF4AC7AF /* Spinner.h in
Headers */,
+ 4D7A7651D8484CBB4F5ACD8B /* Style.h in Headers
*/,
52D66EE74C4F004504F481BE /* SysMenuBar.h in
Headers */,
2ABC0F5B9F7C4012195F0A58 /* TabGroup.h in
Headers */,
0F97400005C5CEA32C40A1AB /* Table.h in Headers
*/,
@@ -9006,6 +9013,7 @@
7CB9D27B0F1CE28C828F280B /* Fl_Shared_Image.cxx
in Sources */,
550F71EE23A3D8E00A890F88 /*
Fl_Single_Window.cxx in Sources */,
052ACB65AAC112E4DFA7B7C1 /* Fl_Slider.cxx in
Sources */,
+ 195134865585E031DF857E7B /* Style.cxx in
Sources */,
B7E4B117D093ED504AD5127B /* Fl_Sys_Menu_Bar.cxx
in Sources */,
E0D6CAE34DC85454B5C61EBA /* Fl_Table.cxx in
Sources */,
56C8DD01C98608D164F2047B /* Fl_Table_Row.cxx in
Sources */,
Modified: branches/branch-3.0/src/CMakeLists.txt
===================================================================
--- branches/branch-3.0/src/CMakeLists.txt 2011-08-21 16:41:02 UTC (rev
8988)
+++ branches/branch-3.0/src/CMakeLists.txt 2011-08-22 10:39:40 UTC (rev
8989)
@@ -56,6 +56,7 @@
Fl_Shared_Image.cxx
Fl_Single_Window.cxx
Fl_Slider.cxx
+ Style.cxx
Fl_Sys_Menu_Bar.cxx
Fl_Table.cxx
Fl_Table_Row.cxx
Modified: branches/branch-3.0/src/Makefile
===================================================================
--- branches/branch-3.0/src/Makefile 2011-08-21 16:41:02 UTC (rev 8988)
+++ branches/branch-3.0/src/Makefile 2011-08-22 10:39:40 UTC (rev 8989)
@@ -81,6 +81,7 @@
Fl_Shared_Image.cxx \
Fl_Single_Window.cxx \
Fl_Slider.cxx \
+ Style.cxx \
Fl_Sys_Menu_Bar.cxx \
Fl_Table.cxx \
Fl_Table_Row.cxx \
Copied: branches/branch-3.0/src/Style.cxx (from rev 8987,
branches/branch-3.0/src/Fl_Widget.cxx)
===================================================================
--- branches/branch-3.0/src/Style.cxx (rev 0)
+++ branches/branch-3.0/src/Style.cxx 2011-08-22 10:39:40 UTC (rev 8989)
@@ -0,0 +1,34 @@
+//
+// "$Id$"
+//
+// Base widget class for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2011 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+#include <fltk3/Style.h>
+
+// nothing to see here yet
+
+//
+// End of "$Id$".
+//
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
