Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 031be9dc66b97ed0e81d3291894f24982ebe34f0..0700ed60c5688c8be4811bbf0f0471523370f30e 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
+// Name:        wx/gtk1/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,


@@ -50,7 +50,7 @@ public:
     // ------------------
 
 #if WXWIN_COMPATIBILITY_2_8
     // ------------------
 
 #if WXWIN_COMPATIBILITY_2_8

-    wxDEPRECATED(
+    wxDEPRECATED_CONSTRUCTOR(

     wxGLCanvas(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxPoint& pos = wxDefaultPosition,
     wxGLCanvas(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxPoint& pos = wxDefaultPosition,


@@ -61,7 +61,7 @@ public:
                const wxPalette& palette = wxNullPalette)
     );
 
                const wxPalette& palette = wxNullPalette)
     );
 

-    wxDEPRECATED(
+    wxDEPRECATED_CONSTRUCTOR(

     wxGLCanvas(wxWindow *parent,
                const wxGLContext *shared,
                wxWindowID id = wxID_ANY,
     wxGLCanvas(wxWindow *parent,
                const wxGLContext *shared,
                wxWindowID id = wxID_ANY,


@@ -73,7 +73,7 @@ public:
                const wxPalette& palette = wxNullPalette)
     );
 
                const wxPalette& palette = wxNullPalette)
     );
 

-    wxDEPRECATED(
+    wxDEPRECATED_CONSTRUCTOR(

     wxGLCanvas(wxWindow *parent,
                const wxGLCanvas *shared,
                wxWindowID id = wxID_ANY,
     wxGLCanvas(wxWindow *parent,
                const wxGLCanvas *shared,
                wxWindowID id = wxID_ANY,