diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp index b82f602f4de0807a962ae0a20e2de4f08cd76644..1ba0aa8b7e72411f37de380e186e6a01c60032bb 100644 --- a/Fltk/Callbacks.cpp +++ b/Fltk/Callbacks.cpp @@ -1,4 +1,4 @@ -// $Id: Callbacks.cpp,v 1.404 2006-01-27 21:15:30 geuzaine Exp $ +// $Id: Callbacks.cpp,v 1.405 2006-01-28 07:07:11 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -596,7 +596,12 @@ static char *file_types = "\tGmsh mesh (*.msh)" "\tGmsh post-processing view (*.pos)" "\tSTL triangulation (*.stl)" + "\tJPEG (*.jpg)" + "\tPNG (*.png)" + "\tBMP (*.bmp)" "\tPPM (*.ppm)" + "\tPGM (*.pgm)" + "\tPBM (*.pbm)" "\tPNM (*.pnm)"; void file_open_cb(CALLBACK_ARGS) diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index 9cde3ecefaeb62dee00d8afecb4bb3bc70fe18ba..74668648f89548b2bafde2caf07b709363a6a5a3 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.485 2006-01-28 06:40:41 geuzaine Exp $ +// $Id: GUI.cpp,v 1.486 2006-01-28 07:07:11 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -873,6 +873,9 @@ GUI::GUI(int argc, char **argv) Fl::scheme(CTX.scheme); Fl_Tooltip::size(fontsize); + // load system icons + Fl_File_Icon::load_system_icons(); + // add callback to respond to the Mac Finder (when you click on a // document) #if defined(__APPLE__) && defined(HAVE_FLTK_1_1_5_OR_ABOVE) diff --git a/Fltk/GUI.h b/Fltk/GUI.h index 77fb46db644c7ff0236f5b1ee839ef206b2b9eae..8a9098826765b3a4662d4d09141da5050f5e8178 100644 --- a/Fltk/GUI.h +++ b/Fltk/GUI.h @@ -47,6 +47,7 @@ #include <FL/Fl_Color_Chooser.H> #include <FL/fl_ask.H> #include <FL/Fl_Tooltip.H> +#include <FL/Fl_File_Icon.H> #if defined(__APPLE__) && defined(HAVE_FLTK_1_1_5_OR_ABOVE) #include <FL/Fl_Sys_Menu_Bar.H> #endif