Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

[wxWidgets.git] / include / wx / mac / carbon / glcanvas.h

diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index 465774cba4f7eb5b16aa07b41ab60c1dc1874805..2adfbf4d6fb763d13430bd8ee7a69b9e03bd3e67 100644 (file)
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -89,12 +89,12 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = wxT("GLCanvas") , int *attribList = 0, 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 );
 
         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, wxWindowID id = -1,
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1,

         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, 
         const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
 
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, 
         const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );