diff options
Diffstat (limited to 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 51f92fd66..10801ae40 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -101,10 +101,10 @@ void gl_font(int fontid, int size) { // this is unused because USE_OksiD_style_GL_font_selection == 1 int base = fl_fontsize->metr.tmFirstChar; int count = fl_fontsize->metr.tmLastChar-base+1; - HFONT oldFid = (HFONT)SelectObject((HDC)fl_graphics_driver->get_gc(), fl_fontsize->fid); + HFONT oldFid = (HFONT)SelectObject((HDC)fl_graphics_driver->gc(), fl_fontsize->fid); fl_fontsize->listbase = glGenLists(256); - wglUseFontBitmaps((HDC)fl_graphics_driver->get_gc(), base, count, fl_fontsize->listbase+base); - SelectObject((HDC)fl_graphics_driver->get_gc(), oldFid); + wglUseFontBitmaps((HDC)fl_graphics_driver->gc(), base, count, fl_fontsize->listbase+base); + SelectObject((HDC)fl_graphics_driver->gc(), oldFid); # endif #endif // USE_OksiD_style_GL_font_selection @@ -132,9 +132,9 @@ static void get_list(int r) { # endif #elif defined(WIN32) unsigned int ii = r * 0x400; - HFONT oldFid = (HFONT)SelectObject((HDC)fl_graphics_driver->get_gc(), gl_fontsize->fid); - wglUseFontBitmapsW((HDC)fl_graphics_driver->get_gc(), ii, ii + 0x03ff, gl_fontsize->listbase+ii); - SelectObject((HDC)fl_graphics_driver->get_gc(), oldFid); + HFONT oldFid = (HFONT)SelectObject((HDC)fl_graphics_driver->gc(), gl_fontsize->fid); + wglUseFontBitmapsW((HDC)fl_graphics_driver->gc(), ii, ii + 0x03ff, gl_fontsize->listbase+ii); + SelectObject((HDC)fl_graphics_driver->gc(), oldFid); #else # error unsupported platform #endif @@ -491,10 +491,10 @@ int gl_texture_fifo::compute_texture(const char* str, int n) CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB(); void *base = NULL; if (fl_mac_os_version < 100600) base = calloc(4*fifo[current].width, h); - void* save_gc = fl_graphics_driver->get_gc(); + void* save_gc = fl_graphics_driver->gc(); CGContextRef gc = CGBitmapContextCreate(base, fifo[current].width, h, 8, fifo[current].width*4, lut, (CGBitmapInfo)(kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); - fl_graphics_driver->set_gc(gc); + fl_graphics_driver->gc(gc); CGColorSpaceRelease(lut); GLfloat colors[4]; glGetFloatv(GL_CURRENT_COLOR, colors); @@ -510,7 +510,7 @@ int gl_texture_fifo::compute_texture(const char* str, int n) glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, fifo[current].width, h, 0, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, CGBitmapContextGetData(gc)); glPopAttrib(); CGContextRelease(gc); - fl_graphics_driver->set_gc(save_gc); + fl_graphics_driver->gc(save_gc); if (base) free(base); } else { fifo[current].ratio = float(fifo[current].width)/glutStrokeLength(GLUT_STROKE_ROMAN, (uchar*)fifo[current].utf8); |
