X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b089c5e8c8a2140258d150ca1ce42afd3b79e1b..3786c8b587f82e406ba9656847b5bff4ed9209c2:/include/wx/glcanvas.h

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 2385447aab..b4f2bac6b6 100644
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -1,21 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/glcanvas.h
+// Purpose:     wxGLCanvas base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_GLCANVAS_H_BASE_
 #define _WX_GLCANVAS_H_BASE_
 
+#include "wx/defs.h"
+
+#if wxUSE_GLCANVAS
+
+#define wxGLCanvasName _T("GLCanvas")
+
 #if defined(__WXMSW__)
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/glcanvas.h"
-#elif defined(__WXGTK__)
+#include "wx/x11/glcanvas.h"
+#elif defined(__WXGTK20__)
 #include "wx/gtk/glcanvas.h"
-#elif defined(__WXQT__)
-#include "wx/qt/glcanvas.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/glcanvas.h"
+#elif defined(__WXX11__)
+#include "wx/x11/glcanvas.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/glcanvas.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/glcanvas.h"
 #elif defined(__WXPM__)
 #include "wx/os2/glcanvas.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/glcanvas.h"
 #endif
 
+#include "wx/app.h"
+class WXDLLIMPEXP_GL wxGLApp : public wxApp
+{
+public:
+    wxGLApp() : wxApp() { }
+    virtual ~wxGLApp();
+
+    // use this in the constructor of the user-derived wxGLApp class to
+    // determine if an OpenGL rendering context with these attributes
+    // is available - returns true if so, false if not.
+    bool InitGLVisual(int *attribList);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGLApp)
+};
+
+#endif
+    // wxUSE_GLCANVAS
 #endif
     // _WX_GLCANVAS_H_BASE_