X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVTKRenderWindowInteractor.cxx;h=e7aa85e32a8fcf79c6917e8c3e7a08f8a4e6d830;hb=c5bb8b228d6fcd2a4ea1d6210bfa3a39d6bcac33;hp=cd205a40428def0a7638f32cb9825deb89bcf72d;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
index cd205a4..e7aa85e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
@@ -82,23 +82,37 @@ wxWindow* wxGetTopLevelParent(wxWindow *win)
 #endif //VTK_USE_COCOA
 #endif //__WXCOCOA__
 
-#ifdef __WXGTK__
-#    include <gdk/gdkx.h> // GDK_WINDOW_XWINDOW is found here in wxWidgets 2.8.0
-#    include "gdk/gdkprivate.h"
-#if wxCHECK_VERSION(2, 8, 0)
-#ifdef __WXGTK20__
-#include <wx/gtk/win_gtk.h>
-#else
-#include <wx/gtk1/win_gtk.h>
-#endif
+
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#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"
+		#if wxCHECK_VERSION(2, 8, 0)
+			#ifdef __WXGTK20__
+				#include <wx/gtk/win_gtk.h>
+			#else
+				#include <wx/gtk1/win_gtk.h>
+			#endif
+		#else
+			#include <wx/gtk/win_gtk.h>
+		#endif
+		#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
+				          GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \
+				          GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
+	#endif
 #else
-#include <wx/gtk/win_gtk.h>
-#endif
-#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
-                          GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \
-                          GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
+	#ifdef __WXGTK__
+	    #include <gdk/gdkx.h>
+	    #include <gtk/gtk.h>
+	#endif
 #endif
 
+
+
+
+
 #ifdef __WXX11__
 #include "wx/x11/privx.h"
 #define GetXWindow(wxwin)   ((Window)(wxwin)->GetHandle())
@@ -366,7 +380,15 @@ long wxVTKRenderWindowInteractor::GetHandleHack()
 
     // Find and return the actual X-Window.
 #if defined(__WXGTK__) || defined(__WXX11__)
-    return (long)GetXWindow(this);
+
+	//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+	#if wxMAJOR_VERSION <= 2
+		return (long)GetXWindow(this);
+	#else
+		GdkWindow* Win = gtk_widget_get_window( (GtkWidget *) GetHandle() );
+		return (long int)GDK_WINDOW_XDISPLAY(Win);
+	#endif
+
 #endif
 
 //#ifdef __WXMOTIF__