Clearly mark wxGLCanvas as not working under wxX11.

[wxWidgets.git] / contrib / src / ogl / basic.cpp

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index b18c4ad5171b5600a201e5396026e1a627755b0f..63bbc4dfee26b0dea6a398c9dd034b8ba0c670d9 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -30,12 +30,6 @@
 #undef new
 #endif
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
@@ -607,7 +601,8 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
     return;
 
   wxShapeRegion *region = (wxShapeRegion *)node->Data();
-  region->SetText(s);
+  // region->SetText(s);  // don't set the formatted text yet, it will be done below
+  region->m_regionText = s;
   dc.SetFont(* region->GetFont());
 
   region->GetSize(&w, &h);