Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 44cb105c93b280bb340974719b533a637d459e05..01591149b52a24f5e51e04d0ec1523c954fc4820 100644 (file)
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
+// Name:        wx/gtk/glcanvas.h

 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/8/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -39,6 +38,7 @@ public:
                 const int *attribList = NULL,
                 const wxPalette& palette = wxNullPalette);
 
                 const int *attribList = NULL,
                 const wxPalette& palette = wxNullPalette);
 

+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);

 
     // implement wxGLCanvasX11 methods
     // --------------------------------
 
     // implement wxGLCanvasX11 methods
     // --------------------------------


@@ -93,6 +93,9 @@ public:
     void OnInternalIdle();
 
     bool              m_exposed;
     void OnInternalIdle();
 
     bool              m_exposed;

+#ifdef __WXGTK3__
+    cairo_t* m_cairoPaintContext;
+#endif

 
 #if WXWIN_COMPATIBILITY_2_8
     wxGLContext      *m_sharedContext;
 
 #if WXWIN_COMPATIBILITY_2_8
     wxGLContext      *m_sharedContext;