another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h
index 15f7f0dff548e0eafe4a96e61ef81635dc324942..e4e527552330a8be82fe1f84673e1826995f5fa8 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
 {


@@ -59,12 +30,12 @@ public:
         const wxPalette& WXUNUSED(palette),
         const wxGLContext *other /* for sharing display lists */ );
 
         const wxPalette& WXUNUSED(palette),
         const wxGLContext *other /* for sharing display lists */ );
 

-    ~wxGLContext();
+    virtual ~wxGLContext();

 
 
     void SetCurrent();
 
 
 
     void SetCurrent();
 

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

 
     void SwapBuffers();
 
 
     void SwapBuffers();
 


@@ -92,17 +63,17 @@ public:
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,

-        const wxGLContext *shared = (wxGLContext *) NULL,
+        const wxGLContext *shared = NULL,

         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxGLCanvasName,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxGLCanvasName,

-        int *attribList = (int *) NULL,
+        int *attribList = NULL,

         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,

-        const wxGLCanvas *shared = (wxGLCanvas *)NULL,
+        const wxGLCanvas *shared = NULL,

         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -111,7 +82,7 @@ public:
         int *attribList = 0,
         const wxPalette& palette = wxNullPalette);
 
         int *attribList = 0,
         const wxPalette& palette = wxNullPalette);
 

-    ~wxGLCanvas();
+    virtual ~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


@@ -139,17 +110,11 @@ public:
 
     inline WXHDC GetHDC() const { return m_hDC; }
 
 
     inline WXHDC GetHDC() const { return m_hDC; }
 

-    void SetupPixelFormat(int *attribList = (int *) NULL);
+    void SetupPixelFormat(int *attribList = NULL);

 
     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()