From 43b03e93ed5d2a74cd328be937ba7519a920466d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 16 Nov 2002 23:46:05 +0000
Subject: [PATCH] Small fixes for old fltk versions (1.0)
---
Fltk/Callbacks.cpp | 4 ++--
Fltk/GUI.cpp | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 5be45e25d2..e052773955 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.153 2002-11-16 23:23:34 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.154 2002-11-16 23:46:05 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -58,7 +58,7 @@ extern Context_T CTX;
static char *fn = NULL;
int file_chooser(int multi, const char* message, const char* pat, int patindex){
- char *fn = fl_file_chooser(message,pat,NULL);
+ fn = fl_file_chooser(message,pat,NULL);
if(fn) return 1;
else return 0;
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 1ffdb2affc..1668ddab34 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.215 2002-11-16 23:23:34 geuzaine Exp $
+// $Id: GUI.cpp,v 1.216 2002-11-16 23:46:05 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -752,14 +752,14 @@ void GUI::create_menu_window(int argc, char **argv){
y = BH + 3;
#endif
- m_navig_butt[0] = new Fl_Button(1,y,18,BH/2,"@<");
+ m_navig_butt[0] = new Fl_Button(1,y,18,BH/2,"@#<");
m_navig_butt[0]->labeltype(FL_SYMBOL_LABEL);
m_navig_butt[0]->labelsize(11);
m_navig_butt[0]->box(FL_FLAT_BOX);
m_navig_butt[0]->selection_color(FL_WHITE);
m_navig_butt[0]->callback(mod_back_cb);
- m_navig_butt[1] = new Fl_Button(1,y+BH/2,18,BH/2,"@>");
+ m_navig_butt[1] = new Fl_Button(1,y+BH/2,18,BH/2,"@#>");
m_navig_butt[1]->labeltype(FL_SYMBOL_LABEL);
m_navig_butt[1]->labelsize(11);
m_navig_butt[1]->box(FL_FLAT_BOX);
@@ -786,7 +786,8 @@ void GUI::create_menu_window(int argc, char **argv){
m_toggle_butt[i]->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
m_toggle_butt[i]->hide();
- m_toggle2_butt[i]= new Fl_Button(width-(CTX.fontsize+4),y+i*BH,(CTX.fontsize+4),BH,"@>");
+ m_toggle2_butt[i]= new Fl_Button(width-(CTX.fontsize+4),y+i*BH,(CTX.fontsize+4),BH,"@#>");
+ m_toggle2_butt[i]->labeltype(FL_SYMBOL_LABEL);
m_toggle2_butt[i]->labelsize(11);
m_toggle2_butt[i]->align(FL_ALIGN_CENTER);
m_toggle2_butt[i]->hide();
--
GitLab