wxUSE_XML and wxUSE_XRC build fixes if expat is not enabled

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 14c439691d668c49d431efc2ba6f27949155c982..f4c812ffa893d761b416e5b888b9d0c704bc204d 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,31 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h

-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// 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
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "glcanvas.h"
+#endif

 
 

-#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>

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


@@ -35,12 +32,21 @@ extern "C" {
 enum
 {
   WX_GL_RGBA=1,          /* use true color palette */
 enum
 {
   WX_GL_RGBA=1,          /* use true color palette */

-  WX_GL_DEPTH_SIZE,      /* bits for Z-buffer (0,16,32) */
+  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_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_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) */
-/* these are enough constants for now, the remaining will be added later */
+  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) */

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


@@ -59,15 +65,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();


@@ -85,16 +91,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() {


@@ -104,66 +110,71 @@ 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 );
    wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
         const wxPalette& palette = wxNullPalette );
    wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,

-        wxWindowID id = -1, 
+        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 );
    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,
         const wxPalette& palette = wxNullPalette );
    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,

-        wxWindowID id = -1, 
+        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*
+    bool              m_canFreeVi;

     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);
+

 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_