#3471 Doxygen OFF in CMake AND wx.h conflict

diff --git a/lib/doxygen/CMakeLists.txt b/lib/doxygen/CMakeLists.txt
index bc994736bd98ac24e3b0a1bb6592a1134bf3970f..98d9fa9f38ae19e63ae43008e5c64afec54fd18f 100644 (file)
--- a/lib/doxygen/CMakeLists.txt
+++ b/lib/doxygen/CMakeLists.txt
@@ -28,7 +28,7 @@
 MACRO(CREA_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
 
   #--------------------------------------------------------------------------
-  SET(USE_DOXYGEN ON CACHE BOOL "" FORCE)
+  SET(USE_DOXYGEN OFF CACHE BOOL "" FORCE)
   
   # Name
   SET(DOXYGEN_PROJECT_NAME "${NAME}")

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
index cc29f751a243119355aed381e2621d54c85840bb..7dea59bc1ce3c2ecdd9d9a1cb3df0b980acaf9f7 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.h
@@ -26,9 +26,18 @@
 #ifndef wxMaracasRenderImageManagementPanel_H_
 #define wxMaracasRenderImageManagementPanel_H_
 
-#include "wxMaracasRenderImageTransformation.h"
 
+
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+
+#ifndef WX_PRECOMP
 #include <wx/wx.h>
+#endif
+
+#include "wxMaracasRenderImageTransformation.h"
+
 #include "creaMaracasVisu_EXPORT.h"
 
 class creaMaracasVisu_EXPORT wxMaracasRenderImageManagementPanel : public wxDialog

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
index ad37e6c25f9cfc7ade8269f12017cccdb3950359..a59cd60b3a2c304cac4d268a4032410c9c3597eb 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
@@ -23,6 +23,12 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 #include "wxMaracasRenderImageTransformation.h"
 #include "wxMaracasRendererView.h"
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index 1098be22fb20f2e379681de9d2a96791c92a1d6d..ce9dfaa449db8a907803bbd7efa3ac9de19e57fc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -31,6 +31,10 @@
 
 =========================================================================*/
 
+#include <wx/config.h>
+#include <creaWx.h>
+#include <wx/tooltip.h>
+
 #include "wxMaracasRendererView.h"
 
 #include <wx/colordlg.h>

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 818dd321f20c67a0855deb6c488a0da2890249ee..3b33ab47ececb588fb06975a481133049413b577 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -34,9 +34,13 @@
 #ifndef __wxMaracasRendererViewPanelH__
 #define __wxMaracasRendererViewPanelH__
 
-#include <vector>
+#ifndef WX_PRECOMP
 #include <wx/wx.h>
+#endif
+
 #include "wx/aui/aui.h"
+
+#include <vector>
 #include <iostream>
 #include "marTypes.h"
 #include "vtkProp3D.h"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
index d16cff956e6c4ebb0a5305d4b9078f1ab1150aa0..7d39bdd9e5c229d5edc52171e116366edd111567 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
@@ -23,6 +23,12 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 
 #include "wxPanelCuttingImageData.h"
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
index b1e26a11a1492fe2a76bca70d0269707ac8009f2..a5c481c0d398027ec7271790ccb84e9a7a0e174a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
@@ -23,6 +23,12 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 #include "wxVTKRenderWindowInteractorEditContour.h"
 
 //---------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
index 3c46e68c78607bd799c6dafd87e582119460c42c..c6a98b02f2eac09132c16c80574cd4498b6adc01 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
@@ -26,7 +26,6 @@
 #ifndef _wxVTKRenderWindowInteractorEditContour_h_
 #define _wxVTKRenderWindowInteractorEditContour_h_
 
-
 #include <creawxVTKRenderWindowInteractor.h>
 
 #include <vtkCommand.h> 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
index b41609ebcb2fb5cc3928edadecd3cf5ef7ab158a..a9a493a503a931f3d7516e48a3715fd2d052655a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
@@ -23,6 +23,13 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
+
 #include "wxVtkClipping3DView.h"
 
 #include "wxVtkClipping3DViewCntrlPanel.h"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
index 3657b37809302427a3db06e000285a845056a804..440169159285141f13b034b85e9bf4ff2fc1aefb 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
@@ -24,6 +24,13 @@
 # ------------------------------------------------------------------------ */
 
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
+
 #include "wxVtkClipping3DViewCntrlPanel.h"
 #include "wx/colordlg.h"
 #include "vtkTriangleFilter.h"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
index 72fa34e46be890abdff977dd2a16f24434970ce8..e6636ba8dad834513e2d4bf68e5adba4b5882b92 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
@@ -27,6 +27,12 @@
 //RaC 03-2010 Divides in two panels thje last tab Surface/Volume
 //-------------------------------------------------------------------
 
+#include <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
+#include <stdlib.h>
+#include <iostream> // for std::cout
+
 #include "wxVtkClipping3DViewVolCntrlPanel.h"
 #include "wx/colordlg.h"
 #include "vtkTriangleFilter.h"