Many distribution things.

[wxWidgets.git] / utils / glcanvas / gtk / glcanvas.h

diff --git a/utils/glcanvas/gtk/glcanvas.h b/utils/glcanvas/gtk/glcanvas.h
index c32e176a61f2654b2cbecb872da4ddb88a72a615..837d92f3c530928d5c6515e9417922c86ff9a894 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.h
+++ b/utils/glcanvas/gtk/glcanvas.h
@@ -25,6 +25,21 @@ extern "C" {
 #include "GL/glu.h"
 }
 
 #include "GL/glu.h"
 }
 

+//---------------------------------------------------------------------------
+// Constants for attriblist
+//---------------------------------------------------------------------------
+
+enum
+{
+  WX_GL_RGBA=1,          /* use true color palette */
+  WX_GL_DEPTH_SIZE,      /* bits for Z-buffer (0,16,32) */
+  WX_GL_DOUBLEBUFFER,    /* use doublebuffer */
+  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 */
+};
+

 //---------------------------------------------------------------------------
 // classes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // classes
 //---------------------------------------------------------------------------


@@ -44,6 +59,11 @@ class 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, 
+               const wxPalette& WXUNUSED(palette),
+               const wxGLContext *other        /* for sharing display lists */
+    );

     ~wxGLContext();
 
     void SetCurrent();
     ~wxGLContext();
 
     void SetCurrent();


@@ -80,11 +100,19 @@ class wxGLCanvas: public wxScrolledWindow
    wxGLCanvas( wxWindow *parent, wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
    wxGLCanvas( wxWindow *parent, 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, wxWindowID id = -1, 
+        long style = 0, const wxString& name = "GLCanvas", 
+        int *attribList = (int*) NULL, 
+        const wxPalette& palette = wxNullPalette );
+   wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)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,
+        wxWindowID id = -1, 

         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
        long style = 0, const wxString& name = "GLCanvas", 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
        long style = 0, const wxString& name = "GLCanvas", 


@@ -103,9 +131,8 @@ class wxGLCanvas: public wxScrolledWindow
 
  // implementation
   
 
  // implementation
   

-    virtual void SetSize( int x, int y, int width, int height,
+    virtual void DoSetSize( int x, int y, int width, int height,

       int sizeFlags = wxSIZE_AUTO );
       int sizeFlags = wxSIZE_AUTO );

-    virtual void SetSize( int width, int height );

     
     virtual GtkWidget *GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     
     virtual GtkWidget *GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );