diff options
Diffstat (limited to 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index c24463c5d..2b0348c60 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: gl_draw.cxx,v 1.7.2.4 2001/01/22 15:13:41 easysw Exp $" +// "$Id: gl_draw.cxx,v 1.7.2.5 2001/03/14 17:20:02 spitzak Exp $" // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // @@ -37,14 +37,14 @@ #include "Fl_Font.H" #include <string.h> -void gl_font(int fontid, int size) {fl_font(fontid, size);} int gl_height() {return fl_height();} int gl_descent() {return fl_descent();} double gl_width(const char* s) {return fl_width(s);} double gl_width(const char* s, int n) {return fl_width(s,n);} double gl_width(uchar c) {return fl_width(c);} -void gl_draw(const char* str, int n) { +void gl_font(int fontid, int size) { + fl_font(fontid, size); if (!fl_fontsize->listbase) { #ifdef WIN32 int base = fl_fontsize->metr.tmFirstChar; @@ -60,11 +60,11 @@ void gl_draw(const char* str, int n) { glXUseXFont(fl_xfont->fid, base, size, fl_fontsize->listbase+base); #endif } + glListBase(fl_fontsize->listbase); +} - glPushAttrib(GL_LIST_BIT); - glListBase(fl_fontsize->listbase); - glCallLists(n, GL_UNSIGNED_BYTE, str); - glPopAttrib(); +void gl_draw(const char* str, int n) { + glCallLists(n, GL_UNSIGNED_BYTE, str); } void gl_draw(const char* str, int n, int x, int y) { @@ -155,5 +155,5 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { #endif // -// End of "$Id: gl_draw.cxx,v 1.7.2.4 2001/01/22 15:13:41 easysw Exp $". +// End of "$Id: gl_draw.cxx,v 1.7.2.5 2001/03/14 17:20:02 spitzak Exp $". // |