Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied the patch by Garrick Meeker

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (NI)
2000-07-20 17:31:40 +00:00
parent 0f8d11dc8d
commit f48d169c4a
6 changed files with 464 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/gtk/glcanvas.h
View File

@@ -35,12 +35,21 @@ extern "C" {
enum enum
{ {
WX_GL_RGBA=1, /* use true color palette */ WX_GL_RGBA=1, /* use true color palette */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */
WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */
WX_GL_DOUBLEBUFFER, /* use doublebuffer */ WX_GL_DOUBLEBUFFER, /* use doublebuffer */
WX_GL_STEREO, /* use stereoscopic display */
WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */
WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */
WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */ WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */
WX_GL_MIN_BLUE /* use blue buffer with most bits (> MIN_BLUE bits) */ WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */
/* these are enough constants for now, the remaining will be added later */ WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */
WX_GL_STENCIL_SIZE, /* bits for stencil buffer */
WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

15
include/wx/gtk1/glcanvas.h
View File

@@ -35,12 +35,21 @@ extern "C" {
enum enum
{ {
WX_GL_RGBA=1, /* use true color palette */ WX_GL_RGBA=1, /* use true color palette */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */
WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */
WX_GL_DOUBLEBUFFER, /* use doublebuffer */ WX_GL_DOUBLEBUFFER, /* use doublebuffer */
WX_GL_STEREO, /* use stereoscopic display */
WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */
WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */
WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */ WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */
WX_GL_MIN_BLUE /* use blue buffer with most bits (> MIN_BLUE bits) */ WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */
/* these are enough constants for now, the remaining will be added later */ WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */
WX_GL_STENCIL_SIZE, /* bits for stencil buffer */
WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

24
include/wx/motif/glcanvas.h
View File

@@ -27,6 +27,30 @@
#include <GL/glx.h> #include <GL/glx.h>
enum
{
WX_GL_RGBA=1, /* use true color palette */
WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */
WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */
WX_GL_DOUBLEBUFFER, /* use doublebuffer */
WX_GL_STEREO, /* use stereoscopic display */
WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */
WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */
WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */
WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */
WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */
WX_GL_STENCIL_SIZE, /* bits for stencil buffer */
WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
};
//---------------------------------------------------------------------------
// classes
//---------------------------------------------------------------------------
class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
{ {
DECLARE_CLASS(wxGLCanvas) DECLARE_CLASS(wxGLCanvas)

77
include/wx/msw/glcanvas.h
View File

@@ -31,15 +31,28 @@
// Constants for attriblist // Constants for attriblist
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// The generic GL implementation doesn't support most of these options,
// such as stereo, auxiliary buffers, alpha channel, and accum buffer.
// Other implementations may actually support them.
enum enum
{ {
WX_GL_RGBA=1, /* use true color palette */ WX_GL_RGBA=1, /* use true color palette */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */
WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */
WX_GL_DOUBLEBUFFER, /* use doublebuffer */ WX_GL_DOUBLEBUFFER, /* use doublebuffer */
WX_GL_STEREO, /* use stereoscopic display */
WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */
WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */
WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */ WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */
WX_GL_MIN_BLUE /* use blue buffer with most bits (> MIN_BLUE bits) */ WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */
/* these are enough constants for now, the remaining will be added later */ WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */
WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */
WX_GL_STENCIL_SIZE, /* bits for stencil buffer */
WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
}; };
class WXDLLEXPORT wxGLCanvas; /* forward reference */ class WXDLLEXPORT wxGLCanvas; /* forward reference */
@@ -80,17 +93,17 @@ class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL, wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "GLCanvas", const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "GLCanvas",
int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette ); const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette );
~wxGLCanvas(); ~wxGLCanvas();
// Replaces wxWindow::Create functionality, since we need to use a different window class // Replaces wxWindow::Create functionality, since we need to use a different window class
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name); const wxPoint& pos, const wxSize& size, long style, const wxString& name);
void SetCurrent(); void SetCurrent();
void SetColour(const char *colour); void SetColour(const char *colour);
@@ -104,7 +117,7 @@ class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
inline wxGLContext* GetContext() const { return m_glContext; } inline wxGLContext* GetContext() const { return m_glContext; }
inline WXHDC GetHDC() const { return m_hDC; } inline WXHDC GetHDC() const { return m_hDC; }
void SetupPixelFormat(); void SetupPixelFormat(int *attribList = (int*) NULL);
void SetupPalette(const wxPalette& palette); void SetupPalette(const wxPalette& palette);
wxPalette CreateDefaultPalette(); wxPalette CreateDefaultPalette();
@@ -118,56 +131,6 @@ protected:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#ifdef __cplusplus
extern "C" {
#endif
/* Give extensions proper function names. */
/* N.B. - this is not completely implemented as yet */
/* EXT_vertex_array */
void glArrayElementEXT(GLint i);
void glColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
void glDrawArraysEXT(GLenum mode, GLint first, GLsizei count);
void glEdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *pointer);
void glGetPointervEXT(GLenum pname, GLvoid* *params);
void glIndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
void glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
/* EXT_color_subtable */
void glColorSubtableEXT(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *table);
/* EXT_color_table */
void glColorTableEXT(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
void glCopyColorTableEXT(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
void glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid *table);
void glGetColorTableParamaterfvEXT(GLenum target, GLenum pname, GLfloat *params);
void glGetColorTavleParameterivEXT(GLenum target, GLenum pname, GLint *params);
/* SGI_compiled_vertex_array */
void glLockArraysSGI(GLint first, GLsizei count);
void glUnlockArraysSGI();
/* SGI_cull_vertex */
void glCullParameterdvSGI(GLenum pname, GLdouble* params);
void glCullParameterfvSGI(GLenum pname, GLfloat* params);
/* SGI_index_func */
void glIndexFuncSGI(GLenum func, GLclampf ref);
/* SGI_index_material */
void glIndexMaterialSGI(GLenum face, GLenum mode);
/* WIN_swap_hint */
void glAddSwapHintRectWin(GLint x, GLint y, GLsizei width, GLsizei height);
#ifdef __cplusplus
}
#endif
#endif #endif
// wxUSE_GLCANVAS // wxUSE_GLCANVAS
#endif #endif

191
src/motif/glcanvas.cpp
View File

@@ -7,7 +7,7 @@
// Created: 1995, 1999 // Created: 1995, 1999
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart, Wolfram Gloger // Copyright: (c) Julian Smart, Wolfram Gloger
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -31,8 +31,8 @@ static int bitcount( unsigned long n )
{ {
int bits; int bits;
for (bits=0; n>0;) { for (bits=0; n>0;) {
if(n & 1) bits++; if(n & 1) bits++;
n = n >> 1; n = n >> 1;
} }
return bits; return bits;
} }
@@ -44,14 +44,10 @@ static int bitcount( unsigned long n )
IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow) IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow)
wxGLCanvas::wxGLCanvas(wxWindow *parent, wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos,
wxWindowID id, const wxSize& size, long style,
const wxPoint& pos, const wxString& name, int *attribList, const wxPalette& palette):
const wxSize& size, wxScrolledWindow(parent, id, pos, size, style, name)
long style,
const wxString& name,
int *attrib_list, const wxPalette& palette)
: wxScrolledWindow(parent, id, pos, size, style, name)
{ {
XVisualInfo *vi, vi_templ; XVisualInfo *vi, vi_templ;
XWindowAttributes xwa; XWindowAttributes xwa;
@@ -62,53 +58,96 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
glx_cx = 0; glx_cx = 0;
// Check for the presence of the GLX extension // Check for the presence of the GLX extension
if(!glXQueryExtension(display, NULL, NULL)) { if(!glXQueryExtension(display, NULL, NULL)) {
wxDebugMsg("wxGLCanvas: GLX extension is missing\n"); wxDebugMsg("wxGLCanvas: GLX extension is missing\n");
return; return;
} }
if(attrib_list) { if(attribList) {
// Get an appropriate visual int data[512], arg=0, p=0;
vi = glXChooseVisual(display, DefaultScreen(display), attrib_list);
if(!vi) return;
// Here we should make sure that vi is the same visual as the while( (attribList[arg]!=0) && (p<512) )
// one used by the xwindow drawable in wxCanvas. However, {
// there is currently no mechanism for this in wx_canvs.cc. switch( attribList[arg++] )
} else { {
// By default, we use the visual of xwindow case WX_GL_RGBA: data[p++] = GLX_RGBA; break;
XGetWindowAttributes(display, (Window) GetXWindow(), &xwa); case WX_GL_BUFFER_SIZE:
vi_templ.visualid = XVisualIDFromVisual(xwa.visual); data[p++]=GLX_BUFFER_SIZE; data[p++]=attribList[arg++]; break;
vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n); case WX_GL_LEVEL:
if(!vi) return; data[p++]=GLX_LEVEL; data[p++]=attribList[arg++]; break;
glXGetConfig(display, vi, GLX_USE_GL, &val); case WX_GL_DOUBLEBUFFER: data[p++] = GLX_DOUBLEBUFFER; break;
if(!val) return; case WX_GL_STEREO: data[p++] = GLX_STEREO; break;
// Basically, this is it. It should be possible to use vi case WX_GL_AUX_BUFFERS:
// in glXCreateContext() below. But this fails with Mesa. data[p++]=GLX_AUX_BUFFERS; data[p++]=attribList[arg++]; break;
// I notified the Mesa author about it; there may be a fix. case WX_GL_MIN_RED:
#ifdef OLD_MESA data[p++]=GLX_RED_SIZE; data[p++]=attribList[arg++]; break;
// Construct an attribute list matching the visual case WX_GL_MIN_GREEN:
int a_list[32]; data[p++]=GLX_GREEN_SIZE; data[p++]=attribList[arg++]; break;
n = 0; case WX_GL_MIN_BLUE:
if(vi->c_class==TrueColor || vi->c_class==DirectColor) { // RGBA visual data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break;
a_list[n++] = GLX_RGBA; case WX_GL_MIN_ALPHA:
a_list[n++] = GLX_RED_SIZE; data[p++]=GLX_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
a_list[n++] = bitcount(vi->red_mask); case WX_GL_DEPTH_SIZE:
a_list[n++] = GLX_GREEN_SIZE; data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break;
a_list[n++] = bitcount(vi->green_mask); case WX_GL_STENCIL_SIZE:
a_list[n++] = GLX_BLUE_SIZE; data[p++]=GLX_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
a_list[n++] = bitcount(vi->blue_mask); case WX_GL_MIN_ACCUM_RED:
glXGetConfig(display, vi, GLX_ALPHA_SIZE, &val); data[p++]=GLX_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;
a_list[n++] = GLX_ALPHA_SIZE; case WX_GL_MIN_ACCUM_GREEN:
a_list[n++] = val; data[p++]=GLX_ACCUM_GREEN_SIZE; data[p++]=attribList[arg++]; break;
} else { // Color index visual case WX_GL_MIN_ACCUM_BLUE:
glXGetConfig(display, vi, GLX_BUFFER_SIZE, &val); data[p++]=GLX_ACCUM_BLUE_SIZE; data[p++]=attribList[arg++]; break;
a_list[n++] = GLX_BUFFER_SIZE; case WX_GL_MIN_ACCUM_ALPHA:
a_list[n++] = val; data[p++]=GLX_ACCUM_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
default:
break;
} }
a_list[n] = None; }
XFree(vi); data[p] = 0;
vi = glXChooseVisual(display, DefaultScreen(display), a_list);
if(!vi) return; attribList = (int*) data;
// Get an appropriate visual
vi = glXChooseVisual(display, DefaultScreen(display), attribList);
if(!vi) return;
// Here we should make sure that vi is the same visual as the
// one used by the xwindow drawable in wxCanvas. However,
// there is currently no mechanism for this in wx_canvs.cc.
} else {
// By default, we use the visual of xwindow
// NI: is this really senseful ? opengl in e.g. color index mode ?
XGetWindowAttributes(display, (Window) GetXWindow(), &xwa);
vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
if(!vi) return;
glXGetConfig(display, vi, GLX_USE_GL, &val);
if(!val) return;
// Basically, this is it. It should be possible to use vi
// in glXCreateContext() below. But this fails with Mesa.
// I notified the Mesa author about it; there may be a fix.
#ifdef OLD_MESA
// Construct an attribute list matching the visual
int a_list[32];
n = 0;
if(vi->c_class==TrueColor || vi->c_class==DirectColor) { // RGBA visual
a_list[n++] = GLX_RGBA;
a_list[n++] = GLX_RED_SIZE;
a_list[n++] = bitcount(vi->red_mask);
a_list[n++] = GLX_GREEN_SIZE;
a_list[n++] = bitcount(vi->green_mask);
a_list[n++] = GLX_BLUE_SIZE;
a_list[n++] = bitcount(vi->blue_mask);
glXGetConfig(display, vi, GLX_ALPHA_SIZE, &val);
a_list[n++] = GLX_ALPHA_SIZE;
a_list[n++] = val;
} else { // Color index visual
glXGetConfig(display, vi, GLX_BUFFER_SIZE, &val);
a_list[n++] = GLX_BUFFER_SIZE;
a_list[n++] = val;
}
a_list[n] = None;
XFree(vi);
vi = glXChooseVisual(display, DefaultScreen(display), a_list);
if(!vi) return;
#endif /* OLD_MESA */ #endif /* OLD_MESA */
} }
@@ -142,28 +181,28 @@ void wxGLCanvas::SetColour(const char *col)
{ {
wxColour *the_colour = wxTheColourDatabase->FindColour(col); wxColour *the_colour = wxTheColourDatabase->FindColour(col);
if(the_colour) { if(the_colour) {
GLboolean b; GLboolean b;
glGetBooleanv(GL_RGBA_MODE, &b); glGetBooleanv(GL_RGBA_MODE, &b);
if(b) { if(b) {
glColor3ub(the_colour->Red(), glColor3ub(the_colour->Red(),
the_colour->Green(), the_colour->Green(),
the_colour->Blue()); the_colour->Blue());
} else { } else {
GLint pix = (GLint)the_colour->m_pixel; GLint pix = (GLint)the_colour->m_pixel;
if(pix == -1) { if(pix == -1) {
XColor exact_def; XColor exact_def;
exact_def.red = (unsigned short)the_colour->Red() << 8; exact_def.red = (unsigned short)the_colour->Red() << 8;
exact_def.green = (unsigned short)the_colour->Green() << 8; exact_def.green = (unsigned short)the_colour->Green() << 8;
exact_def.blue = (unsigned short)the_colour->Blue() << 8; exact_def.blue = (unsigned short)the_colour->Blue() << 8;
exact_def.flags = DoRed | DoGreen | DoBlue; exact_def.flags = DoRed | DoGreen | DoBlue;
if(!XAllocColor((Display*) GetXDisplay(), (Colormap) wxTheApp->GetMainColormap(GetXDisplay()), &exact_def)) { if(!XAllocColor((Display*) GetXDisplay(), (Colormap) wxTheApp->GetMainColormap(GetXDisplay()), &exact_def)) {
wxDebugMsg("wxGLCanvas: cannot allocate color\n"); wxDebugMsg("wxGLCanvas: cannot allocate color\n");
return; return;
} }
pix = the_colour->m_pixel = exact_def.pixel; pix = the_colour->m_pixel = exact_def.pixel;
} }
glIndexi(pix); glIndexi(pix);
} }
} }
} }

488
src/msw/glcanvas.cpp
View File

@@ -57,20 +57,20 @@ wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette)
wxGLContext::wxGLContext( wxGLContext::wxGLContext(
bool isRGB, wxGLCanvas *win, bool isRGB, wxGLCanvas *win,
const wxPalette& palette, const wxPalette& palette,
const wxGLContext *other /* for sharing display lists */ const wxGLContext *other /* for sharing display lists */
) )
{ {
m_window = win; m_window = win;
m_hDC = win->GetHDC(); m_hDC = win->GetHDC();
m_glContext = wglCreateContext((HDC) m_hDC); m_glContext = wglCreateContext((HDC) m_hDC);
wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") ); wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
if( other != 0 ) if( other != 0 )
wglShareLists( other->m_glContext, m_glContext ); wglShareLists( other->m_glContext, m_glContext );
wglMakeCurrent((HDC) m_hDC, m_glContext); wglMakeCurrent((HDC) m_hDC, m_glContext);
} }
wxGLContext::~wxGLContext() wxGLContext::~wxGLContext()
@@ -78,7 +78,7 @@ wxGLContext::~wxGLContext()
if (m_glContext) if (m_glContext)
{ {
wglMakeCurrent(NULL, NULL); wglMakeCurrent(NULL, NULL);
wglDeleteContext(m_glContext); wglDeleteContext(m_glContext);
} }
} }
@@ -98,10 +98,10 @@ void wxGLContext::SetCurrent()
wglMakeCurrent((HDC) m_hDC, m_glContext); wglMakeCurrent((HDC) m_hDC, m_glContext);
} }
/* /*
setupPixelFormat(hDC); setupPixelFormat(hDC);
setupPalette(hDC); setupPalette(hDC);
*/ */
} }
void wxGLContext::SetColour(const char *colour) void wxGLContext::SetColour(const char *colour)
@@ -134,25 +134,24 @@ END_EVENT_TABLE()
wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id, wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name, const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList /* not used yet! */, const wxPalette& palette): int *attribList, const wxPalette& palette) : wxScrolledWindow()
wxScrolledWindow()
{ {
m_glContext = (wxGLContext*) NULL; m_glContext = (wxGLContext*) NULL;
bool ret = Create(parent, id, pos, size, style, name); bool ret = Create(parent, id, pos, size, style, name);
if ( ret ) if ( ret )
{ {
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
} }
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND()); m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
SetupPixelFormat(); SetupPixelFormat(attribList);
SetupPalette(palette); SetupPalette(palette);
m_glContext = new wxGLContext(TRUE, this, palette); m_glContext = new wxGLContext(TRUE, this, palette);
} }
wxGLCanvas::wxGLCanvas( wxWindow *parent, wxGLCanvas::wxGLCanvas( wxWindow *parent,
@@ -161,22 +160,22 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
int *attribList, const wxPalette& palette ) int *attribList, const wxPalette& palette )
: wxScrolledWindow() : wxScrolledWindow()
{ {
m_glContext = (wxGLContext*) NULL; m_glContext = (wxGLContext*) NULL;
bool ret = Create(parent, id, pos, size, style, name); bool ret = Create(parent, id, pos, size, style, name);
if ( ret ) if ( ret )
{ {
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
} }
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND()); m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
SetupPixelFormat(); SetupPixelFormat(attribList);
SetupPalette(palette); SetupPalette(palette);
m_glContext = new wxGLContext(TRUE, this, palette, shared ); m_glContext = new wxGLContext(TRUE, this, palette, shared );
} }
// Not very useful for wxMSW, but this is to be wxGTK compliant // Not very useful for wxMSW, but this is to be wxGTK compliant
@@ -186,24 +185,24 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID i
int *attribList, const wxPalette& palette ): int *attribList, const wxPalette& palette ):
wxScrolledWindow() wxScrolledWindow()
{ {
m_glContext = (wxGLContext*) NULL; m_glContext = (wxGLContext*) NULL;
bool ret = Create(parent, id, pos, size, style, name); bool ret = Create(parent, id, pos, size, style, name);
if ( ret ) if ( ret )
{ {
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
} }
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND()); m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
SetupPixelFormat(); SetupPixelFormat(attribList);
SetupPalette(palette); SetupPalette(palette);
wxGLContext *sharedContext=0; wxGLContext *sharedContext=0;
if (shared) sharedContext=shared->GetContext(); if (shared) sharedContext=shared->GetContext();
m_glContext = new wxGLContext(TRUE, this, palette, sharedContext ); m_glContext = new wxGLContext(TRUE, this, palette, sharedContext );
} }
wxGLCanvas::~wxGLCanvas() wxGLCanvas::~wxGLCanvas()
@@ -218,157 +217,231 @@ wxGLCanvas::~wxGLCanvas()
bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name) const wxPoint& pos, const wxSize& size, long style, const wxString& name)
{ {
/* Suggestion from Kelly Brock <kbrock@8cs.com> (not yet implemented): /*
Suggestion from Kelly Brock <kbrock@8cs.com> (not yet implemented):
OpenGL corruption fix is simple assuming it doesn't screw anything else OpenGL corruption fix is simple assuming it doesn't screw anything else
up. Add the following line to the top of the create function: up. Add the following line to the top of the create function:
wxSize parentSize = GetClientSize();
All locations within the function that use 'size' are changed to
'parentSize'.
The above corrects the initial display corruption with the GeForce and
TNT2, not sure about other NVidia cards yet.
*/
static bool registeredGLCanvasClass = FALSE; wxSize parentSize = GetClientSize();
// We have to register a special window class because we need All locations within the function that use 'size' are changed to
// the CS_OWNDC style for GLCanvas. 'parentSize'.
The above corrects the initial display corruption with the GeForce and
TNT2, not sure about other NVidia cards yet.
*/
/* static bool registeredGLCanvasClass = FALSE;
From Angel Popov <jumpo@bitex.com>
Here are two snips from a dicussion in the OpenGL Gamedev list that explains // We have to register a special window class because we need
how this problem can be fixed: // the CS_OWNDC style for GLCanvas.
"There are 5 common DCs available in Win95. These are aquired when you call /*
GetDC or GetDCEx from a window that does _not_ have the OWNDC flag. From Angel Popov <jumpo@bitex.com>
OWNDC flagged windows do not get their DC from the common DC pool, the issue
is they require 800 bytes each from the limited 64Kb local heap for GDI."
"The deal is, if you hold onto one of the 5 shared DC's too long (as GL apps Here are two snips from a dicussion in the OpenGL Gamedev list that explains
do), Win95 will actually "steal" it from you. MakeCurrent fails, how this problem can be fixed:
apparently, because Windows re-assigns the HDC to a different window. The
only way to prevent this, the only reliable means, is to set CS_OWNDC."
*/
if (!registeredGLCanvasClass) "There are 5 common DCs available in Win95. These are aquired when you call
GetDC or GetDCEx from a window that does _not_ have the OWNDC flag.
OWNDC flagged windows do not get their DC from the common DC pool, the issue
is they require 800 bytes each from the limited 64Kb local heap for GDI."
"The deal is, if you hold onto one of the 5 shared DC's too long (as GL apps
do), Win95 will actually "steal" it from you. MakeCurrent fails,
apparently, because Windows re-assigns the HDC to a different window. The
only way to prevent this, the only reliable means, is to set CS_OWNDC."
*/
if (!registeredGLCanvasClass)
{
WNDCLASS wndclass;
static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC;
// the fields which are common to all classes
wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for?
wndclass.hInstance = wxhInstance;
wndclass.hIcon = (HICON) NULL;
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
wndclass.lpszMenuName = NULL;
// Register the GLCanvas class name
wndclass.hbrBackground = (HBRUSH)NULL;
wndclass.lpszClassName = wxGLCanvasClassName;
wndclass.style = styleNormal;
if ( !RegisterClass(&wndclass) )
{ {
WNDCLASS wndclass; wxLogLastError(wxT("RegisterClass(wxGLCanvasClass)"));
return FALSE;
static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC;
// the fields which are common to all classes
wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for?
wndclass.hInstance = wxhInstance;
wndclass.hIcon = (HICON) NULL;
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
wndclass.lpszMenuName = NULL;
// Register the GLCanvas class name
wndclass.hbrBackground = (HBRUSH)NULL;
wndclass.lpszClassName = wxGLCanvasClassName;
wndclass.style = styleNormal;
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(wxGLCanvasClass)"));
return FALSE;
}
registeredGLCanvasClass = TRUE;
} }
wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); registeredGLCanvasClass = TRUE;
}
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
return FALSE;
parent->AddChild(this); if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
DWORD msflags = 0; parent->AddChild(this);
if ( style & wxBORDER )
msflags |= WS_BORDER;
if ( style & wxTHICK_FRAME )
msflags |= WS_THICKFRAME;
/* DWORD msflags = 0;
A general rule with OpenGL and Win32 is that any window that will have a if ( style & wxBORDER )
HGLRC built for it must have two flags: WS_CLIPCHILDREN & WS_CLIPSIBLINGS. msflags |= WS_BORDER;
You can find references about this within the knowledge base and most OpenGL if ( style & wxTHICK_FRAME )
books that contain the wgl function descriptions. msflags |= WS_THICKFRAME;
*/
msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; /*
// if ( style & wxCLIP_CHILDREN ) A general rule with OpenGL and Win32 is that any window that will have a
// msflags |= WS_CLIPCHILDREN; HGLRC built for it must have two flags: WS_CLIPCHILDREN & WS_CLIPSIBLINGS.
msflags |= WS_CLIPCHILDREN; You can find references about this within the knowledge base and most OpenGL
books that contain the wgl function descriptions.
*/
bool want3D; msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); // if ( style & wxCLIP_CHILDREN )
// msflags |= WS_CLIPCHILDREN;
msflags |= WS_CLIPCHILDREN;
// Even with extended styles, need to combine with WS_BORDER bool want3D;
// for them to look right. WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
if ( want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) ||
(m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
{
msflags |= WS_BORDER;
}
// calculate the value to return from WM_GETDLGCODE handler // Even with extended styles, need to combine with WS_BORDER
if ( GetWindowStyleFlag() & wxWANTS_CHARS ) // for them to look right.
{ if ( want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) ||
// want everything: i.e. all keys and WM_CHAR message (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS | {
DLGC_WANTTAB | DLGC_WANTMESSAGE; msflags |= WS_BORDER;
} }
MSWCreate(m_windowId, parent, wxGLCanvasClassName, this, NULL, // calculate the value to return from WM_GETDLGCODE handler
pos.x, pos.y, if ( GetWindowStyleFlag() & wxWANTS_CHARS )
WidthDefault(size.x), HeightDefault(size.y), {
msflags, NULL, exStyle); // want everything: i.e. all keys and WM_CHAR message
m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS |
DLGC_WANTTAB | DLGC_WANTMESSAGE;
}
return TRUE; MSWCreate(m_windowId, parent, wxGLCanvasClassName, this, NULL,
pos.x, pos.y,
WidthDefault(size.x), HeightDefault(size.y),
msflags, NULL, exStyle);
return TRUE;
} }
void wxGLCanvas::SetupPixelFormat() // (HDC hDC) void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC)
{ {
PIXELFORMATDESCRIPTOR pfd = { int pixelFormat;
sizeof(PIXELFORMATDESCRIPTOR), /* size */ PIXELFORMATDESCRIPTOR pfd = {
1, /* version */ sizeof(PIXELFORMATDESCRIPTOR), /* size */
PFD_SUPPORT_OPENGL | 1, /* version */
PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL |
PFD_DOUBLEBUFFER, /* support double-buffering */ PFD_DRAW_TO_WINDOW |
PFD_TYPE_RGBA, /* color type */ PFD_DOUBLEBUFFER, /* support double-buffering */
16, /* prefered color depth */ PFD_TYPE_RGBA, /* color type */
0, 0, 0, 0, 0, 0, /* color bits (ignored) */ 16, /* prefered color depth */
0, /* no alpha buffer */ 0, 0, 0, 0, 0, 0, /* color bits (ignored) */
0, /* alpha bits (ignored) */ 0, /* no alpha buffer */
0, /* no accumulation buffer */ 0, /* alpha bits (ignored) */
0, 0, 0, 0, /* accum bits (ignored) */ 0, /* no accumulation buffer */
16, /* depth buffer */ 0, 0, 0, 0, /* accum bits (ignored) */
0, /* no stencil buffer */ 16, /* depth buffer */
0, /* no auxiliary buffers */ 0, /* no stencil buffer */
PFD_MAIN_PLANE, /* main layer */ 0, /* no auxiliary buffers */
0, /* reserved */ PFD_MAIN_PLANE, /* main layer */
0, 0, 0, /* no layer, visible, damage masks */ 0, /* reserved */
}; 0, 0, 0, /* no layer, visible, damage masks */
int pixelFormat; };
pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd); if (attribList) {
if (pixelFormat == 0) { pfd.dwFlags &= ~PFD_DOUBLEBUFFER;
MessageBox(WindowFromDC((HDC) m_hDC), wxT("ChoosePixelFormat failed."), wxT("Error"), pfd.iPixelType = PFD_TYPE_COLORINDEX;
MB_ICONERROR | MB_OK); pfd.cColorBits = 0;
exit(1); int arg=0;
}
if (SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) != TRUE) { while( (attribList[arg]!=0) )
MessageBox(WindowFromDC((HDC) m_hDC), wxT("SetPixelFormat failed."), wxT("Error"), {
MB_ICONERROR | MB_OK); switch( attribList[arg++] )
exit(1); {
case WX_GL_RGBA:
pfd.iPixelType = PFD_TYPE_RGBA;
break;
case WX_GL_BUFFER_SIZE:
pfd.cColorBits = attribList[arg++];
break;
case WX_GL_LEVEL:
// this member looks like it may be obsolete
if (attribList[arg] > 0) {
pfd.iLayerType = PFD_OVERLAY_PLANE;
} else if (attribList[arg] < 0) {
pfd.iLayerType = PFD_UNDERLAY_PLANE;
} else {
pfd.iLayerType = PFD_MAIN_PLANE;
}
arg++;
break;
case WX_GL_DOUBLEBUFFER:
pfd.dwFlags |= PFD_DOUBLEBUFFER;
break;
case WX_GL_STEREO:
pfd.dwFlags |= PFD_STEREO;
break;
case WX_GL_AUX_BUFFERS:
pfd.cAuxBuffers = attribList[arg++];
break;
case WX_GL_MIN_RED:
pfd.cColorBits += (pfd.cRedBits = attribList[arg++]);
break;
case WX_GL_MIN_GREEN:
pfd.cColorBits += (pfd.cGreenBits = attribList[arg++]);
break;
case WX_GL_MIN_BLUE:
pfd.cColorBits += (pfd.cBlueBits = attribList[arg++]);
break;
case WX_GL_MIN_ALPHA:
// doesn't count in cColorBits
pfd.cAlphaBits = attribList[arg++];
break;
case WX_GL_DEPTH_SIZE:
pfd.cDepthBits = attribList[arg++];
break;
case WX_GL_STENCIL_SIZE:
pfd.cStencilBits = attribList[arg++];
break;
case WX_GL_MIN_ACCUM_RED:
pfd.cAccumBits += (pfd.cAccumRedBits = attribList[arg++]);
break;
case WX_GL_MIN_ACCUM_GREEN:
pfd.cAccumBits += (pfd.cAccumGreenBits = attribList[arg++]);
break;
case WX_GL_MIN_ACCUM_BLUE:
pfd.cAccumBits += (pfd.cAccumBlueBits = attribList[arg++]);
break;
case WX_GL_MIN_ACCUM_ALPHA:
pfd.cAccumBits += (pfd.cAccumAlphaBits = attribList[arg++]);
break;
default:
break;
}
} }
}
pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd);
if (pixelFormat == 0) {
MessageBox(WindowFromDC((HDC) m_hDC), wxT("ChoosePixelFormat failed."), wxT("Error"),
MB_ICONERROR | MB_OK);
exit(1);
}
if (SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) != TRUE) {
MessageBox(WindowFromDC((HDC) m_hDC), wxT("SetPixelFormat failed."), wxT("Error"),
MB_ICONERROR | MB_OK);
exit(1);
}
} }
void wxGLCanvas::SetupPalette(const wxPalette& palette) void wxGLCanvas::SetupPalette(const wxPalette& palette)
@@ -408,7 +481,7 @@ wxPalette wxGLCanvas::CreateDefaultPalette()
DescribePixelFormat((HDC) m_hDC, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); DescribePixelFormat((HDC) m_hDC, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
paletteSize = 1 << pfd.cColorBits; paletteSize = 1 << pfd.cColorBits;
LOGPALETTE* pPal = LOGPALETTE* pPal =
(LOGPALETTE*) malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY)); (LOGPALETTE*) malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY));
@@ -483,30 +556,30 @@ void wxGLCanvas::SetColour(const char *colour)
// So we need wxFrame to call OnQueryNewPalette for all children... // So we need wxFrame to call OnQueryNewPalette for all children...
void wxGLCanvas::OnQueryNewPalette(wxQueryNewPaletteEvent& event) void wxGLCanvas::OnQueryNewPalette(wxQueryNewPaletteEvent& event)
{ {
/* realize palette if this is the current window */ /* realize palette if this is the current window */
if ( GetPalette()->Ok() ) { if ( GetPalette()->Ok() ) {
::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE()); ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE());
::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE); ::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
::RealizePalette((HDC) GetHDC()); ::RealizePalette((HDC) GetHDC());
Refresh(); Refresh();
event.SetPaletteRealized(TRUE); event.SetPaletteRealized(TRUE);
} }
else else
event.SetPaletteRealized(FALSE); event.SetPaletteRealized(FALSE);
} }
// I think this doesn't have to be propagated to child windows. // I think this doesn't have to be propagated to child windows.
void wxGLCanvas::OnPaletteChanged(wxPaletteChangedEvent& event) void wxGLCanvas::OnPaletteChanged(wxPaletteChangedEvent& event)
{ {
/* realize palette if this is *not* the current window */ /* realize palette if this is *not* the current window */
if ( GetPalette() && if ( GetPalette() &&
GetPalette()->Ok() && (this != event.GetChangedWindow()) ) GetPalette()->Ok() && (this != event.GetChangedWindow()) )
{ {
::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE()); ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE());
::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE); ::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
::RealizePalette((HDC) GetHDC()); ::RealizePalette((HDC) GetHDC());
Refresh(); Refresh();
} }
} }
/* Give extensions proper function names. */ /* Give extensions proper function names. */
@@ -550,15 +623,15 @@ void glIndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid
void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
{ {
#ifdef GL_EXT_vertex_array #ifdef GL_EXT_vertex_array
static PFNGLNORMALPOINTEREXTPROC proc = 0; static PFNGLNORMALPOINTEREXTPROC proc = 0;
if ( !proc ) if ( !proc )
{ {
proc = (PFNGLNORMALPOINTEREXTPROC) wglGetProcAddress("glNormalPointerEXT"); proc = (PFNGLNORMALPOINTEREXTPROC) wglGetProcAddress("glNormalPointerEXT");
} }
if ( proc ) if ( proc )
(* proc) (type, stride, count, pointer); (* proc) (type, stride, count, pointer);
#endif #endif
} }
@@ -569,15 +642,14 @@ void glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count
void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
{ {
#ifdef GL_EXT_vertex_array #ifdef GL_EXT_vertex_array
static PFNGLVERTEXPOINTEREXTPROC proc = 0; static PFNGLVERTEXPOINTEREXTPROC proc = 0;
if ( !proc ) if ( !proc )
{ {
proc = (PFNGLVERTEXPOINTEREXTPROC) wglGetProcAddress("glVertexPointerEXT"); proc = (PFNGLVERTEXPOINTEREXTPROC) wglGetProcAddress("glVertexPointerEXT");
} }
if ( proc )
if ( proc ) (* proc) (size, type, stride, count, pointer);
(* proc) (size, type, stride, count, pointer);
#endif #endif
} }