add check for wxUSE_AUTOID_MANAGEMENT being defined

[wxWidgets.git] / include / wx / palmos / glcanvas.h

diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h
index 013ee3d81d1bbffa9d907b17e0910ba897bbadc0..5b0fded577215fa045d6ce7bc3fac1a031536f3e 100644 (file)
--- a/include/wx/palmos/glcanvas.h
+++ b/include/wx/palmos/glcanvas.h
@@ -15,40 +15,11 @@
 #include "wx/palette.h"
 #include "wx/scrolwin.h"
 
 #include "wx/palette.h"
 #include "wx/scrolwin.h"
 

-#include <windows.h>
-#include "wx/msw/winundef.h"
+#include "wx/msw/wrapwin.h"

 
 #include <GL/gl.h>
 
 
 #include <GL/gl.h>
 

-//---------------------------------------------------------------------------
-// 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
 {
 
 class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {


@@ -64,7 +35,7 @@ public:
 
     void SetCurrent();
 
 
     void SetCurrent();
 

-    void SetColour(const wxChar *colour);
+    void SetColour(const wxString& colour);

 
     void SwapBuffers();
 
 
     void SwapBuffers();
 


@@ -143,13 +114,7 @@ public:
 
     void SetupPalette(const wxPalette& palette);
 
 
     void SetupPalette(const wxPalette& palette);
 

-    wxPalette CreateDefaultPalette();
-
-    inline wxPalette* GetPalette() const { return (wxPalette *) &m_palette; }
-

 protected:
 protected:

-    wxGLContext*   m_glContext;  // this is typedef-ed ptr, in fact
-    wxPalette      m_palette;

     WXHDC          m_hDC;
 
     DECLARE_EVENT_TABLE()
     WXHDC          m_hDC;
 
     DECLARE_EVENT_TABLE()