apptraits for wxMac classic and carbon

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

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index db2d418854467c625a99490f3049ac586d899d9f..a94814f6a69821fbca826b979d09af14731034ee 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(__APPLE__)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(__APPLE__)


@@ -69,7 +69,7 @@ public:
 
    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

-   void SetColour(const char *colour);
+   void SetColour(const wxChar *colour);

    void SwapBuffers();
 
 
    void SwapBuffers();
 
 


@@ -88,42 +88,45 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
  public:
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
  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);
+        const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);

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

 
    void SetCurrent();
 
    void SetCurrent();

-   void SetColour(const char *colour);
+   void SetColour(const wxChar *colour);

    void SwapBuffers();
    void UpdateContext();
    void SetViewport();
    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);
    
    
    // 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() ;
-        void MacUpdateView() ;
+     virtual void MacSuperChangedPosition() ;
+     virtual void MacTopLevelWindowChangedPosition() ;
+     virtual void MacSuperShown( bool show ) ;
+
+     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 ;

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };