When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 31bf5d00c6895a3a57635e6f34b67029affc11eb..06396dc5df863d4e77cff0d947bb43cce6d5b280 100644 (file)
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -18,7 +18,7 @@
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
 // wxGLCanvas
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11

 {
 public:
     wxGLCanvas(wxWindow *parent,
 {
 public:
     wxGLCanvas(wxWindow *parent,


@@ -39,6 +39,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
     // --------------------------------


@@ -92,8 +93,10 @@ public:
     // implementation from now on
     void OnInternalIdle();
 
     // implementation from now on
     void OnInternalIdle();
 

-    GtkWidget        *m_glWidget;

     bool              m_exposed;
     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;