diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2002-06-27 04:29:39 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2002-06-27 04:29:39 +0000 |
| commit | 9c29ecde90d6c415ed842c5139937e73ebd2f274 (patch) | |
| tree | fe2094302ea5027b4d33a2c269050e824172145b /src/gl_draw.cxx | |
| parent | 0d352d96eaa8c5a7115acceabf80a993a5f623f1 (diff) | |
MacOS:
Pixmap Draw fix: pixmap would always draw from 0, 0
gl_font implemented
FL_FOCUS fix: would not send FL_FOCUS when window activated
window classes fixed: modal() and non_modal() should work much better
glut fix: uninitialised 'display' callback made glpuzzle crash
Please send bug reports
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2323 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index e7ca43080..5d8fa6d5c 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.7 2002/05/25 13:38:25 easysw Exp $" +// "$Id: gl_draw.cxx,v 1.7.2.5.2.8 2002/06/27 04:29:39 matthiaswm Exp $" // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // @@ -53,8 +53,10 @@ void gl_font(int fontid, int size) { wglUseFontBitmaps(fl_gc, base, size, fl_fontsize->listbase+base); SelectObject(fl_gc, oldFid); #elif defined(__APPLE__) - // \todo Mac : Insert MacOS/AGL font handling here (aglUseFont) - // aglUseFont( context, fontID/GetFNum(), Style[norma, bold, italic], size, first, count, base ); + // 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; @@ -157,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.7 2002/05/25 13:38:25 easysw Exp $". +// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.8 2002/06/27 04:29:39 matthiaswm Exp $". // |