From 1aed848cab611b8467facdd134e079180b67a5e0 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 3 Feb 2001 21:20:32 +0000
Subject: [PATCH] *** empty log message ***
---
Box/Box.cpp | 19 ++++++++++++-------
Fltk/Opengl.cpp | 6 +++---
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Box/Box.cpp b/Box/Box.cpp
index be97d75948..22e253ade6 100644
--- a/Box/Box.cpp
+++ b/Box/Box.cpp
@@ -1,4 +1,4 @@
-// $Id: Box.cpp,v 1.21 2001-01-29 08:43:44 geuzaine Exp $
+// $Id: Box.cpp,v 1.22 2001-02-03 21:20:32 geuzaine Exp $
#include <signal.h>
@@ -121,18 +121,27 @@ void Msg(int level, char *fmt, ...){
switch(level){
case FATAL :
+ case FATAL1 :
+ case FATAL2 :
+ case FATAL3 :
fprintf(stderr, FATAL_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
abort = 1 ;
break ;
- case ERROR :
+ case GERROR :
+ case GERROR1 :
+ case GERROR2 :
+ case GERROR3 :
fprintf(stderr, ERROR_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
abort = 1 ;
break ;
case WARNING :
+ case WARNING1 :
+ case WARNING2 :
+ case WARNING3 :
fprintf(stderr, WARNING_STR);
vfprintf(stderr, fmt,args); fprintf(stderr, "\n");
break;
@@ -149,11 +158,7 @@ void Msg(int level, char *fmt, ...){
}
break ;
- case DEBUG :
- case INFOS :
- case INFO :
- case SELECT :
- case STATUS :
+ default :
if(CTX.verbosity == 5){
fprintf(stderr, INFO_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
index d32b7074f9..4ef0f826f3 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.15 2001-02-03 13:10:26 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.16 2001-02-03 21:20:32 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -52,8 +52,8 @@ void Draw_String(char *s){
}
gl_font(FL_HELVETICA, CTX.gl_fontsize);
- //CTX.gl_fontheight = gl_height() ;
- //CTX.gl_fontascent = gl_height()-gl_descent() ;
+ CTX.gl_fontheight = gl_height() ;
+ CTX.gl_fontascent = gl_height()-gl_descent() ;
gl_draw(s);
}
--
GitLab