X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd4b14de7e0918b64ba497348c59765503666499..b377eda09d9eca8810cee1c252879bee3c9bd190:/include/wx/x11/glcanvas.h diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h index 8a409f79e4..11767987ff 100644 --- a/include/wx/x11/glcanvas.h +++ b/include/wx/x11/glcanvas.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL with wxWindows 2.0 for Motif. +// Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif. // Uses the GLX extension. // Author: Julian Smart and Wolfram Gloger // Modified by: @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "glcanvas.h" -#endif - #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ @@ -103,14 +99,14 @@ public: long style = 0, const wxString& name = wxT("GLCanvas"), int *attribList = (int*) NULL, 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, + wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,