wayland: Remove non-existing gdkscreen-wayland.h from SOURCES

[~andy/gtk] / gtk / gtkwin32embedwidget.c

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 32023f98282b3f0941b59030b884537a00fdff1f..154b156ee1a8a657ad4b750fb6eb5779865d0c50 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -27,9 +27,11 @@
 
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtksizerequest.h"
 #include "gtkwin32embedwidget.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
+#include "gtkwindowprivate.h"
 
 
 static void            gtk_win32_embed_widget_realize               (GtkWidget        *widget);
@@ -82,27 +84,25 @@ gtk_win32_embed_widget_init (GtkWin32EmbedWidget *embed_widget)
 
   window = GTK_WINDOW (embed_widget);
 
-  window->type = GTK_WINDOW_TOPLEVEL;
-
   _gtk_widget_set_is_toplevel (GTK_WIDGET (embed_widget), TRUE);
   gtk_container_set_resize_mode (GTK_CONTAINER (embed_widget), GTK_RESIZE_QUEUE);
 }
 
 GtkWidget*
-_gtk_win32_embed_widget_new (GdkNativeWindow parent_id)
+_gtk_win32_embed_widget_new (HWND parent)
 {
   GtkWin32EmbedWidget *embed_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);
   
   if (!embed_widget->parent_window)
     embed_widget->parent_window =
-      gdk_window_foreign_new_for_display (gdk_display_get_default (),
-                                         parent_id);
+      gdk_win32_window_foreign_new_for_display (gdk_display_get_default (),
+                                         parent);
   
   return GTK_WIDGET (embed_widget);
 }
@@ -150,7 +150,7 @@ gtk_win32_embed_widget_window_process (HWND hwnd, UINT msg, WPARAM wparam, LPARA
   GtkWin32EmbedWidget *embed_widget;
   gpointer user_data;
 
-  window = gdk_window_lookup ((GdkNativeWindow)hwnd);
+  window = gdk_win32_window_lookup_for_display (gdk_display_get_default (), hwnd);
   if (window == NULL) {
     g_warning ("No such window!");
     return 0;
@@ -189,8 +189,7 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
       GtkRequisition requisition;
       GtkAllocation allocation = { 0, 0, 200, 200 };
 
-      gtk_size_request_get_size (GTK_SIZE_REQUEST (widget),
-                                 &requisition, NULL);
+      gtk_widget_get_preferred_size (widget, &requisition, NULL);
       if (requisition.width || requisition.height)
        {
          /* non-empty window */
@@ -209,9 +208,8 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
   gtk_widget_get_allocation (widget, &allocation);
 
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.title = window->title;
-  attributes.wmclass_name = window->wmclass_name;
-  attributes.wmclass_class = window->wmclass_class;
+  attributes.title = gtk_window_get_title (window);
+  _gtk_window_get_wmclass (window, &attributes.wmclass_name, &attributes.wmclass_class);
   attributes.width = allocation.width;
   attributes.height = allocation.height;
   attributes.wclass = GDK_INPUT_OUTPUT;
@@ -219,7 +217,6 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
   /* this isn't right - we should match our parent's visual/colormap.
    * though that will require handling "foreign" colormaps */
   attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.event_mask = gtk_widget_get_events (widget);
   attributes.event_mask |= (GDK_EXPOSURE_MASK |
                            GDK_KEY_PRESS_MASK |
@@ -229,9 +226,9 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
                            GDK_STRUCTURE_MASK |
                            GDK_FOCUS_CHANGE_MASK);
 
-  attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
-  attributes_mask |= (window->title ? GDK_WA_TITLE : 0);
-  attributes_mask |= (window->wmclass_name ? GDK_WA_WMCLASS : 0);
+  attributes_mask = GDK_WA_VISUAL;
+  attributes_mask |= (gtk_window_get_title (window) ? GDK_WA_TITLE : 0);
+  attributes_mask |= (attributes.wmclass_name ? GDK_WA_WMCLASS : 0);
 
   gdk_window = gdk_window_new (embed_widget->parent_window,
                                &attributes, attributes_mask);
@@ -247,14 +244,14 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
   styles = GetWindowLongPtr(GDK_WINDOW_HWND (gdk_window), GWL_STYLE);
   SetWindowLongPtrW(GDK_WINDOW_HWND (gdk_window), GWL_STYLE, styles | WS_TABSTOP);
 
-  gtk_widget_style_attach (widget);
-  gtk_style_set_background (gtk_widget_get_style (widget), gdk_window, GTK_STATE_NORMAL);
+  gtk_style_context_set_background (gtk_widget_get_style_context (widget),
+                                    gdk_window);
 }
 
 static void
 gtk_win32_embed_widget_show (GtkWidget *widget)
 {
-  GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
+  gtk_widget_set_visible (widget, TRUE);
   
   gtk_widget_realize (widget);
   gtk_container_check_resize (GTK_CONTAINER (widget));
@@ -264,7 +261,7 @@ gtk_win32_embed_widget_show (GtkWidget *widget)
 static void
 gtk_win32_embed_widget_hide (GtkWidget *widget)
 {
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
+  gtk_widget_set_visible (widget, FALSE);
   gtk_widget_unmap (widget);
 }
 
@@ -347,10 +344,10 @@ gtk_win32_embed_widget_focus (GtkWidget        *widget,
       if (gtk_widget_child_focus (old_focus_child, direction))
        return TRUE;
 
-      if (window->focus_widget)
+      if (gtk_window_get_focus (window))
        {
          /* Wrapped off the end, clear the focus setting for the toplevel */
-         parent = gtk_widget_get_parent (window->focus_widget);
+         parent = gtk_widget_get_parent (gtk_window_get_focus (window));
          while (parent)
            {
              gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL);