Changeset 10118 for ps

Timestamp:

08/28/11 02:28:06 (13 years ago)

Author:

ben

Message:

Fixes Atlas canvas on OS X (needs to be shown before setting GL context - fixes invalid drawable error).

File:

• ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp (modified) (2 diffs)

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

@@ -491 +491 @@
     // thread that is doing the draw calls, so disable it for this one.
     wglMakeCurrent(NULL, NULL);
-#elif defined(__WXGTK__)
-    // Need to make sure the canvas is realized by GTK, so that its context is valid
+#elif defined(__WXGTK__) || defined(__WXOSX__) || defined(__WXMAC__)
+    // Need to make sure the canvas is realised, so that its context is valid
+    // this solves the "invalid drawable" error
     Show(true);
+#endif
+#ifdef __WXGTK__
+    // TODO: wxSafeYield causes issues on wxOSX 2.9, is it necessary?
     wxSafeYield();
 #endif
@@ -524 +528 @@
 
 #ifdef __WXGTK__
+    // TODO: Is this necessary?
     // HACK: because of how we fiddle with stuff earlier to make sure the canvas
     // is displayed, the layout gets messed up, and it only seems to be fixable