winundef.h serves for other compilators too with STL turned on.

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

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 206685f28f109329d902c23df3f43e5f1af26c4c..825c19dfc37fae30bdbb5d8ffdf39ec827cdc553 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -6,16 +6,16 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// 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
 
 #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"
 
 #include "wx/palette.h"
 #include "wx/scrolwin.h"
 


@@ -96,7 +96,7 @@ public:
         const wxPalette& palette = wxNullPalette);
 
     wxGLCanvas(wxWindow *parent,
         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,
         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 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,
         wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,