diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Scroll.cxx | 7 | ||||
| -rw-r--r-- | src/gl_draw.cxx | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/Fl_Scroll.cxx b/src/Fl_Scroll.cxx index 3eeda1046..22593c146 100644 --- a/src/Fl_Scroll.cxx +++ b/src/Fl_Scroll.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.1 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.2 2002/08/09 22:57:00 easysw Exp $" // // Scroll widget for the Fast Light Tool Kit (FLTK). // @@ -29,9 +29,8 @@ // Insure the scrollbars are the last children: void Fl_Scroll::fix_scrollbar_order() { - Fl_Widget*const* a = array(); + Fl_Widget** a = (Fl_Widget**)array(); if (a[children()-1] != &scrollbar) { - Fl_Widget** a = (Fl_Widget**)array(); int i,j; for (i = j = 0; j < children(); j++) if (a[j] != &hscrollbar && a[j] != &scrollbar) a[i++] = a[j]; a[i++] = &hscrollbar; @@ -249,5 +248,5 @@ int Fl_Scroll::handle(int event) { } // -// End of "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.1 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.2 2002/08/09 22:57:00 easysw Exp $". // diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 5d8fa6d5c..9175126e3 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: gl_draw.cxx,v 1.7.2.5.2.8 2002/06/27 04:29:39 matthiaswm Exp $" +// "$Id: gl_draw.cxx,v 1.7.2.5.2.9 2002/08/09 22:57:00 easysw Exp $" // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // @@ -47,21 +47,21 @@ void gl_font(int fontid, int size) { if (!fl_fontsize->listbase) { #ifdef WIN32 int base = fl_fontsize->metr.tmFirstChar; - int size = fl_fontsize->metr.tmLastChar-base+1; + int count = fl_fontsize->metr.tmLastChar-base+1; HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid); fl_fontsize->listbase = glGenLists(256); - wglUseFontBitmaps(fl_gc, base, size, fl_fontsize->listbase+base); + wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base); SelectObject(fl_gc, oldFid); #elif defined(__APPLE__) - // undefined characters automatically receive an empty GL LIst in aglUseFont + // undefined characters automatically receive an empty GL list in aglUseFont fl_fontsize->listbase = glGenLists(256); aglUseFont(aglGetCurrentContext(), fl_fontsize->font, fl_fontsize->face, fl_fontsize->size, 0, 256, fl_fontsize->listbase); #else int base = fl_xfont->min_char_or_byte2; - int size = fl_xfont->max_char_or_byte2-base+1; + int count = fl_xfont->max_char_or_byte2-base+1; fl_fontsize->listbase = glGenLists(256); - glXUseXFont(fl_xfont->fid, base, size, fl_fontsize->listbase+base); + glXUseXFont(fl_xfont->fid, base, count, fl_fontsize->listbase+base); #endif } glListBase(fl_fontsize->listbase); @@ -159,5 +159,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.5.2.8 2002/06/27 04:29:39 matthiaswm Exp $". +// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.9 2002/08/09 22:57:00 easysw Exp $". // |