fix infinite recursion typo in operator!=() (patch 1665591)

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

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index 5e2a3f606e3376232625367cc6c6f33451d46bcc..3dfff78fa33723fa37d57602d178192c1bb29d7c 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -1,126 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#  pragma interface "glcanvas.h"
-#endif
-
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
-#include "wx/setup.h"
-
-#if wxUSE_GLCANVAS
-
-#include "wx/palette.h"
-#include "wx/scrolwin.h"
-
-#ifdef __DARWIN__
-#  include <OpenGL/gl.h>
-#  include <AGL/agl.h>
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/glcanvas.h"
 #else
-#  include <gl.h>
-#  include <agl.h>
-#endif
-
-//---------------------------------------------------------------------------
-// Constants for attriblist
-//---------------------------------------------------------------------------
-
-enum
-{
-  WX_GL_RGBA=1,          /* use true color palette */
-  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_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_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) */
-};
-
-class WXDLLEXPORT wxGLCanvas;     /* forward reference */
-
-class WXDLLEXPORT wxGLContext: public wxObject
-{
-public:
-   wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, 
-               const wxPalette& WXUNUSED(palette),
-               const wxGLContext *other        /* for sharing display lists */
-    );
-   ~wxGLContext();
-
-   void SetCurrent();
-   void Update();  // must be called after window drag/grows/zoom or clut change
-   void SetColour(const char *colour);
-   void SwapBuffers();
-
-
-   inline wxWindow* GetWindow() const { return m_window; }
-   inline AGLDrawable GetDrawable() const { return m_drawable; }
-
-public:
-   AGLContext       m_glContext;
-   AGLDrawable      m_drawable;
-   wxWindow*        m_window;
-};
-
-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
-{
-   DECLARE_CLASS(wxGLCanvas)
- public:
-   wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxString& name = "GLCanvas", int *attribList = 0, 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 );
-
-   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 = 0, const wxPalette& palette = wxNullPalette );
-
-   ~wxGLCanvas();
-
-   bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
-               const wxPoint& pos, const wxSize& size, long style, const wxString& name,
-              int *attribList, const wxPalette& palette);
-
-   void SetCurrent();
-   void SetColour(const char *colour);
-   void SwapBuffers();
-   void UpdateContext();
-   void SetViewport();
-   
-   // Unlike some other platforms, this must get called if you override it.
-   // It sets the viewport correctly and update the context.
-   // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.)
-   void OnSize(wxSizeEvent& event);
-
-   inline wxGLContext* GetContext() const { return m_glContext; }
-
-protected:
-    wxGLContext*   m_glContext;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_GLCANVAS
-#endif // _WX_GLCANVAS_H_
+#include "wx/mac/carbon/glcanvas.h"
+#endif
\ No newline at end of file