Author: matt
Date: 2011-07-31 04:39:10 -0700 (Sun, 31 Jul 2011)
New Revision: 8887
Log:
Removed some obsoltete new Types in Fluid.
Adding a flag to make targets limited to individual environments.
Added:
branches/branch-3.0/fluid/pixmaps/flFile.xpm
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/factory.cxx
branches/branch-3.0/fluid/file.cxx
branches/branch-3.0/fluid/fluid.cxx
branches/branch-3.0/fluid/workspace_panel.cxx
branches/branch-3.0/fluid/workspace_panel.fl
branches/branch-3.0/fluid/workspace_panel.h
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-07-30 21:37:08 UTC (rev 8886)
+++ branches/branch-3.0/fltk.flw 2011-07-31 11:39:10 UTC (rev 8887)
@@ -9,122 +9,122 @@
} {
folder Sources {open
} {
- code_file {CodeEditor.cxx} {
+ file_ref {CodeEditor.cxx} {
uuid_Xcode4_PBXBuildFile {21531985-E735-4E4D-8AD4-601ECF511590}
uuid_Xcode4_PBXFileRef {233B84BF-4134-4BEE-AB2F-9DFBE2B8842A}
filename_and_path {fluid/CodeEditor.cxx}
}
- code_file {Fl_Function_Type.cxx} {
+ file_ref {Fl_Function_Type.cxx} {
uuid_Xcode4_PBXBuildFile {76506CDF-5D66-49BF-B9F0-7DF0A22E518F}
uuid_Xcode4_PBXFileRef {EA692103-A561-45DB-BAB7-08C611B9B470}
filename_and_path {fluid/Fl_Function_Type.cxx}
}
- code_file {Fl_Group_Type.cxx} {
+ file_ref {Fl_Group_Type.cxx} {
uuid_Xcode4_PBXBuildFile {9E403B5C-EAFE-4102-958C-123162EF31D0}
uuid_Xcode4_PBXFileRef {4846F7E3-8930-4B0D-8AC4-4B370E63EE0E}
filename_and_path {fluid/Fl_Group_Type.cxx}
}
- code_file {Fl_Menu_Type.cxx} {
+ file_ref {Fl_Menu_Type.cxx} {
uuid_Xcode4_PBXBuildFile {DDD88F08-4E7A-46A8-87E8-7AE77929B7BD}
uuid_Xcode4_PBXFileRef {E5E26424-9D4F-41A4-A4B4-C3698DCFAAC6}
filename_and_path {fluid/Fl_Menu_Type.cxx}
}
- code_file {Fl_Type.cxx} {
+ file_ref {Fl_Type.cxx} {
uuid_Xcode4_PBXBuildFile {0D9700AF-483A-4DDE-B763-B9B0B0F553F2}
uuid_Xcode4_PBXFileRef {FB6899F0-9E7D-44D6-AE56-6FBD161952CE}
filename_and_path {fluid/Fl_Type.cxx}
}
- code_file {Fl_Widget_Type.cxx} {
+ file_ref {Fl_Widget_Type.cxx} {
uuid_Xcode4_PBXBuildFile {D2DAFD4F-8844-4ACE-916E-657842F001BD}
uuid_Xcode4_PBXFileRef {A1E97C69-4062-4D1A-AADB-4BB90BCF332C}
filename_and_path {fluid/Fl_Widget_Type.cxx}
}
- code_file {Fl_Window_Type.cxx} {
+ file_ref {Fl_Window_Type.cxx} {
uuid_Xcode4_PBXBuildFile {3047F62F-95D0-4187-B94A-8339A79A2FFF}
uuid_Xcode4_PBXFileRef {F433B19A-BF9E-4627-A430-149056B7E74E}
filename_and_path {fluid/Fl_Window_Type.cxx}
}
- code_file {Fluid_Image.cxx} {
+ file_ref {Fluid_Image.cxx} {
uuid_Xcode4_PBXBuildFile {2A0835F0-8DB4-47E4-B1B5-8F1E1C3727C1}
uuid_Xcode4_PBXFileRef {EFBF35C8-2D5B-4F2E-ACCE-8E3F05B4B0AD}
filename_and_path {fluid/Fluid_Image.cxx}
}
- code_file {about_panel.cxx} {
+ file_ref {about_panel.cxx} {
uuid_Xcode4_PBXBuildFile {060FCD71-A79D-49A8-9672-4D3085E81A71}
uuid_Xcode4_PBXFileRef {227D091D-B4DD-4404-AC06-830A880C2763}
filename_and_path {fluid/about_panel.cxx}
}
- code_file {align_widget.cxx} {
+ file_ref {align_widget.cxx} {
uuid_Xcode4_PBXBuildFile {F798DDD7-4493-4765-B386-2499712536FB}
uuid_Xcode4_PBXFileRef {24CE269A-726A-4C1C-877B-A541D697F91C}
filename_and_path {fluid/align_widget.cxx}
}
- code_file {alignment_panel.cxx} {
+ file_ref {alignment_panel.cxx} {
uuid_Xcode4_PBXBuildFile {17BEA00E-3304-4E2F-A2B7-1BD33A1BAC70}
uuid_Xcode4_PBXFileRef {899A7E34-9D97-46A6-B5B3-3F5C8247D9A2}
filename_and_path {fluid/alignment_panel.cxx}
}
- code_file {code.cxx} {
+ file_ref {code.cxx} {
uuid_Xcode4_PBXBuildFile {5F465A55-0199-42C5-B173-199357FC11A9}
uuid_Xcode4_PBXFileRef {09CC113E-256C-40B4-9EA0-A3DE7A30D89C}
filename_and_path {fluid/code.cxx}
}
- code_file {factory.cxx} {
+ file_ref {factory.cxx} {
uuid_Xcode4_PBXBuildFile {660933C9-FE08-441D-9BFC-A33F896094E0}
uuid_Xcode4_PBXFileRef {5C7951B9-91C1-48CE-9D89-E31BAA6CA89A}
filename_and_path {fluid/factory.cxx}
}
- code_file {file.cxx} {selected
+ file_ref {file.cxx} {selected
uuid_Xcode4_PBXBuildFile {9180CE40-4261-45D4-BA54-7E496D64E491}
uuid_Xcode4_PBXFileRef {C9E8495F-E0DA-41CA-A433-0EE31A53EA61}
filename_and_path {fluid/file.cxx}
}
- code_file {file_cmake.cxx} {
+ file_ref {file_cmake.cxx} {
uuid_Xcode4_PBXBuildFile {2C5A18FB-7CDA-4E83-BF5D-0A703C159CE4}
uuid_Xcode4_PBXFileRef {C610271C-BE6B-4BC7-9DAC-02457D070C83}
filename_and_path {fluid/file_cmake.cxx}
}
- code_file {file_make.cxx} {
+ file_ref {file_make.cxx} {
uuid_Xcode4_PBXBuildFile {440345C5-F414-46E0-8451-A4BF6404BAD8}
uuid_Xcode4_PBXFileRef {AA030641-32F5-4A30-83C3-AB4C12B116BF}
filename_and_path {fluid/file_make.cxx}
}
- code_file {file_visualc.cxx} {
+ file_ref {file_visualc.cxx} {
uuid_Xcode4_PBXBuildFile {90165E96-B379-4CFB-9443-96A69D1138FF}
uuid_Xcode4_PBXFileRef {3897A14B-FF80-4B19-905F-F4FB3BEC9F0E}
filename_and_path {fluid/file_visualc.cxx}
}
- code_file {file_xcode.cxx} {
+ file_ref {file_xcode.cxx} {
uuid_Xcode4_PBXBuildFile {6274DFA2-A0BB-41B1-A445-DA19DDBEA45B}
uuid_Xcode4_PBXFileRef {8AB9E1DA-0E88-4EC9-BA9C-A772BE5E138D}
filename_and_path {fluid/file_xcode.cxx}
}
- code_file {fluid.cxx} {
+ file_ref {fluid.cxx} {
uuid_Xcode4_PBXBuildFile {040ADAF6-46C7-41CB-9C4C-280781FC1D34}
uuid_Xcode4_PBXFileRef {248C3EC8-EF4A-40C8-84F8-B9844B50DD4D}
filename_and_path {fluid/fluid.cxx}
}
- code_file {function_panel.cxx} {
+ file_ref {function_panel.cxx} {
uuid_Xcode4_PBXBuildFile {70498161-84AF-4916-A91A-E9993C7265BE}
uuid_Xcode4_PBXFileRef {0279DE51-109D-42F1-BD87-5BF96C8790BE}
filename_and_path {fluid/function_panel.cxx}
}
- code_file {template_panel.cxx} {
+ file_ref {template_panel.cxx} {
uuid_Xcode4_PBXBuildFile {DB7E42B7-28C2-4DFD-9BE3-A5E046FB8ED8}
uuid_Xcode4_PBXFileRef {5C0AC8E4-C774-4082-AD48-4DF7D04B0423}
filename_and_path {fluid/template_panel.cxx}
}
- code_file {undo.cxx} {
+ file_ref {undo.cxx} {
uuid_Xcode4_PBXBuildFile {9F2F34D6-3E87-4B4C-A4E7-459A6F518639}
uuid_Xcode4_PBXFileRef {6A66AFC5-0859-4BA2-8EF1-A85C3A828ED7}
filename_and_path {fluid/undo.cxx}
}
- code_file {widget_panel.cxx} {
+ file_ref {widget_panel.cxx} {
uuid_Xcode4_PBXBuildFile {53153194-20D6-47CD-A8A9-4FE29F0CEE34}
uuid_Xcode4_PBXFileRef {425C2E3E-9BA2-4FF8-8D5E-D1F634A7B379}
filename_and_path {fluid/widget_panel.cxx}
}
- code_file {workspace_panel.cxx} {
+ file_ref {workspace_panel.cxx} {
uuid_Xcode4_PBXBuildFile {608B6D5F-C180-4935-8136-7268F7C1C9BE}
uuid_Xcode4_PBXFileRef {43642281-C39A-4E19-B046-6CFE718FDFEE}
filename_and_path {fluid/workspace_panel.cxx}
@@ -132,59 +132,59 @@
}
folder Headers {open
} {
- code_file {CodeEditor.h} {
+ file_ref {CodeEditor.h} {
uuid_Xcode4_PBXFileRef {6A73CBE8-D82E-4770-B122-1162C650A349}
filename_and_path {fluid/CodeEditor.h}
}
- code_file {Fl_Type.h} {
+ file_ref {Fl_Type.h} {
uuid_Xcode4_PBXFileRef {6FEAD9ED-49D4-4725-90E9-2F5F252A8BB1}
filename_and_path {fluid/Fl_Type.h}
}
- code_file {Fl_Widget_Type.h} {
+ file_ref {Fl_Widget_Type.h} {
uuid_Xcode4_PBXFileRef {8D769D5B-8552-4F3F-870C-EB5F4D88BA7E}
filename_and_path {fluid/Fl_Widget_Type.h}
}
- code_file {Fluid_Image.h} {
+ file_ref {Fluid_Image.h} {
uuid_Xcode4_PBXFileRef {65197118-1119-4E36-830B-52295D8E04FE}
filename_and_path {fluid/Fluid_Image.h}
}
- code_file {Shortcut_Button.h} {
+ file_ref {Shortcut_Button.h} {
uuid_Xcode4_PBXFileRef {E7FEDB0D-1218-4316-AB2F-F5E1E2C6FAA8}
filename_and_path {fluid/Shortcut_Button.h}
}
- code_file {about_panel.h} {
+ file_ref {about_panel.h} {
uuid_Xcode4_PBXFileRef {F420CC30-9E28-43A1-8F55-04F2A4285E2D}
filename_and_path {fluid/about_panel.h}
}
- code_file {alignment_panel.h} {
+ file_ref {alignment_panel.h} {
uuid_Xcode4_PBXFileRef {26103935-2D50-4B44-97C7-EE9AA857DE61}
filename_and_path {fluid/alignment_panel.h}
}
- code_file {comments.h} {
+ file_ref {comments.h} {
uuid_Xcode4_PBXFileRef {19297348-7E5A-41AE-99F6-7AB10245A1D8}
filename_and_path {fluid/comments.h}
}
- code_file {function_panel.h} {
+ file_ref {function_panel.h} {
uuid_Xcode4_PBXFileRef {88AC76F8-37BC-48CF-B6D1-33DCD67DFD98}
filename_and_path {fluid/function_panel.h}
}
- code_file {print_panel.h} {
+ file_ref {print_panel.h} {
uuid_Xcode4_PBXFileRef {D0E0882D-24C1-4A93-AF9E-109EC52D185C}
filename_and_path {fluid/print_panel.h}
}
- code_file {template_panel.h} {
+ file_ref {template_panel.h} {
uuid_Xcode4_PBXFileRef {000422E2-90D4-45AD-A495-95AC4385D9FE}
filename_and_path {fluid/template_panel.h}
}
- code_file {undo.h} {
+ file_ref {undo.h} {
uuid_Xcode4_PBXFileRef {88491B5D-61FA-4D41-954E-528D7BD9DF52}
filename_and_path {fluid/undo.h}
}
- code_file {widget_panel.h} {
+ file_ref {widget_panel.h} {
uuid_Xcode4_PBXFileRef {E66E13F7-CB1B-4DE1-801E-C7601315D72B}
filename_and_path {fluid/widget_panel.h}
}
- code_file {workspace_panel.h} {
+ file_ref {workspace_panel.h} {
uuid_Xcode4_PBXFileRef {EAF89B48-F485-4F7C-A942-5E212E45BAB1}
filename_and_path {fluid/workspace_panel.h}
}
@@ -198,7 +198,7 @@
} {
folder Sources {open
} {
- code_file {Fl_Adjuster.cxx} {
+ file_ref {Fl_Adjuster.cxx} {
filename_and_path {src/Fl_Adjuster.cxx}
}
}
@@ -221,27 +221,27 @@
} {
app_target Demo {open
} {
- code_file {demo.cxx} {
+ file_ref {demo.cxx} {
}
}
app_target adjuster {open
} {
- code_file {adjuster.cxx} {
+ file_ref {adjuster.cxx} {
}
}
app_target arc {open
} {
- code_file {arc.cxx} {
+ file_ref {arc.cxx} {
}
}
app_target ask {open
} {
- code_file {ask.cxx} {
+ file_ref {ask.cxx} {
}
}
app_target bitmap {open
} {
- code_file {bitmap.cxx} {
+ file_ref {bitmap.cxx} {
}
}
}
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-07-30 21:37:08 UTC (rev
8886)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-07-31 11:39:10 UTC (rev
8887)
@@ -111,8 +111,9 @@
#include "pixmaps/flTree.xpm"
#include "pixmaps/flTable.xpm"
#include "pixmaps/flAppTarget.xpm"
-#include "pixmaps/flFluidFile.xpm"
+#include "pixmaps/flFile.xpm"
#include "pixmaps/flFolder.xpm"
+#include "pixmaps/flFluidFile.xpm"
#include "pixmaps/flCodeFile.xpm"
#include "pixmaps/flMenuNone.xpm"
#include "pixmaps/flMenuMulti.xpm"
@@ -170,9 +171,10 @@
static fltk3::Pixmap tree_pixmap(flTree_xpm);
static fltk3::Pixmap table_pixmap(flTable_xpm);
static fltk3::Pixmap app_target_pixmap(flAppTarget_xpm);
-static fltk3::Pixmap fluid_file_pixmap(flFluidFile_xpm);
+static fltk3::Pixmap file_pixmap(flFile_xpm);
static fltk3::Pixmap folder_pixmap(flFolder_xpm);
-static fltk3::Pixmap code_file_pixmap(flCodeFile_xpm);
+//static fltk3::Pixmap fluid_file_pixmap(flFluidFile_xpm);
+//static fltk3::Pixmap code_file_pixmap(flCodeFile_xpm);
fltk3::Pixmap menu_none_pixmap(flMenuNone_xpm);
fltk3::Pixmap menu_multi_pixmap(flMenuMulti_xpm);
fltk3::Pixmap menu_all_pixmap(flMenuAll_xpm);
@@ -187,13 +189,13 @@
&slider_pixmap, &scrollbar_pixmap, &valueslider_pixmap, &adjuster_pixmap,
&counter_pixmap, /* 37..41 */
&dial_pixmap, &roller_pixmap, &valueinput_pixmap, &valueoutput_pixmap,
&comment_pixmap, /* 42..46 */
&spinner_pixmap, &widgetclass_pixmap, &data_pixmap, &tree_pixmap,
&table_pixmap, /* 47..51 */
- &app_target_pixmap, &fluid_file_pixmap, &folder_pixmap, &code_file_pixmap};
/* 52..55 */
+ &app_target_pixmap, &file_pixmap, &folder_pixmap}; /* 52..54 */
extern int show_comments;
////////////////////////////////////////////////////////////////
-unsigned int wks_env = Fl_Environment_Choice::ENV_ALL;
+unsigned int wks_env = ENV_ALL;
char *wks_name = 0L;
////////////////////////////////////////////////////////////////
@@ -1076,7 +1078,7 @@
Fl_Workspace_Type::Fl_Workspace_Type()
: Fl_Type(),
- pEnv(Fl_Environment_Choice::ENV_ALL),
+ pEnv(ENV_ALL),
pNUUID(0), pnUUID(0),
pUUIDName(0L), pUUID(0)
{
@@ -1177,6 +1179,10 @@
write_word(buf);
write_word(pUUID[i]);
}
+ if (environments()!=ENV_ALL) {
+ write_indent(level+1);
+ write_string("environments %d", environments());
+ }
}
char Fl_Workspace_Type::read_property(const char *name) {
@@ -1184,6 +1190,8 @@
char buf[80];
strcpy(buf, name+5);
set_UUID(buf, read_word());
+ } else if (!strcmp(name,"environments")) {
+ environments(atoi(read_word()));
} else {
return Fl_Type::read_property(name);
}
@@ -1216,7 +1224,7 @@
if (e!=s) {
char buf[2048];
fltk3::filename_relative(buf, 2048, s, basedir);
- Fl_Code_File_Type *o = new Fl_Code_File_Type();
+ Fl_File_Type *o = new Fl_File_Type();
o->filename(buf);
o->add(this);
o->factory = this;
@@ -1349,8 +1357,6 @@
char Fl_File_Type::read_property(const char *c) {
if (!strcmp(c,"filename_and_path")) {
filename(read_word());
- } else if (!strcmp(c,"environments")) {
- environments(atoi(read_word()));
} else {
return Fl_Workspace_Type::read_property(c);
}
@@ -1364,9 +1370,6 @@
write_string("filename_and_path");
write_word(filename());
}
- if (environments()!=Fl_Environment_Choice::ENV_ALL) {
- write_string("environments %d", environments());
- }
}
Fl_File_Type *Fl_File_Type::first_file(Fl_Type *base) {
@@ -1425,56 +1428,6 @@
if (Fl_Panel::numselected) the_file_panel->show();
}
-// ------------ Fluid File
-----------------------------------------------------
-
-Fl_Fluid_File_Type Fl_Fluid_File_type;
-
-Fl_Type *Fl_Fluid_File_Type::make() {
- // make sure that this is a workspace file
- if (Fl_Type::first && !is_workspace()) {
- fltk3::message("Fluid Files can only be used in Workspace files.");
- return 0;
- }
- // files can be children of folders and children of targets
- Fl_Type *p = Fl_Type::current;
- while (p && !p->is_target() && !p->is_folder())
- p = p->parent;
- if (!p) {
- fltk3::message("A Fluid File reference can only be added to a Target or
Folder!");
- return 0;
- }
- Fl_Fluid_File_Type *o = new Fl_Fluid_File_Type();
- o->name("main_ui.fl");
- o->add(p);
- o->factory = this;
- return o;
-}
-
-// ------------ Fluid File
-----------------------------------------------------
-
-Fl_Code_File_Type Fl_Code_File_type;
-
-Fl_Type *Fl_Code_File_Type::make() {
- // make sure that this is a workspace file
- if (Fl_Type::first && !is_workspace()) {
- fltk3::message("C/C++ Files can only be used in Workspace files.");
- return 0;
- }
- // files can be children of folders and children of targets
- Fl_Type *p = Fl_Type::current;
- while (p && !p->is_target() && !p->is_folder())
- p = p->parent;
- if (!p) {
- fltk3::message("A C/C++ File reference can only be added to a Target or
Folder!");
- return 0;
- }
- Fl_Code_File_Type *o = new Fl_Code_File_Type();
- o->name("main.cxx");
- o->add(p);
- o->factory = this;
- return o;
-}
-
// ------------ Folder
---------------------------------------------------------
Fl_Folder_Type Fl_Folder_type;
Modified: branches/branch-3.0/fluid/Fl_Type.h
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.h 2011-07-30 21:37:08 UTC (rev 8886)
+++ branches/branch-3.0/fluid/Fl_Type.h 2011-07-31 11:39:10 UTC (rev 8887)
@@ -50,6 +50,8 @@
extern unsigned int wks_env;
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 };
+
class Fl_Type {
friend class Widget_Browser;
@@ -258,7 +260,7 @@
~Fl_File_Type() {
if (pFilename) free(pFilename);
}
- const char *type_name() { return "file"; }
+ const char *type_name() { return "file_ref"; }
Fl_Type *make();
virtual int is_file() const { return 1; }
virtual int pixmapID() { return 53; } // FIXME: draw icon
@@ -275,34 +277,6 @@
};
extern Fl_File_Type Fl_File_type;
-class Fl_Fluid_File_Type : public Fl_File_Type {
-public:
- Fl_Fluid_File_Type() :
- Fl_File_Type() {
- }
- ~Fl_Fluid_File_Type() {
- }
- const char *type_name() { return "fluid_file"; }
- Fl_Type *make();
- virtual int is_parent() const { return 1; }
- virtual int is_fluid_file() const { return 1; }
- virtual int pixmapID() { return 53; }
-};
-extern Fl_Fluid_File_Type Fl_Fluid_File_type;
-
-class Fl_Code_File_Type : public Fl_File_Type {
-public:
- Fl_Code_File_Type() :
- Fl_File_Type() {
- }
- ~Fl_Code_File_Type() {
- }
- const char *type_name() { return "code_file"; }
- Fl_Type *make();
- virtual int pixmapID() { return 55; }
-};
-extern Fl_Code_File_Type Fl_Code_File_type;
-
class Fl_Folder_Type : public Fl_Workspace_Type {
public:
Fl_Folder_Type() :
Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx 2011-07-30 21:37:08 UTC (rev
8886)
+++ branches/branch-3.0/fluid/factory.cxx 2011-07-31 11:39:10 UTC (rev
8887)
@@ -1012,9 +1012,7 @@
{"Workspace",0,0,0,fltk3::SUBMENU},
{"Application",0,cb,(void*)&Fl_App_Target_type},
{"Library",0,cb,(void*)&Fl_App_Target_type, fltk3::MENU_DIVIDER},
- {"C/C++ File",0,cb,(void*)&Fl_Code_File_type},
- {"Fluid File",0,cb,(void*)&Fl_Fluid_File_type},
- {"Other File",0,cb,(void*)&Fl_File_type, fltk3::MENU_DIVIDER},
+ {"File",0,cb,(void*)&Fl_File_type, fltk3::MENU_DIVIDER},
{"Group",0,cb,(void*)&Fl_Folder_type},
{0},
{"Code",0,0,0,fltk3::SUBMENU},
Modified: branches/branch-3.0/fluid/file.cxx
===================================================================
--- branches/branch-3.0/fluid/file.cxx 2011-07-30 21:37:08 UTC (rev 8886)
+++ branches/branch-3.0/fluid/file.cxx 2011-07-31 11:39:10 UTC (rev 8887)
@@ -350,7 +350,7 @@
if (wks_name) {
write_string("\nwks_name "); write_word(wks_name);
}
- if (wks_env!=Fl_Environment_Choice::ENV_ALL) {
+ if (wks_env!=ENV_ALL) {
write_string("\nwks_env %d", wks_env);
}
for (Fl_Type *p = Fl_Type::first; p;) {
Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx 2011-07-30 21:37:08 UTC (rev 8886)
+++ branches/branch-3.0/fluid/fluid.cxx 2011-07-31 11:39:10 UTC (rev 8887)
@@ -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&Fl_Environment_Choice::ENV_MAKE) && write_fltk_makefiles()) {
+ if ((wks_env&ENV_MAKE) && write_fltk_makefiles()) {
int v = fltk3::choice("Error writing Makefile build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&Fl_Environment_Choice::ENV_CMAKE) && write_fltk_cmake()) {
+ if ((wks_env&ENV_CMAKE) && write_fltk_cmake()) {
int v = fltk3::choice("Error writing Makefile build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
- if ((wks_env&Fl_Environment_Choice::ENV_XC4) && write_fltk_ide_xcode4()) {
+ if ((wks_env&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&Fl_Environment_Choice::ENV_VC6) && write_fltk_ide_visualc6()) {
+ if ((wks_env&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&Fl_Environment_Choice::ENV_VC2008) &&
write_fltk_ide_visualc2008()) {
+ if ((wks_env&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&Fl_Environment_Choice::ENV_VC2010) &&
write_fltk_ide_visualc2010()) {
+ if ((wks_env&ENV_VC2010) && write_fltk_ide_visualc2010()) {
int v = fltk3::choice("Error writing VisualC 2010 build system", "Cancel",
"Continue", 0);
if (v==0) return;
}
Copied: branches/branch-3.0/fluid/pixmaps/flFile.xpm (from rev 8883,
branches/branch-3.0/fluid/pixmaps/flFluidFile.xpm)
===================================================================
--- branches/branch-3.0/fluid/pixmaps/flFile.xpm
(rev 0)
+++ branches/branch-3.0/fluid/pixmaps/flFile.xpm 2011-07-31 11:39:10 UTC
(rev 8887)
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *flFile_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"a c #606060",
+"b c #444444",
+"c c none",
+"d c #ffffff",
+"e c #333300",
+"f c #000000",
+/* pixels */
+"ccffffffffcccccc",
+"ccfddddddbfccccc",
+"ccfddddddbdfcccc",
+"ccfddddddbddfccc",
+"ccfddddddbbbbfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccfddddddddddfcc",
+"ccffffffffffffcc",
+"cccccccccccccccc"
+};
Modified: branches/branch-3.0/fluid/workspace_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.cxx 2011-07-30 21:37:08 UTC
(rev 8886)
+++ branches/branch-3.0/fluid/workspace_panel.cxx 2011-07-31 11:39:10 UTC
(rev 8887)
@@ -224,7 +224,7 @@
if (wks_env)
pEnv->value(wks_env);
else
- pEnv->value(Fl_Environment_Choice::ENV_ALL);
+ pEnv->value(ENV_ALL);
workspace_panel->show();
return workspace_panel;
}
Modified: branches/branch-3.0/fluid/workspace_panel.fl
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.fl 2011-07-30 21:37:08 UTC
(rev 8886)
+++ branches/branch-3.0/fluid/workspace_panel.fl 2011-07-31 11:39:10 UTC
(rev 8887)
@@ -54,8 +54,6 @@
} {
decl {unsigned int pEnv;} {protected local
}
- decl {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 };} {public local
- }
{fltk3::MenuButton} pEnvMenu {
label Environent open
xywh {0 0 170 20} labelsize 12
@@ -237,7 +235,8 @@
}
}
-Function {show_workspace_panel()} {} {
+Function {show_workspace_panel()} {open
+} {
codeblock {if (!workspace_panel)} {open
} {
{fltk3::Window} workspace_panel {
@@ -273,8 +272,9 @@
if (wks_env)
pEnv->value(wks_env);
else
- pEnv->value(Fl_Environment_Choice::ENV_ALL);
-workspace_panel->show();} {}
+ pEnv->value(ENV_ALL);
+workspace_panel->show();} {selected
+ }
}
Function {make_app_target_panel()} {} {
@@ -388,7 +388,7 @@
Function {make_file_panel()} {open
} {
{fltk3::Window} {} {
- label {File Properties} open selected
+ label {File Properties} open
xywh {510 319 405 136} type Double labelsize 11 align 80 resizable hotspot
code0 {o->size_range(o->w(), o->h());}
class Fl_Panel non_modal visible
Modified: branches/branch-3.0/fluid/workspace_panel.h
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.h 2011-07-30 21:37:08 UTC (rev
8886)
+++ branches/branch-3.0/fluid/workspace_panel.h 2011-07-31 11:39:10 UTC (rev
8887)
@@ -45,7 +45,6 @@
protected:
unsigned int pEnv;
public:
- 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 };
fltk3::MenuButton *pEnvMenu;
static fltk3::MenuItem menu_pEnvMenu[];
static fltk3::MenuItem *pMenuAll;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
