add aglUpdateContext() call (doesn't seem to change anything but should be there...

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index ce59b1ad673bd11b3eebbd2ff6cc9286f2bfc850..c93bbc5706a9c0018b441f5588f01885c74325c3 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:


@@ -12,172 +12,143 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#include "wx/scrolwin.h"
-#include "wx/app.h"
-
-extern "C" {
-#include <GL/gl.h>
-#include <GL/glx.h>
-#include <GL/glu.h>
-}
-
-//---------------------------------------------------------------------------
-// Constants for attriblist
-//---------------------------------------------------------------------------
-
-enum
+extern "C"

 {
 {

-  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;
-class WXDLLEXPORT wxGLCanvas;
+    #include <GL/gl.h>
+    #include <GL/glx.h>
+    #include <GL/glu.h>
+}

 
 //---------------------------------------------------------------------------
 // wxGLContext
 //---------------------------------------------------------------------------
 
 
 
 //---------------------------------------------------------------------------
 // wxGLContext
 //---------------------------------------------------------------------------
 
 

-class WXDLLEXPORT wxGLContext: public wxObject
+class WXDLLEXPORT wxGLContext : public wxGLContextBase

 {
 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(wxWindow* win, const wxGLContext* other = NULL);

     virtual ~wxGLContext();
 
     virtual ~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;
+    virtual void SetCurrent(const wxGLCanvas& win) const;

 
 private:
 
 private:

-  DECLARE_CLASS(wxGLContext)
+    GLXContext m_glContext;
+
+    DECLARE_CLASS(wxGLContext)

 };
 
 //---------------------------------------------------------------------------
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
 };
 
 //---------------------------------------------------------------------------
 // wxGLCanvas
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGLCanvas: public wxWindow
+class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase

 {
 public:
 {
 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 = wxGLCanvasName,
-        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 = wxGLCanvasName,
-        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 = wxGLCanvasName,
-        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,
+    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 wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxGLCanvasName,

-                int *attribList = (int*) NULL,
-                const wxPalette& palette = wxNullPalette );
+                const int *attribList = NULL,
+                const wxPalette& palette = wxNullPalette);

 
 

-   virtual ~wxGLCanvas();
+    virtual ~wxGLCanvas();

 
 

-   void SetCurrent();
-   void SetColour(const wxChar *colour);
-   void SwapBuffers();

 
 

-   void OnSize(wxSizeEvent& event);
+    // implement wxGLCanvasBase methods
+    // --------------------------------

 
 

-   void OnInternalIdle();
+    virtual void SwapBuffers();

 
 

-   inline wxGLContext* GetContext() const { return m_glContext; }

 
 

- // implementation
+    // GTK-specific helpers
+    // --------------------
+
+    // return GLX version: 13 means 1.3
+    static int GetGLXVersion();
+
+
+    // deprecated methods
+    // ------------------
+
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED(
+    wxGLCanvas(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)
+    );
+
+    wxDEPRECATED(
+    wxGLCanvas(wxWindow *parent,
+               const wxGLContext *shared,
+               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)
+    );
+
+    wxDEPRECATED(
+    wxGLCanvas(wxWindow *parent,
+               const wxGLCanvas *shared,
+               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)
+    );
+
+    // called from "realized" callback to create the implicit context if needed
+    void GTKInitImplicitContext();
+#endif // WXWIN_COMPATIBILITY_2_8
+
+    // implementation from now on
+    virtual void OnInternalIdle();
+

 
 

-    wxGLContext      *m_glContext,
-                     *m_sharedContext;
-    wxGLCanvas       *m_sharedContextOf;

     void             *m_vi; // actually an XVisualInfo*
     GLXFBConfig      *m_fbc;
     bool              m_canFreeVi;
     bool              m_canFreeFBC;
     GtkWidget        *m_glWidget;
     void             *m_vi; // actually an XVisualInfo*
     GLXFBConfig      *m_fbc;
     bool              m_canFreeVi;
     bool              m_canFreeFBC;
     GtkWidget        *m_glWidget;

-    bool              m_exposed;
+
+#if WXWIN_COMPATIBILITY_2_8
+    wxGLContext      *m_sharedContext;
+    wxGLCanvas       *m_sharedContextOf;
+    const bool        m_createImplicitContext;
+#endif // WXWIN_COMPATIBILITY_2_8

 
     // returns an XVisualInfo* based on desired GL attributes;
     // returns NULL if an appropriate visual is not found. The
     // caller is reponsible for using XFree() to deallocate
     // the returned structure.
 
     // returns an XVisualInfo* based on desired GL attributes;
     // returns NULL if an appropriate visual is not found. The
     // caller is reponsible for using XFree() to deallocate
     // the returned structure.

-    static void* ChooseGLVisual(int *attribList);
-    static void* ChooseGLFBC(int *attribList);
-    static void GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList );
+    static void* ChooseGLVisual(const int *attribList);
+    static void* ChooseGLFBC(const int *attribList);
+    static void GetGLAttribListFromWX(const int *wx_attribList, int *gl_attribList );

 
 

-    static void QueryGLXVersion();
-    static int GetGLXVersion();
-    static int m_glxVersion;

 private:
 private:

-    DECLARE_EVENT_TABLE()

     DECLARE_CLASS(wxGLCanvas)
 };
 
     DECLARE_CLASS(wxGLCanvas)
 };
 

-#endif
-    // _WX_GLCANVAS_H_
+#endif // _WX_GLCANVAS_H_