From d9c5194ce0f69eded27c330d38cabea0a0aa66cb Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 16 Dec 2006 15:58:19 +0000
Subject: [PATCH] remove "file_type" for open callbacks: it gives the wrong
impression that files will be treated differently depending on the choice (as
is the case for save callbacks)--this is not true
---
Fltk/Callbacks.cpp | 33 +++------------------------------
Fltk/Callbacks.h | 1 -
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index afc4553396..fd9002a207 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.497 2006-12-16 15:44:28 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.498 2006-12-16 15:58:19 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -566,11 +566,6 @@ void status_rewind_cb(CALLBACK_ARGS)
Draw();
}
-void status_cancel_cb(CALLBACK_ARGS)
-{
- ;
-}
-
// File Menu
void file_new_cb(CALLBACK_ARGS)
@@ -599,32 +594,10 @@ void file_new_cb(CALLBACK_ARGS)
}
}
-static char *file_types =
- "*"
- "\tGmsh geometry (*.geo)"
- "\tGmsh mesh (*.msh)"
- "\tGmsh post-processing (*.pos)"
- "\tI-deas universal mesh (*.unv)"
- "\tMedit mesh (*.mesh)"
- "\tNastran bulk data file (*.bdf)"
- "\tSTL surface mesh (*.stl)"
-#if defined(HAVE_OCC)
- "\tSTEP model (*.step)"
- "\tIGES model (*.iges)"
- "\tOpenCascade model (*.brep)"
-#endif
- "\tJPEG (*.jpg)"
- "\tPNG (*.png)"
- "\tBMP (*.bmp)"
- "\tPPM (*.ppm)"
- "\tPGM (*.pgm)"
- "\tPBM (*.pbm)"
- "\tPNM (*.pnm)";
-
void file_open_cb(CALLBACK_ARGS)
{
int n = List_Nbr(CTX.post.list);
- if(file_chooser(0, 0, "Open", file_types)) {
+ if(file_chooser(0, 0, "Open", "*")) {
OpenProject(file_chooser_get_name(1));
Draw();
}
@@ -635,7 +608,7 @@ void file_open_cb(CALLBACK_ARGS)
void file_merge_cb(CALLBACK_ARGS)
{
int n = List_Nbr(CTX.post.list);
- int f = file_chooser(1, 0, "Merge", file_types);
+ int f = file_chooser(1, 0, "Merge", "*");
if(f) {
for(int i = 1; i <= f; i++)
MergeFile(file_chooser_get_name(i));
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index 5abd6bbcc4..6fe296be54 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -42,7 +42,6 @@ void status_xyz1p_cb(CALLBACK_ARGS);
void status_play_cb(CALLBACK_ARGS);
void status_pause_cb(CALLBACK_ARGS);
void status_rewind_cb(CALLBACK_ARGS);
-void status_cancel_cb(CALLBACK_ARGS);
// File Menu
--
GitLab