X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fd11f09718445c5795526c393f2b2a1875f6870..d624fd67f82a90d74c7f796b241508663367134f:/utils/glcanvas/gtk/glcanvas.h?ds=sidebyside

diff --git a/utils/glcanvas/gtk/glcanvas.h b/utils/glcanvas/gtk/glcanvas.h
index fc0d51561e..b67e1ba7c8 100644
--- a/utils/glcanvas/gtk/glcanvas.h
+++ b/utils/glcanvas/gtk/glcanvas.h
@@ -94,6 +94,13 @@ private:
 class 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, 
@@ -107,8 +114,17 @@ public:
         long style = 0, const wxString& name = "GLCanvas", 
         int *attribList = (int*) NULL, 
         const wxPalette& palette = wxNullPalette );
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (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,
+   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, 
@@ -123,16 +139,19 @@ public:
    void SwapBuffers();
 
    void OnSize(wxSizeEvent& event);
+   
+   void OnInternalIdle();
 
    inline wxGLContext* GetContext() const { return m_glContext; } 
 
  // implementation
   
-    virtual GtkWidget *GetConnectWidget();
-    bool IsOwnGtkWindow( GdkWindow *window );
-  
-    wxGLContext      *m_glContext; 
+    wxGLContext      *m_glContext,
+                     *m_sharedContext;
+    wxGLCanvas       *m_sharedContextOf;
+    void             *m_vi;
     GtkWidget        *m_glWidget;
+    bool              m_exposed;
 
 private:
     DECLARE_EVENT_TABLE()