[wxVTK] wxVTK/src wxVTKRenderWindowInteractor.cxx, 1.46, 1.47 wxVTKRenderWindowInteractor.h, 1.23, 1.24

[Sander N. <svn...@us...>]

Update of /cvsroot/wxvtk/wxVTK/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19438

Modified Files:
	wxVTKRenderWindowInteractor.cxx wxVTKRenderWindowInteractor.h 
Log Message:
RenderAllowed is now a local variable
Explicit invocation of wxVTKRenderWindowInteractor::Render() is now dependent on Frozen state of wxWindow


Index: wxVTKRenderWindowInteractor.h
===================================================================
RCS file: /cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxVTKRenderWindowInteractor.h	8 Dec 2008 11:52:10 -0000	1.23
--- wxVTKRenderWindowInteractor.h	3 Mar 2009 16:20:43 -0000	1.24
***************
*** 161,165 ****
      wxTimer timer;
      int ActiveButton;
-     int RenderAllowed;
      long GetHandleHack();
      int Stereo;
--- 161,164 ----

Index: wxVTKRenderWindowInteractor.cxx
===================================================================
RCS file: /cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** wxVTKRenderWindowInteractor.cxx	8 Dec 2008 11:52:10 -0000	1.46
--- wxVTKRenderWindowInteractor.cxx	3 Mar 2009 16:20:42 -0000	1.47
***************
*** 150,154 ****
        , timer(this, ID_wxVTKRenderWindowInteractor_TIMER)
        , ActiveButton(wxEVT_NULL)
-       , RenderAllowed(0)
        , Stereo(0)
        , Handle(0)
--- 150,153 ----
***************
*** 178,182 ****
        , timer(this, ID_wxVTKRenderWindowInteractor_TIMER)
        , ActiveButton(wxEVT_NULL)
-       , RenderAllowed(0)
        , Stereo(0)
        , Handle(0)
--- 177,180 ----
***************
*** 764,769 ****
  void wxVTKRenderWindowInteractor::Render()
  {
!   RenderAllowed = 1;
!   if (!RenderWhenDisabled)
      {
      //the user doesn't want us to render when the toplevel frame
--- 762,771 ----
  void wxVTKRenderWindowInteractor::Render()
  {
! #if wxCHECK_VERSION(2, 8, 0)
!   int renderAllowed = !IsFrozen();
! #else
!   int renderAllowed = 1;
! #endif
!   if (renderAllowed && !RenderWhenDisabled)
      {
      //the user doesn't want us to render when the toplevel frame
***************
*** 773,782 ****
        {
        //if it exists, check whether it's enabled
!       //if it's not enabeld, RenderAllowed will be false
!       RenderAllowed = topParent->IsEnabled();
        }
      }
  
!   if (RenderAllowed)
      {
      if(Handle && (Handle == GetHandleHack()) )
--- 775,784 ----
        {
        //if it exists, check whether it's enabled
!       //if it's not enabeld, renderAllowed will be false
!       renderAllowed = topParent->IsEnabled();
        }
      }
  
!   if (renderAllowed)
      {
      if(Handle && (Handle == GetHandleHack()) )