Author: manolo
Date: 2011-01-17 01:39:14 -0800 (Mon, 17 Jan 2011)
New Revision: 8286
Log:
Fl_File_Chooser: removed the "Show hidden files" button for WIN32 where it's
not relevant.
Modified:
branches/branch-1.3/FL/Fl_File_Chooser.H
branches/branch-1.3/src/Fl_File_Chooser.cxx
branches/branch-1.3/src/Fl_File_Chooser2.cxx
Modified: branches/branch-1.3/FL/Fl_File_Chooser.H
===================================================================
--- branches/branch-1.3/FL/Fl_File_Chooser.H 2011-01-16 21:05:29 UTC (rev
8285)
+++ branches/branch-1.3/FL/Fl_File_Chooser.H 2011-01-17 09:39:14 UTC (rev
8286)
@@ -123,9 +123,11 @@
Fl_Return_Button *favOkButton;
void cb_favOkButton_i(Fl_Return_Button*, void*);
static void cb_favOkButton(Fl_Return_Button*, void*);
+#ifndef WIN32
Fl_Check_Button *show_hidden;
static void show_hidden_cb(Fl_Check_Button*, void*);
void remove_hidden_files();
+#endif
public:
~Fl_File_Chooser();
void callback(void (*cb)(Fl_File_Chooser *, void *), void *d = 0);
Modified: branches/branch-1.3/src/Fl_File_Chooser.cxx
===================================================================
--- branches/branch-1.3/src/Fl_File_Chooser.cxx 2011-01-16 21:05:29 UTC (rev
8285)
+++ branches/branch-1.3/src/Fl_File_Chooser.cxx 2011-01-17 09:39:14 UTC (rev
8286)
@@ -87,7 +87,7 @@
void Fl_File_Chooser::cb_previewButton(Fl_Check_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_previewButton_i(o,v);
}
-
+#ifndef WIN32
void Fl_File_Chooser::remove_hidden_files()
{
int count = fileList->size();
@@ -107,7 +107,7 @@
mychooser->browser()->redraw();
}
}
-
+#endif
void Fl_File_Chooser::cb_fileName_i(Fl_File_Input*, void*) {
fileNameCB();
}
@@ -228,7 +228,7 @@
previewButton->callback((Fl_Callback*)cb_previewButton);
previewButton->label(preview_label);
} // Fl_Check_Button* previewButton
-
+#ifndef WIN32
{ show_hidden = new Fl_Check_Button(
previewButton->x() + previewButton->w() + 30, 275, 140, 20, "Show
hidden files");
show_hidden->down_box(FL_DOWN_BOX);
@@ -236,7 +236,7 @@
show_hidden->callback((Fl_Callback*)show_hidden_cb, this);
show_hidden->label(hidden_label);
} // Fl_Check_Button* show_hidden
-
+#endif
{ Fl_Box* o = new Fl_Box(115, 275, 365, 20);
Fl_Group::current()->resizable(o);
} // Fl_Box* o
Modified: branches/branch-1.3/src/Fl_File_Chooser2.cxx
===================================================================
--- branches/branch-1.3/src/Fl_File_Chooser2.cxx 2011-01-16 21:05:29 UTC
(rev 8285)
+++ branches/branch-1.3/src/Fl_File_Chooser2.cxx 2011-01-17 09:39:14 UTC
(rev 8286)
@@ -1150,8 +1150,9 @@
// Build the file list...
fileList->load(directory_, sort);
+#ifndef WIN32
if (!show_hidden->value()) remove_hidden_files();
-
+#endif
// Update the preview box...
update_preview();
}
@@ -1176,8 +1177,9 @@
// Build the file list...
fileList->load(directory_, sort);
+#ifndef WIN32
if (!show_hidden->value()) remove_hidden_files();
-
+#endif
// Update the preview box...
update_preview();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
