X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..8084f8b7c6dd538fce55d2542e9b2e70bc69f760:/include/wx/palmos/glcanvas.h diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h index 4d89567993..5b0fded577 100644 --- a/include/wx/palmos/glcanvas.h +++ b/include/wx/palmos/glcanvas.h @@ -1,58 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/glcanvas.h // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Palm OS -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "glcanvas.h" -#endif - #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ #include "wx/palette.h" #include "wx/scrolwin.h" -#include -#include "wx/msw/winundef.h" +#include "wx/msw/wrapwin.h" #include -//--------------------------------------------------------------------------- -// 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 -{ - 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) */ -}; - -class WXDLLIMPEXP_GL wxGLCanvas; /* forward reference */ +class WXDLLIMPEXP_FWD_GL wxGLCanvas; /* forward reference */ class WXDLLIMPEXP_GL wxGLContext: public wxObject { @@ -63,12 +30,12 @@ public: const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ); - ~wxGLContext(); + virtual ~wxGLContext(); void SetCurrent(); - void SetColour(const wxChar *colour); + void SetColour(const wxString& colour); void SwapBuffers(); @@ -115,7 +82,7 @@ public: int *attribList = 0, const wxPalette& palette = wxNullPalette); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); // Replaces wxWindow::Create functionality, since // we need to use a different window class @@ -147,13 +114,7 @@ public: void SetupPalette(const wxPalette& palette); - wxPalette CreateDefaultPalette(); - - inline wxPalette* GetPalette() const { return (wxPalette *) &m_palette; } - protected: - wxGLContext* m_glContext; // this is typedef-ed ptr, in fact - wxPalette m_palette; WXHDC m_hDC; DECLARE_EVENT_TABLE()