fixed warnings after GetFont prototype change

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 45962a519d019cc90c8300548372d8072c9c174d..5eb588c1173c81dbc00dbe4e542b1058972b4388 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -5,10 +5,12 @@
 
 #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(__WXX11__)
 #elif defined(__WXGTK__)
 #include "wx/gtk/glcanvas.h"
 #elif defined(__WXX11__)


@@ -17,12 +19,10 @@
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXPM__)
 #include "wx/os2/glcanvas.h"
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXPM__)
 #include "wx/os2/glcanvas.h"

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

 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"

-class WXDLLEXPORT wxGLApp : public wxApp
+class WXDLLIMPEXP_GL wxGLApp : public wxApp

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