Removed conflicting wxEntry prototype

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 0a6c7291229f2815bae0e22a3f9ad49f144100cb..2ed1a201c98615537b5d91d9b95b094d941047ee 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -5,20 +5,23 @@
 
 #if wxUSE_GLCANVAS
 
 
 #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/gtk/glcanvas.h"
 #if defined(__WXMSW__)
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/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(__WXPM__)
 #include "wx/os2/glcanvas.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXPM__)
 #include "wx/os2/glcanvas.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/glcanvas.h"

 #endif
 
 #endif
 

+#include "wx/app.h"

 class WXDLLEXPORT wxGLApp : public wxApp
 {
 public:
 class WXDLLEXPORT wxGLApp : public wxApp
 {
 public: