From f4f00852f96abfadb23ba8ac122d8377a0396768 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 16 Apr 2020 10:37:44 +0200 Subject: [PATCH] #3374 crea Bug New Normal - vtk8itk5wx3-mingw64 --- cmake/CREAMacro_FindAndUseVTK.cmake | 2 ++ cmake/CREAMacro_FindAndUseWxWidgets.cmake | 1 + src/creawxVTKRenderWindowInteractor.cxx | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake index 7986404..2fe84f1 100644 --- 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 bc07f55..be117a9 100644 --- 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 ab565ee..4eff58d 100644 --- 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_WINDOW_XWINDOW is found here in wxWidgets 2.8.0 #include "gdk/gdkprivate.h" -- 2.47.1