*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a6fa2fa15461ddcb81963db131fd8b54205bd66..96bc9457627abacef9320b0896b33759e333e78f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,14 @@ CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+IF (WIN32)
+  SET(CREA_LIB_PATH bin)
+ELSE (WIN32)
+  SET(CREA_LIB_PATH lib)
+ENDIF(WIN32)
+
+
+
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
   EXECUTABLE_OUTPUT_PATH 

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index 9489edf01c9ccc5acc4356c47c0b31320dd6535b..74a0e60ccb2cf69b80e7b4d13c5669539e776006 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,4 +1,4 @@
 SUBDIRS(creaNewProject)
 IF(WIN32)
-  SUBDIRS(creaSed)
+#  SUBDIRS(creaSed)
 ENDIF(WIN32)

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 4e08f05b476d98e6aa2dd5e5b9af6ecf4217794b..b88ef701194c425d9dd2b4f1dd48a2663c54e9da 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -274,13 +274,14 @@ MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME)
   IF(UNIX)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${EXECUTABLE_OUTPUT_REL_PATH})
+    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   ELSE(UNIX)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
       ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
-  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   
   # Invoke the advanced macro
   CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 4a2d3b2438603bca4fcc82830291c5d6377a4afa..fa78a47f8ec6150e0c59b62cdce92c78daef4bdc 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -29,7 +29,7 @@ ELSE(UNIX)
 ENDIF(UNIX)
 
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/crea)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CREA_LIB_PATH})
 
 # OPTIONAL 
 # - Set the version of your library
@@ -91,49 +91,3 @@ SET(CPACK_PACKAGE_EXECUTABLES "creaNewProject" "New project")
 
 INCLUDE(CPack)
 
-
-# Aditional INSTALL for CPACK mecanism.
-
-IF(EXWIN32)
-
-OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
-
-IF(BBTK_STANDALONE_INSTALLER)
-  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll                             DESTINATION bin/ )
-  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll                             DESTINATION bin/ )
-
-  IF(USE_VTK)
-    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
-
-    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
-    FOREACH( iLST  ${LST_FILE_VTKDLL} )
-       INSTALL( 
-         FILES ${iLST}
-         DESTINATION bin/
-       )
-    ENDFOREACH(iLST)
-  ENDIF(USE_VTK)
-    
-  IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll      DESTINATION bin/ )
-  ENDIF(USE_ITK)
-
-  IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
-  ENDIF(USE_WXWIDGETS)
-ENDIF(BBTK_STANDALONE_INSTALLER)
-
-ENDIF(EXWIN32)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67fef9b886a515b1721e20015e1f1130fd170958..27b0750eb8b647654ecef0b3c9fdb591fa437002 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,7 @@ SET( SRCS
   creaSystem
   creaMessageManager
   creaRTTI
-  wxVTKRenderWindowInteractor
+  creawxVTKRenderWindowInteractor
   creaVtkBasicSlicer
   )
 
@@ -67,5 +67,5 @@ INSTALL(
 
 INSTALL(
   TARGETS crea
-  DESTINATION lib)
+  DESTINATION ${CREA_LIB_PATH})
 #----------------------------------------------------------------------------

diff --git a/src/wxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx
similarity index 81%
rename from src/wxVTKRenderWindowInteractor.cxx
rename to src/creawxVTKRenderWindowInteractor.cxx
index e6c0161acb8b2aa16380add08289a896ac1455ec..e8206e72bba407492f56342049e375c6858b5358 100644 (file)
--- a/src/wxVTKRenderWindowInteractor.cxx
+++ b/src/creawxVTKRenderWindowInteractor.cxx
@@ -1,9 +1,9 @@
 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    $RCSfile: wxVTKRenderWindowInteractor.cxx,v $
+  Module:    $RCSfile: creawxVTKRenderWindowInteractor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/09/26 14:09:55 $
+  Date:      $Date: 2008/10/15 11:19:18 $
   Version:   $Revision: 1.1 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
@@ -16,7 +16,7 @@
 
 =========================================================================*/
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
 //This is needed for vtk 3.1 :
 #ifndef VTK_MAJOR_VERSION
@@ -82,57 +82,57 @@
 #  define WX_USE_X_CAPTURE 1
 #endif
 
-#define ID_wxVTKRenderWindowInteractor_TIMER 1001
+#define ID_creawxVTKRenderWindowInteractor_TIMER 1001
 
 namespace crea
 {
 
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-IMPLEMENT_DYNAMIC_CLASS(wxVTKRenderWindowInteractor, wxGLCanvas)
+IMPLEMENT_DYNAMIC_CLASS(creawxVTKRenderWindowInteractor, wxGLCanvas)
 #else
-IMPLEMENT_DYNAMIC_CLASS(wxVTKRenderWindowInteractor, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(creawxVTKRenderWindowInteractor, wxWindow)
 #endif  //__WXGTK__
 
 //---------------------------------------------------------------------------
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-BEGIN_EVENT_TABLE(wxVTKRenderWindowInteractor, wxGLCanvas)
+BEGIN_EVENT_TABLE(creawxVTKRenderWindowInteractor, wxGLCanvas)
 #else
-BEGIN_EVENT_TABLE(wxVTKRenderWindowInteractor, wxWindow)
+BEGIN_EVENT_TABLE(creawxVTKRenderWindowInteractor, wxWindow)
 #endif //__WXGTK__
   //refresh window by doing a Render
-  EVT_PAINT       (wxVTKRenderWindowInteractor::OnPaint)
-  EVT_ERASE_BACKGROUND(wxVTKRenderWindowInteractor::OnEraseBackground)
-  EVT_MOTION      (wxVTKRenderWindowInteractor::OnMotion)
+  EVT_PAINT       (creawxVTKRenderWindowInteractor::OnPaint)
+  EVT_ERASE_BACKGROUND(creawxVTKRenderWindowInteractor::OnEraseBackground)
+  EVT_MOTION      (creawxVTKRenderWindowInteractor::OnMotion)
 
   //Bind the events to the event converters
-  EVT_LEFT_DOWN   (wxVTKRenderWindowInteractor::OnButtonDown)
-  EVT_MIDDLE_DOWN (wxVTKRenderWindowInteractor::OnButtonDown)
-  EVT_RIGHT_DOWN  (wxVTKRenderWindowInteractor::OnButtonDown)
-  EVT_LEFT_UP     (wxVTKRenderWindowInteractor::OnButtonUp)
-  EVT_MIDDLE_UP   (wxVTKRenderWindowInteractor::OnButtonUp)
-  EVT_RIGHT_UP    (wxVTKRenderWindowInteractor::OnButtonUp)
+  EVT_LEFT_DOWN   (creawxVTKRenderWindowInteractor::OnButtonDown)
+  EVT_MIDDLE_DOWN (creawxVTKRenderWindowInteractor::OnButtonDown)
+  EVT_RIGHT_DOWN  (creawxVTKRenderWindowInteractor::OnButtonDown)
+  EVT_LEFT_UP     (creawxVTKRenderWindowInteractor::OnButtonUp)
+  EVT_MIDDLE_UP   (creawxVTKRenderWindowInteractor::OnButtonUp)
+  EVT_RIGHT_UP    (creawxVTKRenderWindowInteractor::OnButtonUp)
 #if !(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1)
-  EVT_ENTER_WINDOW(wxVTKRenderWindowInteractor::OnEnter)
-  EVT_LEAVE_WINDOW(wxVTKRenderWindowInteractor::OnLeave)
-  EVT_MOUSEWHEEL  (wxVTKRenderWindowInteractor::OnMouseWheel)
+  EVT_ENTER_WINDOW(creawxVTKRenderWindowInteractor::OnEnter)
+  EVT_LEAVE_WINDOW(creawxVTKRenderWindowInteractor::OnLeave)
+  EVT_MOUSEWHEEL  (creawxVTKRenderWindowInteractor::OnMouseWheel)
 // If we use EVT_KEY_DOWN instead of EVT_CHAR, capital versions
 // of all characters are always returned.  EVT_CHAR also performs
 // other necessary keyboard-dependent translations.
-  //EVT_KEY_DOWN    (wxVTKRenderWindowInteractor::OnKeyDown)
-  EVT_CHAR        (wxVTKRenderWindowInteractor::OnKeyDown)
-  EVT_KEY_UP      (wxVTKRenderWindowInteractor::OnKeyUp)
+  //EVT_KEY_DOWN    (creawxVTKRenderWindowInteractor::OnKeyDown)
+  EVT_CHAR        (creawxVTKRenderWindowInteractor::OnKeyDown)
+  EVT_KEY_UP      (creawxVTKRenderWindowInteractor::OnKeyUp)
 #endif
-  EVT_TIMER       (ID_wxVTKRenderWindowInteractor_TIMER, wxVTKRenderWindowInteractor::OnTimer)
-  EVT_SIZE        (wxVTKRenderWindowInteractor::OnSize)
+  EVT_TIMER       (ID_creawxVTKRenderWindowInteractor_TIMER, creawxVTKRenderWindowInteractor::OnTimer)
+  EVT_SIZE        (creawxVTKRenderWindowInteractor::OnSize)
 END_EVENT_TABLE()
 
 //---------------------------------------------------------------------------
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : vtkRenderWindowInteractor(), wxGLCanvas()
+creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : vtkRenderWindowInteractor(), wxGLCanvas()
 #else
-wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : vtkRenderWindowInteractor(), wxWindow()
+creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : vtkRenderWindowInteractor(), wxWindow()
 #endif //__WXGTK__
-      , timer(this, ID_wxVTKRenderWindowInteractor_TIMER)
+      , timer(this, ID_creawxVTKRenderWindowInteractor_TIMER)
       , ActiveButton(wxEVT_NULL)
       , RenderAllowed(0)
       , Stereo(0)
@@ -149,7 +149,7 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : vtkRenderWindowInte
   //this->SetBackgroundColour( wxColour(255,0,255) );
 }
 //---------------------------------------------------------------------------
-wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent,
+creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor(wxWindow *parent,
                                                          wxWindowID id,
                                                          const wxPoint &pos,
                                                          const wxSize &size,
@@ -160,7 +160,7 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent,
 #else
       : vtkRenderWindowInteractor(), wxWindow(parent, id, pos, size, style, name)
 #endif //__WXGTK__
-      , timer(this, ID_wxVTKRenderWindowInteractor_TIMER)
+      , timer(this, ID_creawxVTKRenderWindowInteractor_TIMER)
       , ActiveButton(wxEVT_NULL)
       , RenderAllowed(0)
       , Stereo(0)
@@ -177,20 +177,20 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent,
   // this->SetBackgroundColour( wxColour(255,0,0) );
 }
 //---------------------------------------------------------------------------
-wxVTKRenderWindowInteractor::~wxVTKRenderWindowInteractor()
+creawxVTKRenderWindowInteractor::~creawxVTKRenderWindowInteractor()
 {   
   // LG : trompe la mort !
   SetRenderWindow(NULL);
   SetReferenceCount(0);
 }
 //---------------------------------------------------------------------------
-wxVTKRenderWindowInteractor * wxVTKRenderWindowInteractor::New()
+creawxVTKRenderWindowInteractor * creawxVTKRenderWindowInteractor::New()
 {
   // we don't make use of the objectfactory, because we're not registered
-  return new wxVTKRenderWindowInteractor;
+  return new creawxVTKRenderWindowInteractor;
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Initialize()
+void creawxVTKRenderWindowInteractor::Initialize()
 {
   int *size = RenderWindow->GetSize();
   // enable everything and start rendering
@@ -205,7 +205,7 @@ void wxVTKRenderWindowInteractor::Initialize()
   Initialized = 1;
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Enable()
+void creawxVTKRenderWindowInteractor::Enable()
 {
   // if already enabled then done
   if (Enabled)
@@ -219,7 +219,7 @@ void wxVTKRenderWindowInteractor::Enable()
   Modified();
 }
 //---------------------------------------------------------------------------
-bool wxVTKRenderWindowInteractor::Enable(bool enable)
+bool creawxVTKRenderWindowInteractor::Enable(bool enable)
 {
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
   return wxGLCanvas::Enable(enable);
@@ -228,7 +228,7 @@ bool wxVTKRenderWindowInteractor::Enable(bool enable)
 #endif
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Disable()
+void creawxVTKRenderWindowInteractor::Disable()
 {
   // if already disabled then done
   if (!Enabled)
@@ -239,14 +239,14 @@ void wxVTKRenderWindowInteractor::Disable()
   Modified();
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Start()
+void creawxVTKRenderWindowInteractor::Start()
 {
   // the interactor cannot control the event loop
-  vtkErrorMacro( << "wxVTKRenderWindowInteractor::Start() "
+  vtkErrorMacro( << "creawxVTKRenderWindowInteractor::Start() "
     "interactor cannot control event loop.");
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::UpdateSize(int x, int y)
+void creawxVTKRenderWindowInteractor::UpdateSize(int x, int y)
 {
   if( RenderWindow )
   {
@@ -262,7 +262,7 @@ void wxVTKRenderWindowInteractor::UpdateSize(int x, int y)
   }
 }
 //---------------------------------------------------------------------------
-int wxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype))
+int creawxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype))
 {
   // it's a one shot timer
   if (!timer.Start(10, TRUE))
@@ -272,13 +272,13 @@ int wxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype))
   
 }
 //---------------------------------------------------------------------------
-int wxVTKRenderWindowInteractor::DestroyTimer()
+int creawxVTKRenderWindowInteractor::DestroyTimer()
 {
   // do nothing
   return 1;
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event))
+void creawxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event))
 {
   if (!Enabled)
     return;
@@ -301,7 +301,7 @@ void wxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event))
 // Anyway if this happen to break for you then compare to a recent version of wxPython
 // and look for the function long wxPyGetWinHandle(wxWindow* win)
 // in wxPython/src/helpers.cpp
-long wxVTKRenderWindowInteractor::GetHandleHack()
+long creawxVTKRenderWindowInteractor::GetHandleHack()
 {
   //helper function to hide the MSW vs GTK stuff
   long handle_tmp = 0;
@@ -339,7 +339,7 @@ long wxVTKRenderWindowInteractor::GetHandleHack()
   return handle_tmp;
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
+void creawxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 
   //must always be here
@@ -355,26 +355,26 @@ void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
 #endif //__WXMSW__
   }
   // get vtk to render to the wxWindows
-  //bbtkDebugMessage("Wx",9,"wxVTKRenderWindowInteractor::OnPaint"<<std::endl);
-  //std::cout << "wxVTKRenderWindowInteractor::OnPaint"<<std::endl;
+  //bbtkDebugMessage("Wx",9,"creawxVTKRenderWindowInteractor::OnPaint"<<std::endl);
+  //std::cout << "creawxVTKRenderWindowInteractor::OnPaint"<<std::endl;
   Render();
 
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-  //  bbtkDebugMessage("Core",9,"wxVTKRenderWindowInteractor::OnPaint   public wxGLCanvas, virtual public vtkRenderWindowInteractor  \n");
+  //  bbtkDebugMessage("Core",9,"creawxVTKRenderWindowInteractor::OnPaint   public wxGLCanvas, virtual public vtkRenderWindowInteractor  \n");
 #else
-  //  bbtkDebugMessage("Core",9,"wxVTKRenderWindowInteractor::OnPaint public wxWindow, virtual public vtkRenderWindowInteractor     \n");
+  //  bbtkDebugMessage("Core",9,"creawxVTKRenderWindowInteractor::OnPaint public wxWindow, virtual public vtkRenderWindowInteractor     \n");
 #endif //__WXGTK__
 
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event)
+void creawxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event)
 {
-  //printf("EED wxVTKRenderWindowInteractor::OnEraseBackground \n");
+  //printf("EED creawxVTKRenderWindowInteractor::OnEraseBackground \n");
   //turn off background erase to reduce flickering on MSW
   event.Skip(false);
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnSize(wxSizeEvent& WXUNUSED(event))
+void creawxVTKRenderWindowInteractor::OnSize(wxSizeEvent& WXUNUSED(event))
 {
   int w, h;
   GetClientSize(&w, &h);
@@ -392,7 +392,7 @@ void wxVTKRenderWindowInteractor::OnSize(wxSizeEvent& WXUNUSED(event))
   //Render();
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnMotion(wxMouseEvent &event)
+void creawxVTKRenderWindowInteractor::OnMotion(wxMouseEvent &event)
 {
  if (!Enabled) 
     {
@@ -411,7 +411,7 @@ void wxVTKRenderWindowInteractor::OnMotion(wxMouseEvent &event)
 }
 //---------------------------------------------------------------------------
 #if !(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1)
-void wxVTKRenderWindowInteractor::OnEnter(wxMouseEvent &event)
+void creawxVTKRenderWindowInteractor::OnEnter(wxMouseEvent &event)
 {
   if (!Enabled) 
     {
@@ -431,7 +431,7 @@ void wxVTKRenderWindowInteractor::OnEnter(wxMouseEvent &event)
 #endif
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event)
+void creawxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event)
 {
   if (!Enabled) 
     {
@@ -451,7 +451,7 @@ void wxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event)
 #endif
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event)
+void creawxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event)
 {
   if (!Enabled) 
     {
@@ -480,7 +480,7 @@ void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event)
   event.Skip();
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
+void creawxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
 {
   if (!Enabled) 
     {
@@ -508,7 +508,7 @@ void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
 }
 #endif //!(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1)
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event)
+void creawxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event)
 {
   if (!Enabled || (ActiveButton != wxEVT_NULL))
     {
@@ -564,7 +564,7 @@ void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event)
   }
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event)
+void creawxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event)
 {
   //EVT_xxx_DOWN == EVT_xxx_UP - 1
   //This is only needed if two mouse buttons are pressed at the same time.
@@ -621,7 +621,7 @@ void wxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event)
   ActiveButton = wxEVT_NULL;
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
+void creawxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
 {
 // Mouse wheel was only added after VTK 4.4 (I think...)
 #if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2)
@@ -647,7 +647,7 @@ void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
 }
 
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Render()
+void creawxVTKRenderWindowInteractor::Render()
 {
   RenderAllowed = 1;
   if (!RenderWhenDisabled)
@@ -684,7 +684,7 @@ void wxVTKRenderWindowInteractor::Render()
     }
 }
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)
+void creawxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)
 {
   //Change value of __RenderWhenDisabled ivar.
   //If __RenderWhenDisabled is false (the default), this widget will not
@@ -698,7 +698,7 @@ void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)
   //prevent re-entrancy of code) and then handling all outstanding
   //GUI events.
         
-  //However, this often triggers an OnPaint() method for wxVTKRWIs,
+  //However, this often triggers an OnPaint() method for creawxVTKRWIs,
   //resulting in a Render(), resulting in Update() being called whilst
   //still in progress.
 
@@ -709,7 +709,7 @@ void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)
 // Set the variable that indicates that we want a stereo capable window
 // be created. This method can only be called before a window is realized.
 //
-void wxVTKRenderWindowInteractor::SetStereo(int capable)
+void creawxVTKRenderWindowInteractor::SetStereo(int capable)
 {
   if (Stereo != capable)
     {
@@ -723,16 +723,16 @@ void wxVTKRenderWindowInteractor::SetStereo(int capable)
 //---------------------------------------------------------------------------
 //
 //
-void wxVTKRenderWindowInteractor::PrintSelf(ostream& os, vtkIndent indent)
+void creawxVTKRenderWindowInteractor::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
 }
 
 
 #if defined(_WIN32)
-const char * wxVTKRenderWindowInteractor::GetClassName() const
+const char * creawxVTKRenderWindowInteractor::GetClassName() const
 {
-  return "wxVTKRenderWindowInteractor";
+  return "creawxVTKRenderWindowInteractor";
 }
 #endif //_WIN32
 

diff --git a/src/wxVTKRenderWindowInteractor.h b/src/creawxVTKRenderWindowInteractor.h
similarity index 81%
rename from src/wxVTKRenderWindowInteractor.h
rename to src/creawxVTKRenderWindowInteractor.h
index 3190c8762549df8852ea9bff933eab389b31e500..ebc2030656342849c158858140e32cf9bdf3368b 100644 (file)
--- a/src/wxVTKRenderWindowInteractor.h
+++ b/src/creawxVTKRenderWindowInteractor.h
@@ -1,10 +1,10 @@
 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    $RCSfile: wxVTKRenderWindowInteractor.h,v $
+  Module:    $RCSfile: creawxVTKRenderWindowInteractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/02 12:29:45 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/10/15 11:19:18 $
+  Version:   $Revision: 1.1 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -16,12 +16,12 @@
 
 =========================================================================*/
 
-// .NAME  wxVTKRenderWindowInteractor - class to enable VTK to render to 
+// .NAME  creawxVTKRenderWindowInteractor - class to enable VTK to render to 
 // and interact with wxWindow.
 // .SECTION Description
-//  wxVTKRenderWindowInteractor provide a VTK widget for wxWindow. This class
+//  creawxVTKRenderWindowInteractor provide a VTK widget for wxWindow. This class
 // was completely rewrote to have the 'Look & Feel' of the python version:
-// wxVTKRenderWindowInteractor.py
+// creawxVTKRenderWindowInteractor.py
 // .SECTION Caveats 
 //  - There is a know bug that prevent this class to works for more info see 
 // WX_USE_X_CAPTURE. This bug only affect wxGTK from 2.3.2 to wxGTK 2.4.0.
@@ -32,10 +32,10 @@
 //  - This class might not be easily readable as it tried to work with VTK 3.2
 //  and 4.x. This class doesn't support reparenting with VTK 4.2 and earlier.
 // .SECTION see also
-// wxVTKRenderWindowInteractor.py wxVTKRenderWindow.py
+// creawxVTKRenderWindowInteractor.py creawxVTKRenderWindow.py
 
-#ifndef _wxVTKRenderWindowInteractor_h_
-#define _wxVTKRenderWindowInteractor_h_
+#ifndef _creawxVTKRenderWindowInteractor_h_
+#define _creawxVTKRenderWindowInteractor_h_
 
 #include <creaSystem.h>
 #include <creaWx.h>
@@ -76,7 +76,7 @@
 
 // Motif version (renamed into wxX11 for wxWindow 2.4 and newer)
 #if defined(__WXMOTIF__) 
-# error This GUI is not supported by wxVTKRenderWindowInteractor for now
+# error This GUI is not supported by creawxVTKRenderWindowInteractor for now
 #endif
 
 
@@ -94,32 +94,32 @@ namespace crea
 
 
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-class CREA_EXPORT wxVTKRenderWindowInteractor : public wxGLCanvas, virtual public vtkRenderWindowInteractor
+class CREA_EXPORT creawxVTKRenderWindowInteractor : public wxGLCanvas, virtual public vtkRenderWindowInteractor
 #else
-class CREA_EXPORT wxVTKRenderWindowInteractor : public wxWindow, virtual public vtkRenderWindowInteractor
+class CREA_EXPORT creawxVTKRenderWindowInteractor : public wxWindow, virtual public vtkRenderWindowInteractor
 #endif //__WXGTK__
 {
-  DECLARE_DYNAMIC_CLASS(wxVTKRenderWindowInteractor)
+  DECLARE_DYNAMIC_CLASS(creawxVTKRenderWindowInteractor)
   
   public:
     //constructors
-    wxVTKRenderWindowInteractor();
+    creawxVTKRenderWindowInteractor();
 
-    wxVTKRenderWindowInteractor(wxWindow *parent,
+    creawxVTKRenderWindowInteractor(wxWindow *parent,
                                 wxWindowID id,
                                 const wxPoint &pos = wxDefaultPosition,
                                 const wxSize &size = wxDefaultSize,
                                 long style = wxWANTS_CHARS | wxNO_FULL_REPAINT_ON_RESIZE,
                                 const wxString &name = wxPanelNameStr);
        //vtk ::New()
-    static wxVTKRenderWindowInteractor * New();
+    static creawxVTKRenderWindowInteractor * New();
     void PrintSelf(ostream& os, vtkIndent indent);
 
          //destructor
-    ~wxVTKRenderWindowInteractor();
+    ~creawxVTKRenderWindowInteractor();
 
 #if defined(_WIN32)
-    const char * wxVTKRenderWindowInteractor::GetClassName() const;
+    const char * creawxVTKRenderWindowInteractor::GetClassName() const;
 #endif //_WIN32
 
 
@@ -188,4 +188,4 @@ class CREA_EXPORT wxVTKRenderWindowInteractor : public wxWindow, virtual public
 // LG : EO namespace crea
 //======================================================================
 
-#endif //_wxVTKRenderWindowInteractor_h_
+#endif //_creawxVTKRenderWindowInteractor_h_