[Crystal-cvs] SF.net SVN: crystal:[38214] CS/trunk/plugins/video/canvas/wxgl/GLWXDriver2D .cpp

[<ki...@us...>]

Revision: 38214
          http://crystal.svn.sourceforge.net/crystal/?rev=38214&view=rev
Author:   kickvb
Date:     2012-06-25 16:18:14 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
WXGL canvas: Manual merge of part of r36753, fixing the parenting of the wx canvas.

Revision Links:
--------------
    http://crystal.svn.sourceforge.net/crystal/?rev=36753&view=rev

Modified Paths:
--------------
    CS/trunk/plugins/video/canvas/wxgl/GLWXDriver2D.cpp

Modified: CS/trunk/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
===================================================================
--- CS/trunk/plugins/video/canvas/wxgl/GLWXDriver2D.cpp	2012-06-25 16:12:19 UTC (rev 38213)
+++ CS/trunk/plugins/video/canvas/wxgl/GLWXDriver2D.cpp	2012-06-25 16:18:14 UTC (rev 38214)
@@ -189,6 +189,7 @@
 void csGraphics2DWX::SetParent(wxWindow* wx)
 {
   myParent = wx;
+  if (myParent && theCanvas) theCanvas->Reparent(myParent);
 }
 
 wxWindow* csGraphics2DWX::GetWindow()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.