wxBitmapButton doesn't need own DoGetBestSize, wxControl's one works (fixes sizing...

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 2385447aab552552e2468034820a821f5af75358..815633ff7cd78bc1c4808314abe1915ac8722067 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -1,21 +1,45 @@
 #ifndef _WX_GLCANVAS_H_BASE_
 #define _WX_GLCANVAS_H_BASE_
 
 #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__)
 #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(__WXGTK__)
 #include "wx/gtk/glcanvas.h"

-#elif defined(__WXQT__)
-#include "wx/qt/glcanvas.h"
+#elif defined(__WXX11__)
+#include "wx/x11/glcanvas.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/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(__WXPM__)
 #include "wx/os2/glcanvas.h"

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

 #endif
 
 #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_
 #endif
     // _WX_GLCANVAS_H_BASE_