X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreawxVTKRenderWindowInteractor.cxx;fp=src%2FcreawxVTKRenderWindowInteractor.cxx;h=3c421e5f29e68a3e2b65282df94fc89408e00e87;hb=e84f23420375acf1dda8fe99cb08b1733c49b996;hp=b83bcce5c6147a0d217b64ef10809de31249c411;hpb=eec52af6f6eeb0df98651dcdafcfff5911242e92;p=crea.git

diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx
index b83bcce..3c421e5 100644
--- a/src/creawxVTKRenderWindowInteractor.cxx
+++ b/src/creawxVTKRenderWindowInteractor.cxx
@@ -88,23 +88,34 @@ 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())
@@ -376,7 +387,15 @@ long creawxVTKRenderWindowInteractor::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__