diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-04-25 07:48:07 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-04-25 07:48:07 +0000 |
| commit | 4edd134933f7d9c6235667eede83bc54cf8e1070 (patch) | |
| tree | d130474d6e78750d3690c3a5db1511524ab6c0ce /src/glut_font.cxx | |
| parent | 9e3610c75f8ceeebb8e59db2c641f21082979856 (diff) | |
Fixed definition of glutBitmapWidth to match header file.
Does not turn visible() on when a window is iconized() or if a modal
window is shown and it's parent is iconized. This allows the code
"while (w->visible() && w->damage()) Fl::check();" to reliably wait
for the window to be mapped and drawn the first time.
Some comments added to Fl_win32.cxx to explain how the WM_PAINT works.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1085 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/glut_font.cxx')
| -rw-r--r-- | src/glut_font.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glut_font.cxx b/src/glut_font.cxx index 1468e38f5..59581e6eb 100644 --- a/src/glut_font.cxx +++ b/src/glut_font.cxx @@ -1,5 +1,5 @@ // -// "$Id: glut_font.cxx,v 1.4 1999/01/07 19:17:46 mike Exp $" +// "$Id: glut_font.cxx,v 1.4.2.1 2000/04/25 07:48:07 bill Exp $" // // GLUT bitmap font routines for the Fast Light Tool Kit (FLTK). // @@ -40,13 +40,13 @@ Glut_Bitmap_Font glutBitmapHelvetica10 = {FL_HELVETICA, 10}; Glut_Bitmap_Font glutBitmapHelvetica12 = {FL_HELVETICA, 12}; Glut_Bitmap_Font glutBitmapHelvetica18 = {FL_HELVETICA, 18}; -void glutBitmapCharacter(void *font, int character) { +void glutBitmapCharacter(void* font, int character) { gl_font(((Glut_Bitmap_Font *)font)->font,((Glut_Bitmap_Font *)font)->size); char a[1]; a[0] = character; gl_draw(a,1); } -int glutBitmapWidth(int font, int character) { +int glutBitmapWidth(void* font, int character) { gl_font(((Glut_Bitmap_Font *)font)->font,((Glut_Bitmap_Font *)font)->size); return int(gl_width(character)+.5); } @@ -54,5 +54,5 @@ int glutBitmapWidth(int font, int character) { #endif // -// End of "$Id: glut_font.cxx,v 1.4 1999/01/07 19:17:46 mike Exp $". +// End of "$Id: glut_font.cxx,v 1.4.2.1 2000/04/25 07:48:07 bill Exp $". // |