make wxChoice and wxListBox inherit from wxControlWithItems and not wxControl for...

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

diff --git a/include/wx/cocoa/glcanvas.h b/include/wx/cocoa/glcanvas.h
index 49f6a52595958999c16db0b23d7070bbbcfbc8b2..8e20a0c4eb5f85134adfde57087d45a9f819a9bf 100644 (file)
--- a/include/wx/cocoa/glcanvas.h
+++ b/include/wx/cocoa/glcanvas.h
@@ -12,90 +12,70 @@
 #ifndef _WX_COCOA_GLCANVAS_H__
 #define _WX_COCOA_GLCANVAS_H__
 
 #ifndef _WX_COCOA_GLCANVAS_H__
 #define _WX_COCOA_GLCANVAS_H__
 

+#include "wx/window.h"
+

 // #include "wx/cocoa/NSOpenGLView.h"
 // Include gl.h from the OpenGL framework
 #include <OpenGL/gl.h>
 
 // #include "wx/cocoa/NSOpenGLView.h"
 // Include gl.h from the OpenGL framework
 #include <OpenGL/gl.h>
 

-class WXDLLIMPEXP_GL wxGLCanvas;
+class WXDLLIMPEXP_FWD_GL wxGLCanvas;

 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);

-//DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLView);
+DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLView);

 
 // ========================================================================
 // wxGLContext
 // ========================================================================
 
 // ========================================================================
 // wxGLContext
 // ========================================================================

-class WXDLLIMPEXP_GL wxGLContext: public wxObject
+
+class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase

 {
 public:
 {
 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();
+    wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);

 
 

+    virtual ~wxGLContext();

 
 

-    inline wxWindow* GetWindow() const
-    {   return m_window; }
+    virtual void SetCurrent(const wxGLCanvas& win) const;

 
 

-    inline WX_NSOpenGLContext GetNSOpenGLContext() const
-    {   return m_cocoaNSOpenGLContext; }
+    WX_NSOpenGLContext GetNSOpenGLContext() const
+        { return m_cocoaNSOpenGLContext; }

 
 

-public:
+private:

     WX_NSOpenGLContext m_cocoaNSOpenGLContext;
     WX_NSOpenGLContext m_cocoaNSOpenGLContext;

-    wxWindow*        m_window;

 };
 
 };
 

-
-

 // ========================================================================
 // wxGLCanvas
 // ========================================================================
 // ========================================================================
 // wxGLCanvas
 // ========================================================================

-class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow// , protected wxCocoaNSOpenGLView
+
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
+                             // , protected wxCocoaNSOpenGLView

 {
     DECLARE_DYNAMIC_CLASS(wxGLCanvas)
 {
     DECLARE_DYNAMIC_CLASS(wxGLCanvas)

-    DECLARE_EVENT_TABLE()

 //    WX_DECLARE_COCOA_OWNER(NSOpenGLView,NSView,NSView)
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:
 //    WX_DECLARE_COCOA_OWNER(NSOpenGLView,NSView,NSView)
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:

-    wxGLCanvas()
-    :   m_glContext(NULL)
-    { }
-    wxGLCanvas(wxWindow *parent, wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = wxGLCanvasName,
-            int *attribList = NULL, const wxPalette& palette = wxNullPalette);
-

     wxGLCanvas(wxWindow *parent,
     wxGLCanvas(wxWindow *parent,

-            const wxGLContext *shared = NULL,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = wxGLCanvasName,
-            int *attribList = NULL, const wxPalette& palette = wxNullPalette);
+               wxWindowID id = wxID_ANY,
+               const int *attribList = NULL,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxString& name = wxGLCanvasName,
+               const wxPalette& palette = wxNullPalette)
+    {
+        Create(parent, id, pos, size, style, name, attribList, palette);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxGLCanvasName,
+                const int *attribList = NULL,
+                const wxPalette& palette = wxNullPalette);

 
 

-    wxGLCanvas(wxWindow *parent,
-            const wxGLCanvas *shared = NULL,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = wxGLCanvasName,
-            int *attribList = NULL, const wxPalette& palette = wxNullPalette);
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = wxGLCanvasName);

     virtual ~wxGLCanvas();
 
 // ------------------------------------------------------------------------
     virtual ~wxGLCanvas();
 
 // ------------------------------------------------------------------------


@@ -108,16 +88,11 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // Implementation
 // ------------------------------------------------------------------------
 public:

-    void SetCurrent();
-    void SwapBuffers();
+    virtual void SwapBuffers();

 
 

-    void OnSize(wxSizeEvent& event)
-    {}
-    inline wxGLContext* GetContext() const
-    {   return m_glContext; }
-protected:
-    wxGLContext *m_glContext;
-    wxPalette m_palette;
+
+    NSOpenGLView *GetNSOpenGLView() const
+        { return (NSOpenGLView *)m_cocoaNSView; }

 };
 
 #endif //ndef _WX_COCOA_GLCANVAS_H__
 };
 
 #endif //ndef _WX_COCOA_GLCANVAS_H__