adding measuring contexts, streamlining printing code

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 607c41232b87a23aff55134e760ce5ff5f57e1f9..762665c0be9e4fc99d4c3319ad01963b83e6aebe 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -22,16 +22,16 @@
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/glcanvas.h"
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/glcanvas.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/glcanvas.h"
 #include "wx/gtk/glcanvas.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/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(__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"

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