[wxVTK] wxVTK/src wxVTKRenderWindowInteractor.cxx,1.50,1.51

[Mathieu M. <ma...@us...>]

Update of /cvsroot/wxvtk/wxVTK/src
In directory vz-cvs-4.sog:/tmp/cvs-serv30154

Modified Files:
	wxVTKRenderWindowInteractor.cxx 
Log Message:
Include patch from Tim Hutton/Andrew Trevorrow. Posted on the mailing list.

Index: wxVTKRenderWindowInteractor.cxx
===================================================================
RCS file: /cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** wxVTKRenderWindowInteractor.cxx	2 Dec 2011 17:43:20 -0000	1.50
--- wxVTKRenderWindowInteractor.cxx	2 Dec 2011 17:46:56 -0000	1.51
***************
*** 33,36 ****
--- 33,41 ----
  #include "vtkDebugLeaks.h"
  
+ // AKT: wxOSX 2.9.x defines __WXOSX_COCOA__ rather than __WXCOCOA__
+ #ifdef __WXOSX_COCOA__
+ #define __WXCOCOA__
+ #endif
+ 
  #ifdef __WXMAC__
  #ifdef __WXCOCOA__
***************
*** 366,374 ****
  #ifdef __WXCOCOA__
     // Here is how to find the NSWindow
!    wxTopLevelWindow* toplevel = dynamic_cast<wxTopLevelWindow*>(
!      wxGetTopLevelParent( this ) );
!    if (toplevel != NULL )    
     {
!      handle_tmp = (long)toplevel->GetNSWindow();
     }
     // The NSView will be deducted from 
--- 371,383 ----
  #ifdef __WXCOCOA__
     // Here is how to find the NSWindow
!    wxTopLevelWindow* toplevel = dynamic_cast<wxTopLevelWindow*>(wxGetTopLevelParent( this ) );
!    if (toplevel != NULL )
     {
!     // AKT: use new Cocoa code if wxOSX 2.9.x
! #if wxCHECK_VERSION(2, 9, 0)
!     handle_tmp = (long)toplevel->GetWXWindow();
! #else
!     handle_tmp = (long)toplevel->GetNSWindow();
! #endif
     }
     // The NSView will be deducted from