better handling of gdkx dependency

This commit is contained in:
Simon Morlat 2014-10-27 14:51:39 +01:00
parent cd6ffc1b41
commit 9a6d848d09

View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "linphone.h"
#ifdef __linux
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#elif defined(WIN32)
#include <gdk/gdkwin32.h>
@ -95,16 +95,12 @@ static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint
}
unsigned long get_native_handle(GdkWindow *gdkw){
#ifdef __linux
#ifdef GDK_WINDOWING_X11
return (unsigned long)GDK_WINDOW_XID(gdkw);
#elif defined(WIN32)
return (unsigned long)GDK_WINDOW_HWND(gdkw);
#elif defined(__APPLE__)
# ifdef HAVE_GTK_OSX /*let's assume the use of gtk-osx implies the use of gtk-quartz.*/
return (unsigned long)gdk_quartz_window_get_nsview(gdkw);
# else
return (unsigned long)GDK_WINDOW_XID(gdkw);
# endif
return (unsigned long)gdk_quartz_window_get_nsview(gdkw);
#endif
g_warning("No way to get the native handle from gdk window");
return 0;