Author: matt
Date: 2011-07-30 14:37:08 -0700 (Sat, 30 Jul 2011)
New Revision: 8886
Log:
File Type now also remembers our setting.
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/Fl_Type.cxx
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-07-30 21:25:25 UTC (rev 8885)
+++ branches/branch-3.0/fltk.flw 2011-07-30 21:37:08 UTC (rev 8886)
@@ -74,7 +74,7 @@
uuid_Xcode4_PBXFileRef {5C7951B9-91C1-48CE-9D89-E31BAA6CA89A}
filename_and_path {fluid/factory.cxx}
}
- code_file {file.cxx} {
+ code_file {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}
@@ -160,7 +160,7 @@
uuid_Xcode4_PBXFileRef {26103935-2D50-4B44-97C7-EE9AA857DE61}
filename_and_path {fluid/alignment_panel.h}
}
- code_file {comments.h} {selected
+ code_file {comments.h} {
uuid_Xcode4_PBXFileRef {19297348-7E5A-41AE-99F6-7AB10245A1D8}
filename_and_path {fluid/comments.h}
}
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-07-30 21:25:25 UTC (rev
8885)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-07-30 21:37:08 UTC (rev
8886)
@@ -1349,6 +1349,8 @@
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);
}
@@ -1362,6 +1364,9 @@
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) {
@@ -1420,13 +1425,6 @@
if (Fl_Panel::numselected) the_file_panel->show();
}
-//void Fl_File_Type::open() {
-// const char *lName = fltk3::input("Enter a file name:", filename());
-// if (lName) {
-// filename(lName);
-// }
-//}
-
// ------------ Fluid File
-----------------------------------------------------
Fl_Fluid_File_Type Fl_Fluid_File_type;
@@ -1452,13 +1450,6 @@
return o;
}
-//void Fl_Fluid_File_Type::open() {
-// const char *lName = fltk3::input("Enter a Fluid file name:", filename());
-// if (lName) {
-// filename(lName);
-// }
-//}
-
// ------------ Fluid File
-----------------------------------------------------
Fl_Code_File_Type Fl_Code_File_type;
@@ -1484,13 +1475,6 @@
return o;
}
-//void Fl_Code_File_Type::open() {
-// const char *lName = fltk3::input("Enter a C/C++ file name:", filename());
-// if (lName) {
-// filename(lName);
-// }
-//}
-
// ------------ Folder
---------------------------------------------------------
Fl_Folder_Type Fl_Folder_type;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
