Removed previous broken fix for deferred positioning bug, and added

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index dac83974e56d9b914deba2cd541d0bb29b01a6d7..815633ff7cd78bc1c4808314abe1915ac8722067 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -5,22 +5,26 @@
 
 #if wxUSE_GLCANVAS
 
+#define wxGLCanvasName _T("GLCanvas")
+
 #if defined(__WXMSW__)
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/glcanvas.h"
+#include "wx/x11/glcanvas.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/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 WXDLLEXPORT wxGLApp : public wxApp
+class WXDLLIMPEXP_GL wxGLApp : public wxApp
 {
 public:
     wxGLApp() : wxApp() { }
@@ -28,7 +32,7 @@ public:
 
     // 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.
+    // is available - returns true if so, false if not.
     bool InitGLVisual(int *attribList);
 
 private: