X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/68cbedb7d66128a4430b7c88d98f1b2a820c5499..265833ead03e4b774ceefe1688594f3b21015e22:/gdk/alien/glue.c?ds=sidebyside

diff --git a/gdk/alien/glue.c b/gdk/alien/glue.c
index 8fdaa20..b2be36c 100644
--- a/gdk/alien/glue.c
+++ b/gdk/alien/glue.c
@@ -21,24 +21,25 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: glue.c,v 1.5 2007-06-01 09:17:17 espen Exp $ */
+/* $Id: glue.c,v 1.8 2007-09-07 07:38:22 espen Exp $ */
 
 
 #include <gdk/gdk.h>
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#elif defined (G_OS_WIN32)
+#include <gdk/gdkwin32.h>
+#endif
 
 gint clg_gdk_connection_number (GdkDisplay *display)
 {
+#ifdef GDK_WINDOWING_X11
   return ConnectionNumber (GDK_DISPLAY_XDISPLAY (display));
-}
 #else
-gint clg_gdk_connection_number (void *display)
-{
   return -1;
-}
 #endif
+}
 
 
 GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)
@@ -47,16 +48,20 @@ GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)
      portable way to find the GdkWindow of a Cairo surface. */
   
 #ifdef GDK_WINDOWING_X11
+  g_return_if_fail (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_XLIB);
+  
   Display* display = cairo_xlib_surface_get_display (surface);
-  Drawable window = cairo_xlib_surface_get_drawable (surface);
-  if (display && window)
-    return gdk_window_lookup_for_display (window, display);
-  else
-    return NULL;
+  if (display) {
+    Drawable window = cairo_xlib_surface_get_drawable (surface);
+    if (window)
+      return gdk_window_lookup_for_display (window, display);
+  }
+
+  return NULL;
 #elif defined (G_OS_WIN32)
-  HDC hdc = cairo_win32_surface_get_dc (surface);
+  HDC hdc = (HDC)cairo_win32_surface_get_dc (surface);
   if (hdc)
-    return gdk_window_lookup (hdc);
+    return gdk_window_lookup ((GdkNativeWindow)hdc);
   else
     return NULL;
 #else