Applied patch [ 1218833 ] [wxMSW] wxListBox optimisation for XP

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

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index cc7332c5335c4ad2685d9522e70ee308b27539de..d5759175e104b86aa2a0f4e2f731d5348334a31e 100644 (file)
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -7,16 +7,16 @@
 // Created:     1995, 1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Wolfram Gloger
-// 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/setup.h"
 
 #if wxUSE_GLCANVAS
@@ -103,14 +103,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,