X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/gtk/glcanvas.h?ds=sidebyside diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index fe7c581b25..30a548f8fa 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -6,16 +6,16 @@ // Created: 17/8/98 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWidgets licence +// 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/scrolwin.h" #include "wx/app.h" @@ -116,14 +116,14 @@ public: long style = 0, const wxString& name = wxGLCanvasName, 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 = wxGLCanvasName, 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,