X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..478cde3220641d49cfbd492e799107d13ccdfeb3:/include/wx/mac/carbon/glcanvas.h diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h index 6f044609c3..2adfbf4d6f 100644 --- a/include/wx/mac/carbon/glcanvas.h +++ b/include/wx/mac/carbon/glcanvas.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL with wxWindows under Macintosh +// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 @@ -9,13 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GLCANVAS_H_ +#define _WX_GLCANVAS_H_ + #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) # pragma interface "glcanvas.h" #endif -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - #include "wx/setup.h" #if wxUSE_GLCANVAS @@ -89,12 +89,12 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow 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 = (wxGLContext *)NULL, + 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 = (wxGLCanvas *)NULL, wxWindowID id = -1, + 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 ); @@ -118,7 +118,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow virtual void MacSuperChangedPosition() ; virtual void MacTopLevelWindowChangedPosition() ; - virtual void MacSuperShown( bool show ) ; + virtual void MacVisibilityChanged() ; void MacUpdateView() ;