check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index 2adfbf4d6fb763d13430bd8ee7a69b9e03bd3e67..00cf0e625a5e02b2fc5e75df16b616cf7bd9c0fa 100644 (file)
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
+// Name:        wx/mac/carbon/glcanvas.h

 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,18 +12,6 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#  pragma interface "glcanvas.h"
-#endif
-
-#include "wx/setup.h"
-
-#if wxUSE_GLCANVAS
-
-#include "wx/palette.h"
-#include "wx/scrolwin.h"
-#include "wx/app.h"
-

 #ifdef __DARWIN__
 #  include <OpenGL/gl.h>
 #  include <AGL/agl.h>
 #ifdef __DARWIN__
 #  include <OpenGL/gl.h>
 #  include <AGL/agl.h>


@@ -32,103 +20,121 @@
 #  include <agl.h>
 #endif
 
 #  include <agl.h>
 #endif
 

-//---------------------------------------------------------------------------
-// Constants for attriblist
-//---------------------------------------------------------------------------
-
-enum
+class WXDLLEXPORT wxGLContext : public wxGLContextBase

 {
 {

-  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) */
-};
+public:
+    wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
+    virtual ~wxGLContext();
+
+    virtual void SetCurrent(const wxGLCanvas& win) const;
+
+    // Mac-specific
+    AGLContext GetAGLContext() const { return m_aglContext; }

 
 

-class WXDLLEXPORT wxGLCanvas;     /* forward reference */
+private:
+    AGLContext m_aglContext;

 
 

-class WXDLLEXPORT wxGLContext: public wxObject
+    DECLARE_NO_COPY_CLASS(wxGLContext)
+};
+
+class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase

 {
 public:
 {
 public:

-   wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, 
-               const wxPalette& WXUNUSED(palette),
-               const wxGLContext *other        /* for sharing display lists */
+    wxGLCanvas(wxWindow *parent,
+               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);
+
+    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);
+
+    virtual ~wxGLCanvas();
+
+    // implement wxGLCanvasBase methods
+    virtual void SwapBuffers();
+
+
+    // Mac-specific functions
+    // ----------------------
+
+    // return the pixel format used by this window
+    AGLPixelFormat GetAGLPixelFormat() const { return m_aglFormat; }
+
+    // update the view port of the current context to match this window
+    void SetViewport();
+
+
+    // deprecated methods
+    // ------------------
+
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED(
+    wxGLCanvas(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)

     );
     );

-   ~wxGLContext();

 
 

-   void SetCurrent();
-   void Update();  // must be called after window drag/grows/zoom or clut change
-   void SetColour(const wxChar *colour);
-   void SwapBuffers();
+    wxDEPRECATED(
+    wxGLCanvas(wxWindow *parent,
+               const wxGLContext *shared,
+               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)
+    );

 
 

+    wxDEPRECATED(
+    wxGLCanvas(wxWindow *parent,
+               const wxGLCanvas *shared,
+               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)
+    );
+#endif // WXWIN_COMPATIBILITY_2_8

 
 

-   inline wxWindow* GetWindow() const { return m_window; }
-   inline AGLDrawable GetDrawable() const { return m_drawable; }
+    // implementation-only from now on

 
 

-public:
-   AGLContext       m_glContext;
-   AGLDrawable      m_drawable;
-   wxWindow*        m_window;
-};
+    // 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);

 
 

-class WXDLLEXPORT wxGLCanvas: public wxWindow
-{
-   DECLARE_CLASS(wxGLCanvas)
- public:
-   wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
-   wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
-        wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), 
-          int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
-
-   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, 
-        const wxString& name = wxT("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 wxChar *colour);
-   void SwapBuffers();
-   void UpdateContext();
-   void SetViewport();
-   virtual bool Show(bool show = TRUE) ;
-   
-   // 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);
-   
-     virtual void MacSuperChangedPosition() ;
-     virtual void MacTopLevelWindowChangedPosition() ;
-    virtual void         MacVisibilityChanged() ;
-
-     void MacUpdateView() ;
-
-   inline wxGLContext* GetContext() const { return m_glContext; }
+    virtual void MacSuperChangedPosition();
+    virtual void MacTopLevelWindowChangedPosition();
+    virtual void MacVisibilityChanged();
+
+    void MacUpdateView();

 
 protected:
 
 protected:

-    wxGLContext*   m_glContext;
-       bool m_macCanvasIsShown ;
-DECLARE_EVENT_TABLE()
+    AGLPixelFormat m_aglFormat;
+
+    bool m_macCanvasIsShown,
+         m_needsUpdate;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(wxGLCanvas)

 };
 
 };
 

-#endif // wxUSE_GLCANVAS

 #endif // _WX_GLCANVAS_H_
 #endif // _WX_GLCANVAS_H_