X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..5ff14574fc48a85531252d675b1cf8cfadb65399:/include/wx/msw/glcanvas.h

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 3cad5da8ee..5c9090116c 100644
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "glcanvas.h"
-#endif
-
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
@@ -57,38 +53,32 @@ class WXDLLIMPEXP_GL wxGLCanvas;     /* forward reference */
 class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {
 public:
-    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
-
-    wxGLContext( bool isRGB, wxGLCanvas *win,
-        const wxPalette& WXUNUSED(palette),
-        const wxGLContext *other /* for sharing display lists */ );
-
-    ~wxGLContext();
-
-
-    void SetCurrent();
-
-    void SetColour(const wxChar *colour);
-
-    void SwapBuffers();
-
-
-    inline wxWindow* GetWindow() const { return m_window; }
-
-    inline WXHDC GetHDC() const { return m_hDC; }
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other=NULL /* for sharing display lists */ );
+    virtual ~wxGLContext();
 
+    void SetCurrent(const wxGLCanvas& win) const;
     inline HGLRC GetGLRC() const { return m_glContext; }
 
-public:
-    HGLRC            m_glContext;
-    WXHDC            m_hDC;
-    wxWindow*        m_window;
+protected:
+    HGLRC m_glContext;
+
+private:
+    DECLARE_CLASS(wxGLContext)
 };
 
 class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow
 {
-    DECLARE_CLASS(wxGLCanvas)
 public:
+    // This ctor is identical to the next, except for the fact that it
+    // doesn't create an implicit wxGLContext.
+    // The attribList parameter has been moved to avoid overload clashes.
+    wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
+        int* attribList = 0,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxString& name = wxGLCanvasName,
+        const wxPalette& palette = wxNullPalette);
+
     wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
@@ -96,7 +86,7 @@ public:
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
-        const wxGLContext *shared = (wxGLContext *) NULL,
+        const wxGLContext *shared,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -106,7 +96,7 @@ public:
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
-        const wxGLCanvas *shared = (wxGLCanvas *)NULL,
+        const wxGLCanvas *shared,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -115,7 +105,7 @@ public:
         int *attribList = 0,
         const wxPalette& palette = wxNullPalette);
 
-    ~wxGLCanvas();
+    virtual ~wxGLCanvas();
 
     // Replaces wxWindow::Create functionality, since
     // we need to use a different window class
@@ -123,6 +113,7 @@ public:
         const wxPoint& pos, const wxSize& size,
         long style, const wxString& name);
 
+    void SetCurrent(const wxGLContext& RC) const;
     void SetCurrent();
 
 #ifdef __WXUNIVERSAL__
@@ -156,7 +147,9 @@ protected:
     wxPalette      m_palette;
     WXHDC          m_hDC;
 
+private:
     DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(wxGLCanvas)
 };
 
 #endif