Author: bgbnbigben
Date: 2011-04-11 00:50:08 -0700 (Mon, 11 Apr 2011)
New Revision: 8574
Log:
Reverted the default use of file_chooser in fluid after it was changed a few
revisions ago.
Modified:
trunk/fluid/Fluid_Image.cxx
trunk/fluid/fluid.cxx
Modified: trunk/fluid/Fluid_Image.cxx
===================================================================
--- trunk/fluid/Fluid_Image.cxx 2011-04-10 09:10:40 UTC (rev 8573)
+++ trunk/fluid/Fluid_Image.cxx 2011-04-11 07:50:08 UTC (rev 8574)
@@ -353,7 +353,7 @@
Fluid_Image *ui_find_image(Fluid_Image *old) {
const char *name = fltk::file_chooser("Image",
"*.{bm|xbm|xpm|gif|png|bmp|jpg|jpeg}",
- old ? old->name() : 0);
+ old ? old->name() : 0, 0, 0);
Fluid_Image *ret = (name && *name) ? Fluid_Image::find(name) : 0;
return ret;
}
@@ -372,7 +372,7 @@
void browse_dir_cb()
{
const char *f = fltk::file_chooser("Images directory","",
- images_dir_input->value());
+ images_dir_input->value(), 0, 0);
if (f) images_dir_input->value(f);
}
Modified: trunk/fluid/fluid.cxx
===================================================================
--- trunk/fluid/fluid.cxx 2011-04-10 09:10:40 UTC (rev 8573)
+++ trunk/fluid/fluid.cxx 2011-04-11 07:50:08 UTC (rev 8574)
@@ -219,7 +219,7 @@
void save_cb(Widget *, void *v) {
const char *c = filename;
if (v || !c || !*c) {
- if (!(c=file_chooser("Save to:", "*.f[ld]", c))) return;
+ if (!(c=file_chooser("Save to:", "*.f[ld]", c, 0, 0))) return;
if (v != (void *)2L) set_filename(c);
}
if (!write_file(c)) {
@@ -481,7 +481,7 @@
void open_cb(Widget *, void *v) {
if (!v && modflag && !ask("Discard changes?")) return;
const char *c;
- if (!(c = file_chooser("Open:", "*.f[ld]", filename))) return;
+ if (!(c = file_chooser("Open:", "*.f[ld]", filename, 0, 0))) return;
if (!fltk::filename_exist(c)) {
message("%s not found", c);
return;
@@ -660,7 +660,7 @@
/*void new_cb(Widget *, void *v) {
if (!v && modflag && !ask("Discard changes?")) return;
const char *c;
- if (!(c = file_chooser("New:", "*.f[ld]", 0))) return;
+ if (!(c = file_chooser("New:", "*.f[ld]", 0, 0, 0))) return;
delete_all();
set_filename(c);
modflag = 0;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
