#3374 crea Bug New Normal - vtk8itk5wx3-mingw64

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 7986404d9faaed5a4063426818f10d0c9f2ee92e..2fe84f19c5de032ecb6f420aab992205c35e4ba7 100644 (file)
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -51,6 +51,8 @@ MACRO(CREA_FIND_AND_USE_VTK)
                #MESSAGE("${GTK2_INCLUDE_DIRS}")
                INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
                LINK_LIBRARIES(${GTK2_LIBRARIES})
+message("EED CREAMacro_FindAndUseVTK.cmake  GTK2_INCLUDE_DIRS "${GTK2_INCLUDE_DIRS} )
+message("EED CREAMacro_FindAndUseVTK.cmake  GTK2_VERSION "${GTK2_VERSION} )
                # Can I require all my user to have the gl lib on linux, even if they do not really need it...
                SET(WXGLCANVASLIBS "gl")
        ENDIF(VTK_USE_GL2PS)  

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index bc07f5594fac7fd426a90e8d5fcbd64201c1e302..be117a9263ccf83b0b55ef2083d624aaa4749200 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -145,6 +145,7 @@ MACRO(CREA_USE_WXWIDGETS)
        INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
        LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
        LINK_LIBRARIES(${GTK3_LIBRARIES} )
+message("EED GTK3_VERSION "${GTK3_VERSION})
        # WX
                #    INCLUDE( ${GTK_USE_FILE} )
        INCLUDE( ${wxWidgets_USE_FILE} )

diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx
index ab565eed6bf64ca4b4435615db9b2d537585dff8..4eff58db93a11f0b7a46ca854fa32862a0a42112 100644 (file)
--- a/src/creawxVTKRenderWindowInteractor.cxx
+++ b/src/creawxVTKRenderWindowInteractor.cxx
@@ -112,7 +112,6 @@ wxWindow* wxGetTopLevelParent(wxWindow *win)
 #endif //__WXCOCOA__
 
 #if wxMAJOR_VERSION <= 2
-
        #ifdef __WXGTK__
         #include <gdk/gdkx.h> // GDK_WINDOW_XWINDOW is found here in wxWidgets 2.8.0
         #include "gdk/gdkprivate.h"