more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 0a6c7291229f2815bae0e22a3f9ad49f144100cb..607c41232b87a23aff55134e760ce5ff5f57e1f9 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #ifndef _WX_GLCANVAS_H_BASE_
 #define _WX_GLCANVAS_H_BASE_
 


@@ -5,21 +16,26 @@
 
 #if wxUSE_GLCANVAS
 
 
 #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(__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
 

-class WXDLLEXPORT wxGLApp : public wxApp
+#include "wx/app.h"
+class WXDLLIMPEXP_GL wxGLApp : public wxApp

 {
 public:
     wxGLApp() : wxApp() { }
 {
 public:
     wxGLApp() : wxApp() { }


@@ -27,7 +43,7 @@ public:
 
     // use this in the constructor of the user-derived wxGLApp class to
     // determine if an OpenGL rendering context with these attributes
 
     // 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:
     bool InitGLVisual(int *attribList);
 
 private: