adding measuring contexts, streamlining printing code

[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 ec86d786ca5b6b964ce7526563e2245fc5c1a695..802067a0cb4d402826c1e99ac861b6878461beee 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,7 +12,7 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_GLCANVAS
 
 
 #if wxUSE_GLCANVAS
 


@@ -57,11 +57,11 @@ class WXDLLEXPORT wxGLCanvas;     /* forward reference */
 class WXDLLEXPORT wxGLContext: public wxObject
 {
 public:
 class WXDLLEXPORT wxGLContext: public wxObject
 {
 public:

-   wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, 
+   wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win,

                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );

-   ~wxGLContext();
+   virtual ~wxGLContext();

 
    void SetCurrent();
    void Update();  // must be called after window drag/grows/zoom or clut change
 
    void SetCurrent();
    void Update();  // must be called after window drag/grows/zoom or clut change


@@ -82,19 +82,19 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
 {
    DECLARE_CLASS(wxGLCanvas)
  public:

-   wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+   wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, 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,
         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"), 
+        wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"),

           int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
 
           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, 
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,

         const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
 
         const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
 

-   ~wxGLCanvas();
+   virtual ~wxGLCanvas();

 
    bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
                const wxPoint& pos, const wxSize& size, long style, const wxString& name,
 
    bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
                const wxPoint& pos, const wxSize& size, long style, const wxString& name,


@@ -105,24 +105,24 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
    void SwapBuffers();
    void UpdateContext();
    void SetViewport();
    void SwapBuffers();
    void UpdateContext();
    void SetViewport();

-   virtual bool Show(bool show = TRUE) ;
-   
+   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);
    // 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() ;
+   virtual void MacSuperChangedPosition() ;
+   virtual void MacTopLevelWindowChangedPosition() ;
+   virtual void         MacVisibilityChanged() ;
+
+   void MacUpdateView() ;

 
    inline wxGLContext* GetContext() const { return m_glContext; }
 
 protected:
     wxGLContext*   m_glContext;
 
    inline wxGLContext* GetContext() const { return m_glContext; }
 
 protected:
     wxGLContext*   m_glContext;

-       bool m_macCanvasIsShown ;
+    bool m_macCanvasIsShown ;

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };