build fixes

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

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 11767987fffa988db511fbf3994afaa315839d72..4e20ce6a568c0856beaa78c3ba5d263d05b19f21 100644 (file)
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
+// Name:        wx/x11/glcanvas.h

 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger


@@ -7,151 +7,44 @@
 // Created:     1995, 1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Wolfram Gloger
 // Created:     1995, 1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Wolfram Gloger

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#include "wx/setup.h"
+#include "wx/unix/glx11.h"

 
 

-#if wxUSE_GLCANVAS
-
-#include "wx/gdicmn.h"
-#include "wx/palette.h"
-#include "wx/scrolwin.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 wxGLContext: public wxObject
+class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11

 {
 public:
 {
 public:

-    wxGLContext( bool isRGB, wxWindow *win, 
-        const wxPalette& palette = wxNullPalette );
-    wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, 
-        const wxPalette& WXUNUSED(palette),
-        const wxGLContext *other  /* for sharing display lists */
-        );
-    ~wxGLContext();
-    
-    void SetCurrent();
-    void SetColour(const wxChar *colour);
-    void SwapBuffers();
-    
-    void SetupPixelFormat();
-    void SetupPalette(const wxPalette& palette);
-    wxPalette CreateDefaultPalette();
-    
-    inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; }
-    inline wxWindow* GetWindow() const { return m_window; }
-    // inline GtkWidget* GetWidget() const { return m_widget; }
-    inline GLXContext GetContext() const { return m_glContext; }
-    
-public:
-    GLXContext       m_glContext;
-    
-    // GtkWidget       *m_widget;
-    wxPalette        m_palette;
-    wxWindow*        m_window;
-    
-    DECLARE_CLASS(wxGLContext)
+    wxGLCanvas(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const int *attribList = NULL,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxString& name = wxGLCanvasName,
+               const wxPalette& palette = wxNullPalette);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxGLCanvasName,
+                const int *attribList = NULL,
+                const wxPalette& palette = wxNullPalette);
+
+    // implement wxGLCanvasX11 methods
+    // --------------------------------
+
+    virtual Window GetXWindow() const;
+
+protected:
+    virtual int GetColourIndex(const wxColour& col);
+
+    DECLARE_CLASS(wxGLCanvas)

 };
 
 };
 

-
-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
-{
-public:
-    inline wxGLCanvas() {
-        m_glContext = (wxGLContext*) NULL;
-        m_sharedContext = (wxGLContext*) NULL;
-        // m_glWidget = (GtkWidget*) NULL;
-        m_vi = (void*) NULL;
-        // m_exposed = FALSE;
-    }
-    wxGLCanvas( wxWindow *parent, wxWindowID id = -1, 
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = wxT("GLCanvas"), 
-        int *attribList = (int*) NULL, 
-        const wxPalette& palette = wxNullPalette );
-    wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
-        wxWindowID id = -1, 
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = wxT("GLCanvas"), 
-        int *attribList = (int*) NULL, 
-        const wxPalette& palette = wxNullPalette );
-    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared,
-        wxWindowID id = -1, 
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = wxT("GLCanvas"), 
-        int *attribList = (int*) NULL, 
-        const wxPalette& palette = wxNullPalette );
-    
-    bool Create( wxWindow *parent, 
-        const wxGLContext *shared = (wxGLContext*)NULL,
-        const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL,
-        wxWindowID id = -1, 
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = wxT("GLCanvas"), 
-        int *attribList = (int*) NULL,
-        const wxPalette& palette = wxNullPalette );
-    
-    ~wxGLCanvas();
-    
-    void SetCurrent();
-    void SetColour(const wxChar *colour);
-    void SwapBuffers();
-    
-    // void OnSize(wxSizeEvent& event);
-    
-    // void OnInternalIdle();
-    
-    inline wxGLContext* GetContext() const { return m_glContext; } 
-    
-    // implementation
-    
-    wxGLContext      *m_glContext,
-        *m_sharedContext;
-    wxGLCanvas       *m_sharedContextOf;
-    void             *m_vi;
-    // GtkWidget        *m_glWidget;
-    // bool              m_exposed;
-    
-    DECLARE_EVENT_TABLE()
-        DECLARE_CLASS(wxGLCanvas)
-        
-};
-
-#endif
-//  wxUSE_GLCANVAS
-
-#endif
-// _WX_GLCANVAS_H_
+#endif // _WX_GLCANVAS_H_