| |
Author: matt
Date: 2011-08-26 02:39:36 -0700 (Fri, 26 Aug 2011)
New Revision: 9014
Log:
FLTK3: now compiles again on Linux
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/Fl_Menu_Type.cxx
branches/branch-3.0/ide/VisualC2008/demo.vcproj
branches/branch-3.0/ide/VisualC2008/fltk.sln
branches/branch-3.0/ide/VisualC2010/demo.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk.sln
branches/branch-3.0/ide/VisualC6/fltk.dsw
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/src/fltk3/PostScript.cxx
branches/branch-3.0/src/fltk3/color.cxx
branches/branch-3.0/src/fltk3/draw_image.cxx
branches/branch-3.0/src/fltk3/print_panel.cxx
branches/branch-3.0/src/fltk3/x11NativeFileChooser.cxx
branches/branch-3.0/src/fltk3gl/GLChoice.cxx
branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx
branches/branch-3.0/src/fltk3gl/GLOverlay.cxx
branches/branch-3.0/src/fltk3gl/GLWindow.cxx
branches/branch-3.0/src/fltk3gl/gl_draw.cxx
branches/branch-3.0/src/fltk3gl/gl_start.cxx
branches/branch-3.0/src/makedepend
branches/branch-3.0/test/CubeView.h
branches/branch-3.0/test/Makefile
branches/branch-3.0/test/buttons.cxx
branches/branch-3.0/test/makedepend
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/fltk.flw 2011-08-26 09:39:36 UTC (rev 9014)
@@ -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}
@@ -3229,7 +3228,7 @@
folder Tests {
uuid_Xcode4_Group {5B388C4A-A5BB-4166-B79C-7335DA628E4D}
} {
- app_target Demo {
+ app_target demo {
uuid_Xcode4_FluidBuildRule {2D727B96-E7A2-4AE3-9D7A-4F7F659C111E}
uuid_Xcode4_CopyFilesBuildPhase {5CEA130D-C6C9-4262-85E4-33EDAE54E1AF}
uuid_Xcode4_ProductFileReference {84AB5A59-0B0A-4F0C-8A1E-D4A51C07CE22}
Modified: branches/branch-3.0/fluid/Fl_Menu_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -215,6 +215,8 @@
write_c(" ((%s*)(o", k);
Fl_Type* t = parent; while (t->is_menu_item()) t = t->parent;
Fl_Type *q = 0;
+ if (t && !strcmp(t->type_name(), "InputChoice"))
+ write_c("->parent()");
for (t = t->parent; t && t->is_widget() && !is_class(); q = t, t = t->parent)
write_c("->parent()");
if (!q || strcmp(q->type_name(), "widget_class"))
Modified: branches/branch-3.0/ide/VisualC2008/demo.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/demo.vcproj 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/ide/VisualC2008/demo.vcproj 2011-08-26 09:39:36 UTC (rev 9014)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="Demo"
+ Name="demo"
ProjectGUID="{AAC13E91-C3A5-4742-8D97-26F6E3019AE4}"
- RootNamespace="Demo"
+ RootNamespace="demo"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\test"
- IntermediateDirectory=".\Demo_debug"
+ IntermediateDirectory=".\demo_debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -39,7 +39,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Demo_debug\Demo.tlb"
+ TypeLibraryName=".\demo_debug\demo.tlb"
HeaderFileName=""
/>
<Tool
@@ -49,10 +49,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Demo_debug\Demo.pch"
- AssemblerListingLocation=".\Demo_debug\"
- ObjectFile=".\Demo_debug\"
- ProgramDataBaseFileName=".\Demo_debug\"
+ PrecompiledHeaderFile=".\demo_debug\demo.pch"
+ AssemblerListingLocation=".\demo_debug\"
+ ObjectFile=".\demo_debug\"
+ ProgramDataBaseFileName=".\demo_debug\"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -71,13 +71,13 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="fltk3d.lib comctl32.lib"
- OutputFile="..\..\test\Demod.exe"
+ OutputFile="..\..\test\demod.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib"
IgnoreDefaultLibraryNames="libcd"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Demo_debug\Demo.pdb"
+ ProgramDatabaseFile=".\demo_debug\demo.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -108,7 +108,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\test"
- IntermediateDirectory=".\Demo_release"
+ IntermediateDirectory=".\demo_release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -129,7 +129,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Demo_release\Demo.tlb"
+ TypeLibraryName=".\demo_release\demo.tlb"
HeaderFileName=""
/>
<Tool
@@ -141,10 +141,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Demo_release\Demo.pch"
- AssemblerListingLocation=".\Demo_release\"
- ObjectFile=".\Demo_release\"
- ProgramDataBaseFileName=".\Demo_release\"
+ PrecompiledHeaderFile=".\demo_release\demo.pch"
+ AssemblerListingLocation=".\demo_release\"
+ ObjectFile=".\demo_release\"
+ ProgramDataBaseFileName=".\demo_release\"
SuppressStartupBanner="true"
CompileAs="0"
/>
@@ -162,12 +162,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="fltk3.lib comctl32.lib"
- OutputFile="..\..\test\Demo.exe"
+ OutputFile="..\..\test\demo.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib"
IgnoreDefaultLibraryNames="libcd"
- ProgramDatabaseFile=".\Demo_release\Demo.pdb"
+ ProgramDatabaseFile=".\demo_release\demo.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
Modified: branches/branch-3.0/ide/VisualC2008/fltk.sln
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk.sln 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/ide/VisualC2008/fltk.sln 2011-08-26 09:39:36 UTC (rev 9014)
@@ -41,7 +41,7 @@
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "Demo", "Demo.vcproj", "{AAC13E91-C3A5-4742-8D97-26F6E3019AE4}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "demo", "demo.vcproj", "{AAC13E91-C3A5-4742-8D97-26F6E3019AE4}"
ProjectSection(ProjectDependencies) = postProject
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
{001A9787-8FD8-4B62-8476-8FDAFC41D7E2} = {001A9787-8FD8-4B62-8476-8FDAFC41D7E2}
Modified: branches/branch-3.0/ide/VisualC2010/demo.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/demo.vcxproj 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/ide/VisualC2010/demo.vcxproj 2011-08-26 09:39:36 UTC (rev 9014)
@@ -50,7 +50,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Demo_debug\Demo.tlb</TypeLibraryName>
+ <TypeLibraryName>.\demo_debug\demo.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -71,7 +71,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>..\..\test\Demod.exe</OutputFile>
+ <OutputFile>..\..\test\demod.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -90,7 +90,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Demo_release\Demo.tlb</TypeLibraryName>
+ <TypeLibraryName>.\demo_release\demo.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -115,7 +115,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>..\..\test\Demo.exe</OutputFile>
+ <OutputFile>..\..\test\demo.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
Modified: branches/branch-3.0/ide/VisualC2010/fltk.sln
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk.sln 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/ide/VisualC2010/fltk.sln 2011-08-26 09:39:36 UTC (rev 9014)
@@ -14,7 +14,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3zlib", "fltk3zlib.vcxproj", "{8051E81E-8228-43EA-AABA-FE4E48CB10AD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo", "Demo.vcxproj", "{283CBEE7-44BE-4D32-9144-DA32275415D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo.vcxproj", "{283CBEE7-44BE-4D32-9144-DA32275415D5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adjuster", "adjuster.vcxproj", "{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}"
EndProject
Modified: branches/branch-3.0/ide/VisualC6/fltk.dsw
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk.dsw 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/ide/VisualC6/fltk.dsw 2011-08-26 09:39:36 UTC (rev 9014)
@@ -174,7 +174,7 @@
###############################################################################
-Project: "Demo"=".\Demo.dsp" - Package Owner=<4>
+Project: "demo"=".\demo.dsp" - Package Owner=<4>
Package=<5>
{{{
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj 2011-08-26 09:39:36 UTC (rev 9014)
@@ -4296,7 +4296,7 @@
F7D33A211C18D89A010BD86F /* demo.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = demo.cxx; path = ../../test/demo.cxx; sourceTree = SOURCE_ROOT; };
ECA7517BC91AD72F47C2906D /* demo.menu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = demo.menu; path = ../../test/demo.menu; sourceTree = SOURCE_ROOT; };
3B0CB05A4901BC51AEEE2EF4 /* CoreFoundation.framework */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; };
- 84AB5A5944065EBB1C07CE22 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 84AB5A5944065EBB1C07CE22 /* demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
3D06E7D8CF94CB0498A70787 /* adjuster.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adjuster.cxx; path = ../../test/adjuster.cxx; sourceTree = SOURCE_ROOT; };
A7E21FA5BAC62C721A556B3A /* adjuster.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = adjuster.app; sourceTree = BUILT_PRODUCTS_DIR; };
CD16450F6D272EFBF36C2AAF /* arc.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arc.cxx; path = ../../test/arc.cxx; sourceTree = SOURCE_ROOT; };
@@ -5157,7 +5157,7 @@
06A7B68E2100DB960872987D /* fltk3png.framework */,
C03975F619684D3461888340 /* fltk3jpeg.framework */,
AFDEBB8CE5A31C066586BF8B /* fltk3zlib.framework */,
- 84AB5A5944065EBB1C07CE22 /* Demo.app */,
+ 84AB5A5944065EBB1C07CE22 /* demo.app */,
A7E21FA5BAC62C721A556B3A /* adjuster.app */,
5DBEAD2FAC3F38E608805827 /* arc.app */,
4DC5C5FFB3FF63725C76B0BF /* ask.app */,
@@ -5901,7 +5901,7 @@
name = Dependencies;
sourceTree = "<group>";
};
- 4FE4FAD2FE23BEC9572EFB87 /* Demo */ = {
+ 4FE4FAD2FE23BEC9572EFB87 /* demo */ = {
isa = PBXGroup;
children = (
F7D33A211C18D89A010BD86F /* demo.cxx */,
@@ -5909,7 +5909,7 @@
07C5E7CFC29D2362DB721D90 /* Dependencies */,
3B0CB05A4901BC51AEEE2EF4 /* CoreFoundation.framework */,
);
- name = Demo;
+ name = demo;
sourceTree = "<group>";
};
2D1A26A5E5CDC4CC29939DA3 /* adjuster */ = {
@@ -6492,7 +6492,7 @@
5B388C4AE4DDC4A9DA628E4D /* Tests */ = {
isa = PBXGroup;
children = (
- 4FE4FAD2FE23BEC9572EFB87 /* Demo */,
+ 4FE4FAD2FE23BEC9572EFB87 /* demo */,
2D1A26A5E5CDC4CC29939DA3 /* adjuster */,
CC5DA609F462A5BD2C1EFFEB /* arc */,
531972FCEFA0AF92CB9F7A71 /* ask */,
@@ -6920,9 +6920,9 @@
productReference = AFDEBB8CE5A31C066586BF8B /* fltk3zlib.framework */;
productType = "com.apple.product-type.framework";
};
- CDB664E8321BA71442DD3E90 /* Demo */ = {
+ CDB664E8321BA71442DD3E90 /* demo */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 107353D703161605FE85ABAA /* Build configuration list for PBXNativeTarget "Demo" */;
+ buildConfigurationList = 107353D703161605FE85ABAA /* Build configuration list for PBXNativeTarget "demo" */;
buildPhases = (
21E86F07351623FACECE5432 /* Resources */,
B3C4660E4166F2F77A8F35F3 /* Sources */,
@@ -7003,9 +7003,9 @@
EAD2BC52B71CC15485F436FE /* valuators */,
984398501521C2EEA4EA4FE7 /* Fluid */,
);
- name = Demo;
- productName = Demo;
- productReference = 84AB5A5944065EBB1C07CE22 /* Demo.app */;
+ name = demo;
+ productName = demo;
+ productReference = 84AB5A5944065EBB1C07CE22 /* demo.app */;
productType = "com.apple.product-type.application";
};
4A3556DA840F389B5E85F061 /* adjuster */ = {
@@ -8444,7 +8444,7 @@
87465A7F0F0821C6F896CA29 /* fltk3png */,
E08AAC0C48D8A8B2784F6D46 /* fltk3jpeg */,
B5BA5465BD7A0C8F93B338C7 /* fltk3zlib */,
- CDB664E8321BA71442DD3E90 /* Demo */,
+ CDB664E8321BA71442DD3E90 /* demo */,
4A3556DA840F389B5E85F061 /* adjuster */,
B31420D206B6B179619291E3 /* arc */,
9D55EB9DB0861FB9CA044623 /* ask */,
@@ -11472,10 +11472,10 @@
../../include/fltk3jpeg,
../../include/fltk3zlib,
);
- INFOPLIST_FILE = "plists/Demo-Info.plist";
+ INFOPLIST_FILE = "plists/demo-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "";
- PRODUCT_NAME = "Demo";
+ PRODUCT_NAME = "demo";
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wno-format-security",
@@ -11507,10 +11507,10 @@
../../include/fltk3jpeg,
../../include/fltk3zlib,
);
- INFOPLIST_FILE = "plists/Demo-Info.plist";
+ INFOPLIST_FILE = "plists/demo-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "";
- PRODUCT_NAME = "Demo";
+ PRODUCT_NAME = "demo";
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wno-format-security",
@@ -16507,7 +16507,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 107353D703161605FE85ABAA /* Build configuration list for PBXNativeTarget "Demo" */ = {
+ 107353D703161605FE85ABAA /* Build configuration list for PBXNativeTarget "demo" */ = {
isa = XCConfigurationList;
buildConfigurations = (
06CF865E3E95FFAB371A7A0F /* Debug */,
Modified: branches/branch-3.0/src/fltk3/PostScript.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/PostScript.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3/PostScript.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -33,7 +33,7 @@
#include <fltk3/PostScript.h>
#include <fltk3/NativeFileChooser.h>
#if defined(USE_X11)
-#include "Fl_Font.H"
+#include "font.h"
#if USE_XFT
#include <X11/Xft/Xft.h>
#endif
Modified: branches/branch-3.0/src/fltk3/color.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/color.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3/color.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -106,7 +106,7 @@
}
static unsigned fl_cmap[256] = {
-#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
+#include "cmap.h" // this is a file produced by "cmap.cxx":
};
# if HAVE_OVERLAY
Modified: branches/branch-3.0/src/fltk3/draw_image.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/draw_image.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3/draw_image.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -62,7 +62,7 @@
# include <fltk3/run.h>
# include <fltk3/draw.h>
# include <fltk3/x.h>
-# include "Fl_XColor.H"
+# include "xcolor.h"
# include "flstring.h"
static XImage xi; // template used to pass info to X
Modified: branches/branch-3.0/src/fltk3/print_panel.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/print_panel.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3/print_panel.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -44,7 +44,7 @@
#include "print_panel.h"
#include <stdio.h>
#include <stdlib.h>
-#include "../src/core/flstring.h"
+#include "flstring.h"
#include <fltk3/Preferences.h>
#include <fltk3/IntInput.h>
Modified: branches/branch-3.0/src/fltk3/x11NativeFileChooser.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/x11NativeFileChooser.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3/x11NativeFileChooser.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -33,7 +33,7 @@
#define FLTK_CHOOSER_MULTI fltk3::FileChooser::MULTI
#define FLTK_CHOOSER_CREATE fltk3::FileChooser::CREATE
-#include "Fl_Native_File_Chooser_common.cxx"
+#include "NativeFileChooser_common.cxx"
#include <sys/stat.h>
#include <string.h>
Modified: branches/branch-3.0/src/fltk3gl/GLChoice.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLChoice.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3gl/GLChoice.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -31,7 +31,7 @@
# include <fltk3/run.h>
# include <fltk3/x.h>
# include <stdlib.h>
-# include "GLChoice.H"
+# include "GLChoice.h"
# include <fltk3gl/glDraw.h>
# include "../fltk3/flstring.h"
# include <fltk3/utf8.h>
Modified: branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -28,7 +28,7 @@
#include <config.h>
#include <fltk3/Printer.h>
#include <fltk3gl/GLWindow.h>
-#include "GLChoice.H"
+#include "GLChoice.h"
#include <fltk3/run.h>
#ifndef __APPLE__
#include <fltk3/draw.h>
Modified: branches/branch-3.0/src/fltk3gl/GLOverlay.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLOverlay.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3gl/GLOverlay.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -30,7 +30,7 @@
#include <fltk3/run.h>
#include <fltk3/x.h>
-#include "GLChoice.H"
+#include "GLChoice.h"
#include <fltk3gl/GLWindow.h>
#include <stdlib.h>
Modified: branches/branch-3.0/src/fltk3gl/GLWindow.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLWindow.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3gl/GLWindow.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -38,7 +38,7 @@
#ifdef __APPLE__
#include <fltk3gl/gl.h>
#endif
-#include "GLChoice.H"
+#include "GLChoice.h"
#include <fltk3gl/GLWindow.h>
#include <stdlib.h>
#include <fltk3/utf8.h>
Modified: branches/branch-3.0/src/fltk3gl/gl_draw.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/gl_draw.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3gl/gl_draw.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -36,7 +36,7 @@
#include <fltk3/x.h>
#include <fltk3/draw.h>
#include <fltk3/Device.h>
-#include "GLChoice.H"
+#include "GLChoice.h"
#include "../fltk3/font.h"
#include <fltk3/utf8.h>
Modified: branches/branch-3.0/src/fltk3gl/gl_start.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/gl_start.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/fltk3gl/gl_start.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -44,7 +44,7 @@
#include <fltk3/Window.h>
#include <fltk3/x.h>
#include <fltk3/draw.h>
-#include "GLChoice.H"
+#include "GLChoice.h"
static GLContext context;
static int clip_state_number=-1;
Modified: branches/branch-3.0/src/makedepend
===================================================================
--- branches/branch-3.0/src/makedepend 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/src/makedepend 2011-08-26 09:39:36 UTC (rev 9014)
@@ -1751,7 +1751,7 @@
fltk3gl/GLChoice.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
fltk3gl/GLChoice.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
fltk3gl/GLChoice.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
-fltk3gl/GLChoice.o: ../include/fltk3/Window.h fltk3gl/GLChoice.H
+fltk3gl/GLChoice.o: ../include/fltk3/Window.h fltk3gl/GLChoice.h
fltk3gl/GLChoice.o: ../include/fltk3gl/glDraw.h ../include/fltk3gl/gl.h
fltk3gl/GLChoice.o: ../include/fltk3/enumerations.h fltk3/flstring.h
fltk3gl/GLChoice.o: ../include/fltk3/Export.h ../include/fltk3/utf8.h
@@ -1776,13 +1776,13 @@
fltk3gl/GLDevicePlugin.o: ../include/fltk3/draw.h
fltk3gl/GLDevicePlugin.o: ../include/fltk3/enumerations.h
fltk3gl/GLDevicePlugin.o: ../include/fltk3/PostScript.h
-fltk3gl/GLDevicePlugin.o: ../include/fltk3gl/GLWindow.h fltk3gl/GLChoice.H
+fltk3gl/GLDevicePlugin.o: ../include/fltk3gl/GLWindow.h fltk3gl/GLChoice.h
fltk3gl/GLDevicePlugin.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
fltk3gl/GLOverlay.o: ../include/config.h ../include/fltk3/run.h
fltk3gl/GLOverlay.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
fltk3gl/GLOverlay.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
fltk3gl/GLOverlay.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
-fltk3gl/GLOverlay.o: ../include/fltk3/Window.h fltk3gl/GLChoice.H
+fltk3gl/GLOverlay.o: ../include/fltk3/Window.h fltk3gl/GLChoice.h
fltk3gl/GLOverlay.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
fltk3gl/GLOverlay.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
fltk3gl/GLOverlay.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
@@ -1794,7 +1794,7 @@
fltk3gl/GLWindow.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
fltk3gl/GLWindow.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
fltk3gl/GLWindow.o: ../include/fltk3/Xutf8.h ../include/fltk3/x.h
-fltk3gl/GLWindow.o: ../include/fltk3/Window.h fltk3gl/GLChoice.H
+fltk3gl/GLWindow.o: ../include/fltk3/Window.h fltk3gl/GLChoice.h
fltk3gl/GLWindow.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
fltk3gl/GLWindow.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
fltk3gl/GLWindow.o: ../include/fltk3/utf8.h
@@ -1878,7 +1878,7 @@
fltk3gl/gl_draw.o: ../include/fltk3/Preferences.h ../include/fltk3/Image.h
fltk3gl/gl_draw.o: ../include/fltk3/Bitmap.h ../include/fltk3/Image.h
fltk3gl/gl_draw.o: ../include/fltk3/Pixmap.h ../include/fltk3/RGBImage.h
-fltk3gl/gl_draw.o: fltk3gl/GLChoice.H fltk3/font.h ../include/fltk3/Xutf8.h
+fltk3gl/gl_draw.o: fltk3gl/GLChoice.h fltk3/font.h ../include/fltk3/Xutf8.h
fltk3gl/gl_draw.o: ../include/fltk3/utf8.h
fltk3gl/gl_start.o: ../include/config.h ../include/fltk3/run.h
fltk3gl/gl_start.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
@@ -1893,7 +1893,7 @@
fltk3gl/gl_start.o: ../include/fltk3/Plugin.h ../include/fltk3/Preferences.h
fltk3gl/gl_start.o: ../include/fltk3/Image.h ../include/fltk3/Bitmap.h
fltk3gl/gl_start.o: ../include/fltk3/Image.h ../include/fltk3/Pixmap.h
-fltk3gl/gl_start.o: ../include/fltk3/RGBImage.h fltk3gl/GLChoice.H
+fltk3gl/gl_start.o: ../include/fltk3/RGBImage.h fltk3gl/GLChoice.h
fltk3gl/glut_compatability.o: fltk3/flstring.h ../include/fltk3/Export.h
fltk3gl/glut_compatability.o: ../include/config.h ../include/fltk3gl/glut.h
fltk3gl/glut_compatability.o: ../include/fltk3gl/gl.h
Modified: branches/branch-3.0/test/CubeView.h
===================================================================
--- branches/branch-3.0/test/CubeView.h 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/test/CubeView.h 2011-08-26 09:39:36 UTC (rev 9014)
@@ -30,7 +30,7 @@
#include <config.h>
#include <fltk3/run.h>
#if HAVE_GL
-# include <fltk3gl/GlWindow.h>
+# include <fltk3gl/GLWindow.h>
# include <fltk3gl/gl.h>
#else
# include <fltk3/Box.h>
Modified: branches/branch-3.0/test/Makefile
===================================================================
--- branches/branch-3.0/test/Makefile 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/test/Makefile 2011-08-26 09:39:36 UTC (rev 9014)
@@ -102,7 +102,7 @@
utf8.cxx
ALL = \
- Demo$(EXEEXT) \
+ demo$(EXEEXT) \
adjuster$(EXEEXT) \
arc$(EXEEXT) \
ask$(EXEEXT) \
@@ -268,7 +268,7 @@
# All demos depend on the FLTK library...
$(ALL): $(FLTK3_LIBNAME)
-Demo$(EXEEXT): demo.o $(FLTK3_LIB_NAME)
+demo$(EXEEXT): demo.o $(FLTK3_LIB_NAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINK_FLTK3) $(LDLIBS)
Modified: branches/branch-3.0/test/buttons.cxx
===================================================================
--- branches/branch-3.0/test/buttons.cxx 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/test/buttons.cxx 2011-08-26 09:39:36 UTC (rev 9014)
@@ -101,7 +101,7 @@
o->box(fltk3::Boxtype(fltk3::UP_BOX|fltk3::TIE_LEFT|fltk3::TIE_TOP));
o->shortcut('=');
} // fltk3::Button* o
- fltk3::Box *tie = new fltk3::Box(180,170,120,60,"multiple buttons can be tied together visually using the fltk3::TIE_... flags with the box type");
+ fltk3::Box *tie = new fltk3::Box(180,180,120,60,"multiple buttons can be tied together visually using the fltk3::TIE_... flags with the box type");
tie->align(fltk3::ALIGN_WRAP);
tie->labelsize(11);
Modified: branches/branch-3.0/test/makedepend
===================================================================
--- branches/branch-3.0/test/makedepend 2011-08-25 22:07:10 UTC (rev 9013)
+++ branches/branch-3.0/test/makedepend 2011-08-26 09:39:36 UTC (rev 9014)
@@ -210,7 +210,7 @@
CubeView.o: CubeView.h ../include/config.h ../include/fltk3/run.h
CubeView.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
CubeView.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
-CubeView.o: ../include/fltk3/enumerations.h ../include/fltk3gl/GlWindow.h
+CubeView.o: ../include/fltk3/enumerations.h ../include/fltk3gl/GLWindow.h
CubeView.o: ../include/fltk3/Window.h ../include/fltk3gl/gl.h
CubeView.o: ../include/fltk3/enumerations.h
CubeMain.o: ../include/config.h ../include/fltk3/run.h
@@ -223,7 +223,7 @@
CubeMain.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
CubeMain.o: ../include/fltk3/Group.h ../include/fltk3/Roller.h
CubeMain.o: ../include/fltk3/Valuator.h ../include/fltk3/Slider.h
-CubeMain.o: ../include/fltk3/Box.h CubeView.h ../include/fltk3gl/GlWindow.h
+CubeMain.o: ../include/fltk3/Box.h CubeView.h ../include/fltk3gl/GLWindow.h
CubeMain.o: ../include/fltk3/Window.h ../include/fltk3gl/gl.h
CubeMain.o: ../include/fltk3/enumerations.h ../include/fltk3/ValueSlider.h
CubeMain.o: ../include/fltk3/Slider.h
[ Direct Link to Message ] | |
