Minor changes for win32

[clg] / gdk / alien / glue.c

diff --git a/gdk/alien/glue.c b/gdk/alien/glue.c
index 6254a9491d0f90b3ff0c5183feca342fca6084cd..e734784a099936bf8187189c9bea8a55f0375af3 100644 (file)
--- a/gdk/alien/glue.c
+++ b/gdk/alien/glue.c
@@ -21,24 +21,25 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
  * 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.7 2007/06/02 19:17:47 espen Exp $ */

 
 
 #include <gdk/gdk.h>
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 
 
 #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)
 {
 
 gint clg_gdk_connection_number (GdkDisplay *display)
 {

+#ifdef GDK_WINDOWING_X11

   return ConnectionNumber (GDK_DISPLAY_XDISPLAY (display));
   return ConnectionNumber (GDK_DISPLAY_XDISPLAY (display));

-}

 #else
 #else

-gint clg_gdk_connection_number (void *display)
-{

   return -1;
   return -1;

-}

 #endif
 #endif

+}

 
 
 GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)
 
 
 GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)


@@ -54,9 +55,9 @@ GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)
   else
     return NULL;
 #elif defined (G_OS_WIN32)
   else
     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)
   if (hdc)

-    return gdk_window_lookup (hdc);
+    return gdk_window_lookup ((GdkNativeWindow)hdc);

   else
     return NULL;
 #else
   else
     return NULL;
 #else