put wxUSE_DATAVIEWCTRL in alphabetical order

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 813e3147381437dd4e828f50c77d906760edbe6f..1dd103cfc1d590a6e5b222606330a3c9dd9afc8f 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,31 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Name:        wx/gtk1/glcanvas.h
+// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK

 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma interface "glcanvas.h"
-#endif
-

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

-#include <wx/defs.h>
-
-#if wxUSE_GLCANVAS
-
-#include <wx/scrolwin.h>
+#include "wx/scrolwin.h"
+#include "wx/app.h"

 
 extern "C" {
 
 extern "C" {

-#include "GL/gl.h"
-#include "GL/glx.h"
-#include "GL/glu.h"
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <GL/glu.h>

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -68,15 +61,15 @@ class WXDLLEXPORT wxGLContext: public wxObject
 {
 public:
     wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette );
 {
 public:
     wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette );

-    wxGLContext( 
-               bool WXUNUSED(isRGB), wxWindow *win, 
+    wxGLContext(
+               bool WXUNUSED(isRGB), wxWindow *win,

                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
     ~wxGLContext();
 
     void SetCurrent();
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
     ~wxGLContext();
 
     void SetCurrent();

-    void SetColour(const char *colour);
+    void SetColour(const wxChar *colour);

     void SwapBuffers();
 
     void SetupPixelFormat();
     void SwapBuffers();
 
     void SetupPixelFormat();


@@ -94,16 +87,16 @@ public:
    GtkWidget       *m_widget;
    wxPalette        m_palette;
    wxWindow*        m_window;
    GtkWidget       *m_widget;
    wxPalette        m_palette;
    wxWindow*        m_window;

-   
+

 private:
   DECLARE_CLASS(wxGLContext)
 };
 
 //---------------------------------------------------------------------------
 private:
   DECLARE_CLASS(wxGLContext)
 };
 
 //---------------------------------------------------------------------------

-// wxGLContext
+// wxGLCanvas

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

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

 {
 public:
    inline wxGLCanvas() {
 {
 public:
    inline wxGLCanvas() {


@@ -113,66 +106,78 @@ public:
       m_vi = (void*) NULL;
       m_exposed = FALSE;
    }
       m_vi = (void*) NULL;
       m_exposed = FALSE;
    }

-   wxGLCanvas( wxWindow *parent, wxWindowID id = -1, 
+   wxGLCanvas( wxWindow *parent, wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition,
         const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
-        int *attribList = (int*) NULL, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, const wxString& name = wxGLCanvasName,
+        int *attribList = (int*) NULL,

         const wxPalette& palette = wxNullPalette );
         const wxPalette& palette = wxNullPalette );

-   wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
-        wxWindowID id = -1, 
+   wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
+        wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition,
         const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
-        int *attribList = (int*) NULL, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, const wxString& name = wxGLCanvasName,
+        int *attribList = (int*) NULL,

         const wxPalette& palette = wxNullPalette );
         const wxPalette& palette = wxNullPalette );

-   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,
-        wxWindowID id = -1, 
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared,
+        wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition,
         const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
-        int *attribList = (int*) NULL, 
+        const wxSize& size = wxDefaultSize,
+        long style = 0, const wxString& name = wxGLCanvasName,
+        int *attribList = (int*) NULL,

         const wxPalette& palette = wxNullPalette );
 
         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 = "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 = wxGLCanvasName,
+                int *attribList = (int*) NULL,
+                const wxPalette& palette = wxNullPalette );
+

    ~wxGLCanvas();
 
    void SetCurrent();
    ~wxGLCanvas();
 
    void SetCurrent();

-   void SetColour(const char *colour);
+   void SetColour(const wxChar *colour);

    void SwapBuffers();
 
    void OnSize(wxSizeEvent& event);
    void SwapBuffers();
 
    void OnSize(wxSizeEvent& event);

-   
+

    void OnInternalIdle();
 
    void OnInternalIdle();
 

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

 
  // implementation
 
  // implementation

-  
+

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

-    void             *m_vi;
+    void             *m_vi; // actually an XVisualInfo*
+    GLXFBConfig      *m_fbc;
+    bool              m_canFreeVi;
+    bool              m_canFreeFBC;

     GtkWidget        *m_glWidget;
     bool              m_exposed;
 
     GtkWidget        *m_glWidget;
     bool              m_exposed;
 

+    // 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 QueryGLXVersion();
+    static int GetGLXVersion();
+    static int m_glxVersion;

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxGLCanvas)
 };
 
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxGLCanvas)
 };
 

-#endif
-    // wxUSE_GLCANVAS
-

 #endif
     // _WX_GLCANVAS_H_
 
 #endif
     // _WX_GLCANVAS_H_