Author: matt
Date: 2011-08-02 09:56:21 -0700 (Tue, 02 Aug 2011)
New Revision: 8904
Log:
Fluid3: fixed name confilict.
Modified:
branches/branch-3.0/fluid/Fl_Type.cxx
branches/branch-3.0/fluid/Fl_Type.h
branches/branch-3.0/fluid/file.cxx
branches/branch-3.0/fluid/file_cmake.cxx
branches/branch-3.0/fluid/file_make.cxx
branches/branch-3.0/fluid/file_visualc.cxx
branches/branch-3.0/fluid/file_xcode.cxx
branches/branch-3.0/fluid/fluid.cxx
branches/branch-3.0/fluid/workspace_panel.cxx
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-08-02 13:29:40 UTC (rev
8903)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-08-02 16:56:21 UTC (rev
8904)
@@ -195,7 +195,7 @@
////////////////////////////////////////////////////////////////
-unsigned int wks_env = ENV_ALL;
+unsigned int wks_env = FL_ENV_ALL;
char *wks_name = 0L;
////////////////////////////////////////////////////////////////
@@ -1078,8 +1078,8 @@
Fl_Workspace_Type::Fl_Workspace_Type()
: Fl_Type(),
- pBuildEnv(ENV_ALL),
- pListEnv(ENV_ALL),
+ pBuildEnv(FL_ENV_ALL),
+ pListEnv(FL_ENV_ALL),
pNUUID(0), pnUUID(0),
pUUIDName(0L), pUUID(0)
{
@@ -1180,11 +1180,11 @@
write_word(buf);
write_word(pUUID[i]);
}
- if (build_env()!=ENV_ALL) {
+ if (build_env()!=FL_ENV_ALL) {
write_indent(level+1);
write_string("build_env %d", build_env());
}
- if (list_env()!=ENV_ALL) {
+ if (list_env()!=FL_ENV_ALL) {
write_indent(level+1);
write_string("list_env %d", list_env());
}
@@ -1364,18 +1364,18 @@
const char *fn = filename();
if (fn) {
const char *ext = fltk3::filename_ext(fn);
- filetype(FILE_TEXT);
+ filetype(FL_FILE_TEXT);
if (ext) {
if (strcmp(ext, ".cxx")==0 || strcmp(ext, ".cpp")==0) {
- filetype(FILE_CPP_SOURCE);
+ filetype(FL_FILE_CPP_SOURCE);
} else if (strcmp(ext, ".c")==0) {
- filetype(FILE_C_SOURCE);
+ filetype(FL_FILE_C_SOURCE);
} else if (strcmp(ext, ".H")==0) {
- filetype(FILE_CPP_HEADER);
+ filetype(FL_FILE_CPP_HEADER);
} else if (strcmp(ext, ".h")==0) {
- filetype(FILE_C_HEADER);
+ filetype(FL_FILE_C_HEADER);
} else if (strcmp(ext, ".mm")==0) {
- filetype(FILE_OBJC_SOURCE);
+ filetype(FL_FILE_OBJC_SOURCE);
}
}
}
@@ -1412,7 +1412,7 @@
write_string("filename_and_path");
write_word(filename());
}
- if (filetype()&FILE_EXPLICIT) {
+ if (filetype()&FL_FILE_EXPLICIT) {
write_indent(level+1);
write_string("filetype %d", filetype());
}
@@ -1439,35 +1439,35 @@
}
char Fl_File_Type::is_cplusplus_code() {
- return (pFileType==FILE_CPP_SOURCE);
+ return (pFileType==FL_FILE_CPP_SOURCE);
}
char Fl_File_Type::is_cplusplus_header() {
- return (pFileType==FILE_CPP_HEADER);
+ return (pFileType==FL_FILE_CPP_HEADER);
}
char Fl_File_Type::is_c_code() {
- return (pFileType==FILE_C_SOURCE);
+ return (pFileType==FL_FILE_C_SOURCE);
}
char Fl_File_Type::is_c_header() {
- return (pFileType==FILE_C_HEADER);
+ return (pFileType==FL_FILE_C_HEADER);
}
char Fl_File_Type::is_objc_code() {
- return (pFileType==FILE_OBJC_SOURCE);
+ return (pFileType==FL_FILE_OBJC_SOURCE);
}
char Fl_File_Type::is_objc_header() {
- return (pFileType==FILE_OBJC_HEADER);
+ return (pFileType==FL_FILE_OBJC_HEADER);
}
char Fl_File_Type::is_code() {
- return
(pFileType==FILE_CPP_SOURCE)||(pFileType==FILE_C_SOURCE)||(pFileType==FILE_OBJC_SOURCE);
+ return
(pFileType==FL_FILE_CPP_SOURCE)||(pFileType==FL_FILE_C_SOURCE)||(pFileType==FL_FILE_OBJC_SOURCE);
}
char Fl_File_Type::is_header() {
- return
(pFileType==FILE_CPP_HEADER)||(pFileType==FILE_C_HEADER)||(pFileType==FILE_OBJC_HEADER);
+ return
(pFileType==FL_FILE_CPP_HEADER)||(pFileType==FL_FILE_C_HEADER)||(pFileType==FL_FILE_OBJC_HEADER);
}
const char *Fl_File_Type::filename_name() {
Modified: branches/branch-3.0/fluid/Fl_Type.h
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.h 2011-08-02 13:29:40 UTC (rev 8903)
+++ branches/branch-3.0/fluid/Fl_Type.h 2011-08-02 16:56:21 UTC (rev 8904)
@@ -51,23 +51,23 @@
extern char *wks_name;
enum {
- ENV_NONE=0,
- ENV_ALL=0x007f,
- ENV_ALL_SHELL=0x0003,
- ENV_MAKE=0x0001, ENV_CMAKE=0x0002,
- ENV_ALL_VC=0x001c,
- ENV_VC6=0x0004, ENV_VC2008=0x0008, ENV_VC2010=0x0010,
- ENV_ALL_XC=0x0060,
- ENV_XC3=0x0020, ENV_XC4=0x0040
+ FL_ENV_NONE=0,
+ FL_ENV_ALL=0x007f,
+ FL_ENV_ALL_SHELL=0x0003,
+ FL_ENV_MAKE=0x0001, FL_ENV_CMAKE=0x0002,
+ FL_ENV_ALL_VC=0x001c,
+ FL_ENV_VC6=0x0004, FL_ENV_VC2008=0x0008, FL_ENV_VC2010=0x0010,
+ FL_ENV_ALL_XC=0x0060,
+ FL_ENV_XC3=0x0020, FL_ENV_XC4=0x0040
};
typedef enum {
- FILE_EXPLICIT = 0x8000,
- FILE_UNKNOWN = 0,
- FILE_C_SOURCE, FILE_C_HEADER,
- FILE_CPP_SOURCE, FILE_CPP_HEADER,
- FILE_OBJC_SOURCE, FILE_OBJC_HEADER,
- FILE_TEXT, FILE_TEXT_SCRIPT
+ FL_FILE_EXPLICIT = 0x8000,
+ FL_FILE_UNKNOWN = 0,
+ FL_FILE_C_SOURCE, FL_FILE_C_HEADER,
+ FL_FILE_CPP_SOURCE, FL_FILE_CPP_HEADER,
+ FL_FILE_OBJC_SOURCE, FL_FILE_OBJC_HEADER,
+ FL_FILE_TEXT, FL_FILE_TEXT_SCRIPT
} FileType;
class Fl_Type {
@@ -281,7 +281,7 @@
Fl_File_Type() :
Fl_Workspace_Type(),
pFilename(0),
- pFileType(FILE_UNKNOWN) {
+ pFileType(FL_FILE_UNKNOWN) {
}
~Fl_File_Type() {
if (pFilename) free(pFilename);
Modified: branches/branch-3.0/fluid/file.cxx
===================================================================
--- branches/branch-3.0/fluid/file.cxx 2011-08-02 13:29:40 UTC (rev 8903)
+++ branches/branch-3.0/fluid/file.cxx 2011-08-02 16:56:21 UTC (rev 8904)
@@ -350,7 +350,7 @@
if (wks_name) {
write_string("\nwks_name "); write_word(wks_name);
}
- if (wks_env!=ENV_ALL) {
+ if (wks_env!=FL_ENV_ALL) {
write_string("\nwks_env %d", wks_env);
}
for (Fl_Type *p = Fl_Type::first; p;) {
Modified: branches/branch-3.0/fluid/file_cmake.cxx
===================================================================
--- branches/branch-3.0/fluid/file_cmake.cxx 2011-08-02 13:29:40 UTC (rev
8903)
+++ branches/branch-3.0/fluid/file_cmake.cxx 2011-08-02 16:56:21 UTC (rev
8904)
@@ -95,7 +95,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_cplusplus_code() && f->builds_in(ENV_CMAKE)) {
+ if (f->is_cplusplus_code() && f->builds_in(FL_ENV_CMAKE)) {
fprintf(out, " %s\n", f->filename_relative(base_dir, tgt_base));
}
}
@@ -108,7 +108,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_objc_code() && f->builds_in(ENV_CMAKE)) {
+ if (f->is_objc_code() && f->builds_in(FL_ENV_CMAKE)) {
fprintf(out, "\t\t%s\n", f->filename_relative(base_dir,
tgt_base));
}
}
@@ -121,7 +121,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_c_code() && f->builds_in(ENV_CMAKE)) {
+ if (f->is_c_code() && f->builds_in(FL_ENV_CMAKE)) {
fprintf(out, " %s\n", f->filename_relative(base_dir, tgt_base));
}
}
Modified: branches/branch-3.0/fluid/file_make.cxx
===================================================================
--- branches/branch-3.0/fluid/file_make.cxx 2011-08-02 13:29:40 UTC (rev
8903)
+++ branches/branch-3.0/fluid/file_make.cxx 2011-08-02 16:56:21 UTC (rev
8904)
@@ -96,7 +96,7 @@
char first = 1;
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_cplusplus_code() && f->builds_in(ENV_MAKE)) {
+ if (f->is_cplusplus_code() && f->builds_in(FL_ENV_MAKE)) {
if (first) { fprintf(out, "CPPFILES = "); first=0; }
fprintf(out, " \\\n\t%s", f->filename_relative(base_dir,
tgt_base));
}
@@ -112,7 +112,7 @@
char first = 1;
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_objc_code() && f->builds_in(ENV_MAKE)) {
+ if (f->is_objc_code() && f->builds_in(FL_ENV_MAKE)) {
if (first) { fprintf(out, "OBJCPPFILES = "); first=0; }
fprintf(out, " \\\n\t%s", f->filename_relative(base_dir,
tgt_base));
}
@@ -128,7 +128,7 @@
char first = 1;
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_c_code() && f->builds_in(ENV_MAKE)) {
+ if (f->is_c_code() && f->builds_in(FL_ENV_MAKE)) {
if (first) { fprintf(out, "CFILES = "); first=0; }
fprintf(out, " \\\n\t%s", f->filename_relative(base_dir,
tgt_base));
}
Modified: branches/branch-3.0/fluid/file_visualc.cxx
===================================================================
--- branches/branch-3.0/fluid/file_visualc.cxx 2011-08-02 13:29:40 UTC (rev
8903)
+++ branches/branch-3.0/fluid/file_visualc.cxx 2011-08-02 16:56:21 UTC (rev
8904)
@@ -111,7 +111,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_code() && f->builds_in(ENV_VC6)) {
+ if (f->is_code() && f->builds_in(FL_ENV_VC6)) {
fprintf(out, "# Begin Source File\r\n");
fprintf(out, "\r\n");
fprintf(out, "SOURCE=..\\..\\%s\r\n", DOS_path(f->filename()));
@@ -192,7 +192,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_code() && f->builds_in(ENV_VC2008)) {
+ if (f->is_code() && f->builds_in(FL_ENV_VC2008)) {
fprintf(out, "\t\t<File\r\n");
fprintf(out, "\t\t\tRelativePath=\"..\\..\\%s\"\r\n",
DOS_path(f->filename()));
fprintf(out, "\t\t\t>\r\n");
@@ -248,7 +248,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_header() && f->lists_in(ENV_VC2008)) {
+ if (f->is_header() && f->lists_in(FL_ENV_VC2008)) {
fprintf(out, "\t\t\t<File\r\n");
fprintf(out, "\t\t\t\tRelativePath=\"..\\..\\%s\"\r\n",
DOS_path(f->filename()));
fprintf(out, "\t\t\t\t>\r\n");
@@ -332,7 +332,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_code() && f->builds_in(ENV_VC2010)) {
+ if (f->is_code() && f->builds_in(FL_ENV_VC2010)) {
fprintf(out, " <ClCompile Include=\"..\\..\\%s\">\r\n",
DOS_path(f->filename()));
fprintf(out, " <Optimization
Condition=\"'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'\">Disabled</Optimization>\r\n");
fprintf(out, " <AdditionalIncludeDirectories
Condition=\"'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'\">%%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r\n");
@@ -358,7 +358,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_code() && f->lists_in(ENV_VC2010)) {
+ if (f->is_code() && f->lists_in(FL_ENV_VC2010)) {
fprintf(out, " <ClInclude Include=\"..\\..\\%s\" />\r\n",
DOS_path(f->filename()));
}
}
@@ -371,7 +371,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_header() && f->lists_in(ENV_VC2010)) {
+ if (f->is_header() && f->lists_in(FL_ENV_VC2010)) {
fprintf(out, " <ClInclude Include=\"..\\..\\%s\" />\r\n",
DOS_path(f->filename()));
}
}
@@ -384,7 +384,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->is_header() && f->lists_in(ENV_VC2010)) {
+ if (f->is_header() && f->lists_in(FL_ENV_VC2010)) {
fprintf(out, " <ClInclude Include=\"..\\..\\%s\">\r\n",
DOS_path(f->filename()));
fprintf(out, " <Filter>Headers</Filter>\r\n");
fprintf(out, " </ClInclude>\r\n");
Modified: branches/branch-3.0/fluid/file_xcode.cxx
===================================================================
--- branches/branch-3.0/fluid/file_xcode.cxx 2011-08-02 13:29:40 UTC (rev
8903)
+++ branches/branch-3.0/fluid/file_xcode.cxx 2011-08-02 16:56:21 UTC (rev
8904)
@@ -39,12 +39,12 @@
/*
typedef enum {
- FILE_DEFAULT = 0x8000,
- FILE_UNKNOWN = 0,
- FILE_C_SOURCE, FILE_C_HEADER,
- FILE_CPP_SOURCE, FILE_CPP_HEADER,
- FILE_OBJC_SOURCE, FILE_OBJC_HEADER,
- FILE_TEXT, FILE_TEXT_SCRIPT
+ FL_FILE_DEFAULT = 0x8000,
+ FL_FILE_UNKNOWN = 0,
+ FL_FILE_C_SOURCE, FL_FILE_C_HEADER,
+ FL_FILE_CPP_SOURCE, FL_FILE_CPP_HEADER,
+ FL_FILE_OBJC_SOURCE, FL_FILE_OBJC_HEADER,
+ FL_FILE_TEXT, FL_FILE_TEXT_SCRIPT
} FileType;
lastKnownFileType or explicitFileType
@@ -70,20 +70,20 @@
static const char *xcode4_type(unsigned int ft) {
static char buf[64];
- if (ft & FILE_EXPLICIT) {
+ if (ft & FL_FILE_EXPLICIT) {
strcpy(buf, "explicitFileType = ");
} else {
strcpy(buf, "lastKnownFileType = ");
}
switch (ft & 0x7fff) {
- case FILE_C_SOURCE: strcat(buf, "sourcecode.c.c"); break;
- case FILE_C_HEADER: strcat(buf, "sourcecode.c.h"); break;
- case FILE_CPP_SOURCE: strcat(buf, "sourcecode.cpp.cpp"); break;
- case FILE_CPP_HEADER: strcat(buf, "sourcecode.cpp.h"); break;
- case FILE_OBJC_SOURCE: strcat(buf, "sourcecode.cpp.objcpp"); break;
- case FILE_OBJC_HEADER: strcat(buf, "sourcecode.cpp.h"); break;
- case FILE_TEXT: strcat(buf, "text"); break;
- case FILE_TEXT_SCRIPT: strcat(buf, "text.script.sh"); break;
+ case FL_FILE_C_SOURCE: strcat(buf, "sourcecode.c.c"); break;
+ case FL_FILE_C_HEADER: strcat(buf, "sourcecode.c.h"); break;
+ case FL_FILE_CPP_SOURCE: strcat(buf, "sourcecode.cpp.cpp"); break;
+ case FL_FILE_CPP_HEADER: strcat(buf, "sourcecode.cpp.h"); break;
+ case FL_FILE_OBJC_SOURCE: strcat(buf, "sourcecode.cpp.objcpp"); break;
+ case FL_FILE_OBJC_HEADER: strcat(buf, "sourcecode.cpp.h"); break;
+ case FL_FILE_TEXT: strcat(buf, "text"); break;
+ case FL_FILE_TEXT_SCRIPT: strcat(buf, "text.script.sh"); break;
default: strcat(buf, "text"); break;
}
return buf;
@@ -123,7 +123,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->builds_in(ENV_XC4)) {
+ if (f->builds_in(FL_ENV_XC4)) {
char PBXBuildFile[32]; strcpy(PBXBuildFile,
f->get_UUID_Xcode("Xcode4_PBXBuildFile"));
char PBXFileRef[32]; strcpy(PBXFileRef,
f->get_UUID_Xcode("Xcode4_PBXFileRef"));
fprintf(out, "\t\t%s /* %s in %s */ = {isa = PBXBuildFile;
fileRef = %s /* %s */; };\n",
@@ -144,7 +144,7 @@
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
// FIXME: write a file type converter!
- if (f->lists_in(ENV_XC4)) {
+ if (f->lists_in(FL_ENV_XC4)) {
char PBXFileRef[32]; strcpy(PBXFileRef,
f->get_UUID_Xcode("Xcode4_PBXFileRef"));
fprintf(out, "\t\t%s /* %s */ = {isa = PBXFileReference;
fileEncoding = 4; %s; name = %s; path = ../../%s; sourceTree = SOURCE_ROOT;
};\n",
PBXFileRef,
@@ -163,7 +163,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->lists_in(ENV_XC4) && f->is_header()) {
+ if (f->lists_in(FL_ENV_XC4) && f->is_header()) {
char PBXFileRef[32]; strcpy(PBXFileRef,
f->get_UUID_Xcode("Xcode4_PBXFileRef"));
fprintf(out, "\t\t\t\t%s /* %s */,\n",
PBXFileRef,
@@ -179,7 +179,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->lists_in(ENV_XC4) && f->is_code()) {
+ if (f->lists_in(FL_ENV_XC4) && f->is_code()) {
char PBXFileRef[32]; strcpy(PBXFileRef,
f->get_UUID_Xcode("Xcode4_PBXFileRef"));
fprintf(out, "\t\t\t\t%s /* %s */,\n",
PBXFileRef,
@@ -195,7 +195,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->builds_in(ENV_XC4) && f->is_header()) {
+ if (f->builds_in(FL_ENV_XC4) && f->is_header()) {
char PBXBuildFile[32]; strcpy(PBXBuildFile,
f->get_UUID_Xcode("Xcode4_PBXBuildFile"));
fprintf(out, "\t\t\t\t%s /* %s in %s */,\n",
PBXBuildFile,
@@ -212,7 +212,7 @@
}
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->builds_in(ENV_XC4) && f->is_code()) {
+ if (f->builds_in(FL_ENV_XC4) && f->is_code()) {
char PBXBuildFile[32]; strcpy(PBXBuildFile,
f->get_UUID_Xcode("Xcode4_PBXBuildFile"));
fprintf(out, "\t\t\t\t%s /* %s in %s */,\n",
PBXBuildFile,
Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx 2011-08-02 13:29:40 UTC (rev 8903)
+++ branches/branch-3.0/fluid/fluid.cxx 2011-08-02 16:56:21 UTC (rev 8904)
@@ -956,27 +956,27 @@
}
// TODO: we need workspace settings that declare which of these systems will
be written
// TODO: we need to collect error messages and output them
- if ((wks_env&ENV_MAKE) && write_fltk_makefiles()) {
+ if ((wks_env&FL_ENV_MAKE) && write_fltk_makefiles()) {
int v = fltk3::choice("Error writing Makefile build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&ENV_CMAKE) && write_fltk_cmake()) {
+ if ((wks_env&FL_ENV_CMAKE) && write_fltk_cmake()) {
int v = fltk3::choice("Error writing Makefile build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&ENV_XC4) && write_fltk_ide_xcode4()) {
+ if ((wks_env&FL_ENV_XC4) && write_fltk_ide_xcode4()) {
int v = fltk3::choice("Error writing Xcode 4 build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&ENV_VC6) && write_fltk_ide_visualc6()) {
+ if ((wks_env&FL_ENV_VC6) && write_fltk_ide_visualc6()) {
int v = fltk3::choice("Error writing VisualC 6 build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&ENV_VC2008) && write_fltk_ide_visualc2008()) {
+ if ((wks_env&FL_ENV_VC2008) && write_fltk_ide_visualc2008()) {
int v = fltk3::choice("Error writing VisualC 2008 build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&ENV_VC2010) && write_fltk_ide_visualc2010()) {
+ if ((wks_env&FL_ENV_VC2010) && write_fltk_ide_visualc2010()) {
int v = fltk3::choice("Error writing VisualC 2010 build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
Modified: branches/branch-3.0/fluid/workspace_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.cxx 2011-08-02 13:29:40 UTC
(rev 8903)
+++ branches/branch-3.0/fluid/workspace_panel.cxx 2011-08-02 16:56:21 UTC
(rev 8904)
@@ -49,22 +49,22 @@
}
fltk3::MenuItem Fl_Environment_Choice::menu_pEnvMenu[] = {
- {"All Environments", 0,
(fltk3::Callback*)Fl_Environment_Choice::cb_pMenuAll, (void*)(ENV_ALL), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"All Environments", 0,
(fltk3::Callback*)Fl_Environment_Choice::cb_pMenuAll, (void*)(FL_ENV_ALL), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
{"Command Line", 0, 0, 0, 64, fltk3::NORMAL_LABEL, 0, 12, 0},
- {"All", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_ALL_SHELL), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"Makefile (make, gmake)", 0, (fltk3::Callback*)cb_pMenuAll,
(void*)(ENV_MAKE), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
- {"CMake File (cmake)", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_CMAKE),
0, fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"All", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_ALL_SHELL), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"Makefile (make, gmake)", 0, (fltk3::Callback*)cb_pMenuAll,
(void*)(FL_ENV_MAKE), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"CMake File (cmake)", 0, (fltk3::Callback*)cb_pMenuAll,
(void*)(FL_ENV_CMAKE), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
{0,0,0,0,0,0,0,0,0},
{"MS Windows", 0, 0, 0, 64, fltk3::NORMAL_LABEL, 0, 12, 0},
- {"All", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_ALL_VC), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"VisualC 6", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_VC6), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"VisualC 2008", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_VC2008), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"VisualC 2010", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_VC2010), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"All", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_ALL_VC), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"VisualC 6", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_VC6), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"VisualC 2008", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_VC2008),
0, fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"VisualC 2010", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_VC2010),
0, fltk3::NORMAL_LABEL, 0, 12, 0},
{0,0,0,0,0,0,0,0,0},
{"Apple OS X", 0, 0, 0, 64, fltk3::NORMAL_LABEL, 0, 12, 0},
- {"All", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_ALL_XC), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"Xcode 3", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_XC3), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"Xcode 4", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(ENV_XC4), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"All", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_ALL_XC), 128,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"Xcode 3", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_XC3), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"Xcode 4", 0, (fltk3::Callback*)cb_pMenuAll, (void*)(FL_ENV_XC4), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
{0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0}
};
@@ -135,19 +135,19 @@
}
// update the text
- if (pEnv==ENV_ALL) {
+ if (pEnv==FL_ENV_ALL) {
pEnvMenu->label("- all -");
- } else if (pEnv==ENV_NONE) {
+ } else if (pEnv==FL_ENV_NONE) {
pEnvMenu->label("- none -");
} else {
char buf[1024]; buf[0] = 0;
- if (pEnv&ENV_MAKE) strcat(buf, "make, ");
- if (pEnv&ENV_CMAKE) strcat(buf, "cmake, ");
- if (pEnv&ENV_VC6) strcat(buf, "VC6, ");
- if (pEnv&ENV_VC2008) strcat(buf, "VC2008, ");
- if (pEnv&ENV_VC2010) strcat(buf, "VC2010, ");
- if (pEnv&ENV_XC3) strcat(buf, "Xcode3, ");
- if (pEnv&ENV_XC4) strcat(buf, "Xcode4, ");
+ if (pEnv&FL_ENV_MAKE) strcat(buf, "make, ");
+ if (pEnv&FL_ENV_CMAKE) strcat(buf, "cmake, ");
+ if (pEnv&FL_ENV_VC6) strcat(buf, "VC6, ");
+ if (pEnv&FL_ENV_VC2008) strcat(buf, "VC2008, ");
+ if (pEnv&FL_ENV_VC2010) strcat(buf, "VC2010, ");
+ if (pEnv&FL_ENV_XC3) strcat(buf, "Xcode3, ");
+ if (pEnv&FL_ENV_XC4) strcat(buf, "Xcode4, ");
int n = strlen(buf);
if (n>2) buf[n-2] = 0;
pEnvMenu->copy_label(buf);
@@ -222,7 +222,7 @@
if (wks_env)
pEnv->value(wks_env);
else
- pEnv->value(ENV_ALL);
+ pEnv->value(FL_ENV_ALL);
workspace_panel->show();
return workspace_panel;
}
@@ -309,10 +309,10 @@
for (Fl_Type *t = Fl_Type::first; t; t = t->next) {
if (t->selected && t->is_file()) {
if (((Fl_File_Type*)t)->filetype() != e) {
- if (e==FILE_EXPLICIT)
+ if (e==FL_FILE_EXPLICIT)
((Fl_File_Type*)t)->set_default_type();
else
- ((Fl_File_Type*)t)->filetype(e|FILE_EXPLICIT);
+ ((Fl_File_Type*)t)->filetype(e|FL_FILE_EXPLICIT);
mod = 1;
}
}
@@ -321,7 +321,7 @@
}
char buf[64];
unsigned int ft = Fl_Panel::current_file()->filetype();
- if (ft&FILE_EXPLICIT) {
+ if (ft&FL_FILE_EXPLICIT) {
strcpy(buf, "explicit - ");
} else {
strcpy(buf, "default - ");
@@ -341,16 +341,16 @@
}
fltk3::MenuItem menu_Unknown[] = {
- {"Default", 0, 0, (void*)(FILE_EXPLICIT), 128, fltk3::NORMAL_LABEL, 0, 12,
0},
- {"C Source Code", 0, 0, (void*)(FILE_C_SOURCE), 0, fltk3::NORMAL_LABEL, 0,
12, 0},
- {"C Header", 0, 0, (void*)(FILE_C_HEADER), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
- {"C++ Source Code", 0, 0, (void*)(FILE_CPP_SOURCE), 0, fltk3::NORMAL_LABEL,
0, 12, 0},
- {"C++ Header", 0, 0, (void*)(FILE_CPP_HEADER), 0, fltk3::NORMAL_LABEL, 0,
12, 0},
- {"ObjectiveC Source", 0, 0, (void*)(FILE_OBJC_SOURCE), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"ObjectiveC Header", 0, 0, (void*)(FILE_OBJC_HEADER), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
- {"Text", 0, 0, (void*)(FILE_TEXT), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
- {"Shell Script", 0, 0, (void*)(FILE_TEXT_SCRIPT), 0, fltk3::NORMAL_LABEL, 0,
12, 0},
- {"Unknown", 0, 0, (void*)(FILE_UNKNOWN), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"Default", 0, 0, (void*)(FL_FILE_EXPLICIT), 128, fltk3::NORMAL_LABEL, 0,
12, 0},
+ {"C Source Code", 0, 0, (void*)(FL_FILE_C_SOURCE), 0, fltk3::NORMAL_LABEL,
0, 12, 0},
+ {"C Header", 0, 0, (void*)(FL_FILE_C_HEADER), 0, fltk3::NORMAL_LABEL, 0, 12,
0},
+ {"C++ Source Code", 0, 0, (void*)(FL_FILE_CPP_SOURCE), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"C++ Header", 0, 0, (void*)(FL_FILE_CPP_HEADER), 0, fltk3::NORMAL_LABEL, 0,
12, 0},
+ {"ObjectiveC Source", 0, 0, (void*)(FL_FILE_OBJC_SOURCE), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"ObjectiveC Header", 0, 0, (void*)(FL_FILE_OBJC_HEADER), 0,
fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"Text", 0, 0, (void*)(FL_FILE_TEXT), 0, fltk3::NORMAL_LABEL, 0, 12, 0},
+ {"Shell Script", 0, 0, (void*)(FL_FILE_TEXT_SCRIPT), 0, fltk3::NORMAL_LABEL,
0, 12, 0},
+ {"Unknown", 0, 0, (void*)(FL_FILE_UNKNOWN), 0, fltk3::NORMAL_LABEL, 0, 12,
0},
{0,0,0,0,0,0,0,0,0}
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
