Remove deprecated 'shadow' properties in GtkFrame and GtkHandleBox

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

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index ddfc709d54230189b2297719d9f2c2eb60b2d732..86caed4af16087e0b6343fc877271b17ae66bf51 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -29,7 +29,6 @@
 #include "gtkmarshalers.h"
 #include "gtktextbufferrichtext.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -414,7 +413,7 @@ clipboard_get_timestamp (GtkClipboard *clipboard)
   if (timestamp == GDK_CURRENT_TIME)
     {
 #ifdef GDK_WINDOWING_X11
-      timestamp = gdk_x11_get_server_time (clipboard_widget->window);
+      timestamp = gdk_x11_get_server_time (gtk_widget_get_window (clipboard_widget));
 #elif defined GDK_WINDOWING_WIN32
       timestamp = GetMessageTime ();
 #endif
@@ -1927,8 +1926,9 @@ gtk_clipboard_store_timeout (GtkClipboard *clipboard)
 /**
  * gtk_clipboard_set_can_store:
  * @clipboard: a #GtkClipboard
- * @targets: array containing information about which forms should be stored
- *           or %NULL to indicate that all forms should be stored.
+ * @targets: (allow-none): array containing information about which forms 
+ *           should be stored or %NULL to indicate that all forms should 
+ *           be stored.
  * @n_targets: number of elements in @targets
  *
  * Hints that the clipboard data should be stored somewhere when the
@@ -2025,7 +2025,7 @@ gtk_clipboard_store (GtkClipboard *clipboard)
                                                  clipboard);
 
   gdk_display_store_clipboard (clipboard->display,
-                              clipboard_widget->window,
+                               gtk_widget_get_window (clipboard_widget),
                               clipboard_get_timestamp (clipboard),
                               clipboard->storable_targets,
                               clipboard->n_storable_targets);
@@ -2081,6 +2081,3 @@ _gtk_clipboard_store_all (void)
   g_slist_free (displays);
   
 }
-
-#define __GTK_CLIPBOARD_C__
-#include "gtkaliasdef.c"