win32: Make GtkWin32EmbedWidget use HWND instead of GdkNativeWindow

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 29550b7a8ecfa03aa908bb7d9610e19ba23946e5..008e7bd0ba2485c8879a24b218a7c41ebc94db3d 100644 (file)
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -1360,7 +1360,7 @@ pageDlgProc (HWND wnd, UINT message, WPARAM wparam, LPARAM lparam)
 
       SetWindowLongPtrW (wnd, GWLP_USERDATA, (LONG_PTR)op);
       
-      plug = _gtk_win32_embed_widget_new ((GdkNativeWindow) wnd);
+      plug = _gtk_win32_embed_widget_new (wnd);
       gtk_window_set_modal (GTK_WINDOW (plug), TRUE);
       op_win32->embed_widget = plug;
       gtk_container_add (GTK_CONTAINER (plug), op->priv->custom_widget);

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 623e8d9b3819d39cf546b1df64bdaa012f158ba1..154b156ee1a8a657ad4b750fb6eb5779865d0c50 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -89,7 +89,7 @@ gtk_win32_embed_widget_init (GtkWin32EmbedWidget *embed_widget)
 }
 
 GtkWidget*
-_gtk_win32_embed_widget_new (GdkNativeWindow parent_id)
+_gtk_win32_embed_widget_new (HWND parent)
 {
   GtkWin32EmbedWidget *embed_widget;
 
@@ -97,12 +97,12 @@ _gtk_win32_embed_widget_new (GdkNativeWindow parent_id)
   
   embed_widget->parent_window =
     gdk_win32_window_lookup_for_display (gdk_display_get_default (),
-                                        parent_id);
+                                        parent);
   
   if (!embed_widget->parent_window)
     embed_widget->parent_window =
       gdk_win32_window_foreign_new_for_display (gdk_display_get_default (),
-                                         parent_id);
+                                         parent);
   
   return GTK_WIDGET (embed_widget);
 }
@@ -150,8 +150,7 @@ gtk_win32_embed_widget_window_process (HWND hwnd, UINT msg, WPARAM wparam, LPARA
   GtkWin32EmbedWidget *embed_widget;
   gpointer user_data;
 
-  window = gdk_win32_window_lookup_for_display (gdk_display_get_default (),
-                                               (GdkNativeWindow)hwnd);
+  window = gdk_win32_window_lookup_for_display (gdk_display_get_default (), hwnd);
   if (window == NULL) {
     g_warning ("No such window!");
     return 0;

diff --git a/gtk/gtkwin32embedwidget.h b/gtk/gtkwin32embedwidget.h
index 92515cfb82baa45e15f0442d14028122c7d73b87..19ff947e8e4c0ceaeda6b77c5d3f68e07bf734c0 100644 (file)
--- a/gtk/gtkwin32embedwidget.h
+++ b/gtk/gtkwin32embedwidget.h
@@ -66,7 +66,7 @@ struct _GtkWin32EmbedWidgetClass
 
 
 GType      gtk_win32_embed_widget_get_type (void) G_GNUC_CONST;
-GtkWidget* _gtk_win32_embed_widget_new              (GdkNativeWindow  parent_id);
+GtkWidget* _gtk_win32_embed_widget_new              (HWND parent);
 BOOL       _gtk_win32_embed_widget_dialog_procedure (GtkWin32EmbedWidget *embed_widget,
                                                     HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);