X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b3fcc0a593aabd27d9d2cde2c5e0fd65c88cc5b..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/include/wx/msw/glcanvas.h diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h index 3ae12ab890..825c19dfc3 100644 --- a/include/wx/msw/glcanvas.h +++ b/include/wx/msw/glcanvas.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/msw/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL with wxWindows under Windows +// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Windows // Author: Julian Smart // Modified by: // Created: 04/01/98 @@ -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/palette.h" #include "wx/scrolwin.h" @@ -96,7 +96,7 @@ public: const wxPalette& palette = wxNullPalette); wxGLCanvas(wxWindow *parent, - const wxGLContext *shared = (wxGLContext *) NULL, + const wxGLContext *shared, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -106,7 +106,7 @@ public: const wxPalette& palette = wxNullPalette); wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared = (wxGLCanvas *)NULL, + const wxGLCanvas *shared, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,