#include "gtkmarshalers.h"
#include "gtkplug.h"
#include "gtkplugprivate.h"
+#include "gtkwindowprivate.h"
#include "gtkdebug.h"
#include "win32/gdkwin32.h"
/* Start of embedding protocol */
GTK_NOTE (PLUGSOCKET, g_printerr ("start of embedding\n"));
- priv->socket_window = gdk_window_lookup_for_display (display, (GdkNativeWindow) parent);
+ priv->socket_window = gdk_win32_window_lookup_for_display (display, (GdkNativeWindow) parent);
if (priv->socket_window)
{
gpointer user_data = NULL;
}
else
{
- priv->socket_window = gdk_window_foreign_new_for_display (display, (GdkNativeWindow) parent);
+ priv->socket_window = gdk_win32_window_foreign_new_for_display (display, (GdkNativeWindow) parent);
if (!priv->socket_window) /* Already gone */
break;
}
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
#endif
+#ifdef GDK_WINDOWING_WIN32
+#include "win32/gdkwin32.h"
+#endif
/**
* SECTION:gtkplug
if (GDK_IS_X11_DISPLAY (display))
priv->socket_window = gdk_x11_window_foreign_new_for_display (display, socket_id);
#endif
+#ifdef GDK_WINDOWING_WIN32
+ if (GDK_IS_WIN32_DISPLAY (display))
+ priv->socket_window = gdk_win32_window_foreign_new_for_display (display, socket_id);
+#endif
if (priv->socket_window) {
g_signal_emit (plug, plug_signals[EMBEDDED], 0);
get_parent_hwnd (GtkWidget *widget)
{
gtk_widget_realize (widget);
- return gdk_win32_drawable_get_handle (gtk_widget_get_window (widget));
+ return gdk_win32_window_get_handle (gtk_widget_get_window (widget));
}
static void
#include "gtkwin32embedwidget.h"
#include "gtkintl.h"
#include "gtkprivate.h"
+#include "gtkwindowprivate.h"
static void gtk_win32_embed_widget_realize (GtkWidget *widget);
embed_widget = g_object_new (GTK_TYPE_WIN32_EMBED_WIDGET, NULL);
embed_widget->parent_window =
- gdk_window_lookup_for_display (gdk_display_get_default (),
- parent_id);
+ gdk_win32_window_lookup_for_display (gdk_display_get_default (),
+ parent_id);
if (!embed_widget->parent_window)
embed_widget->parent_window =
- gdk_window_foreign_new_for_display (gdk_display_get_default (),
+ gdk_win32_window_foreign_new_for_display (gdk_display_get_default (),
parent_id);
return GTK_WIDGET (embed_widget);
GtkWin32EmbedWidget *embed_widget;
gpointer user_data;
- window = gdk_window_lookup ((GdkNativeWindow)hwnd);
+ window = gdk_win32_window_lookup_for_display (gdk_display_get_default (),
+ (GdkNativeWindow)hwnd);
if (window == NULL) {
g_warning ("No such window!");
return 0;