Revert name change

[~andy/gtk] / gdk / gdkselection.c

diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c
index d5c1729b40f78d57badc7362157461f03159d853..0587fc75a631c2de89a41988913d376ed46d238b 100644 (file)
--- a/gdk/gdkselection.c
+++ b/gdk/gdkselection.c
@@ -1,6 +1,34 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
 #include "gdkproperty.h"
 #include "gdkdisplay.h"
 #include "gdkselection.h"
+#include "gdkalias.h"
 
 gboolean
 gdk_selection_owner_set (GdkWindow *owner,
@@ -8,7 +36,7 @@ gdk_selection_owner_set (GdkWindow *owner,
                         guint32    time,
                         gboolean   send_event)
 {
-  return gdk_selection_owner_set_for_display (gdk_get_default_display (),
+  return gdk_selection_owner_set_for_display (gdk_display_get_default (),
                                              owner, selection, 
                                              time, send_event);
 }
@@ -16,7 +44,7 @@ gdk_selection_owner_set (GdkWindow *owner,
 GdkWindow*
 gdk_selection_owner_get (GdkAtom selection)
 {
-  return gdk_selection_owner_get_for_display (gdk_get_default_display (), 
+  return gdk_selection_owner_get_for_display (gdk_display_get_default (), 
                                              selection);
 }
 
@@ -27,11 +55,22 @@ gdk_selection_send_notify (guint32  requestor,
                           GdkAtom  property,
                           guint32  time)
 {
-  gdk_selection_send_notify_for_display (gdk_get_default_display (), 
+  gdk_selection_send_notify_for_display (gdk_display_get_default (), 
                                         requestor, selection, 
                                         target, property, time);
 }
 
+gint
+gdk_text_property_to_text_list (GdkAtom       encoding,
+                               gint          format, 
+                               const guchar *text,
+                               gint          length,
+                               gchar      ***list)
+{
+  return gdk_text_property_to_text_list_for_display (gdk_display_get_default (),
+                                                    encoding, format, text, length, list);
+}
+
 /**
  * gdk_text_property_to_utf8_list:
  * @encoding: an atom representing the encoding of the text
@@ -54,10 +93,22 @@ gdk_text_property_to_utf8_list (GdkAtom        encoding,
                                gint           length,
                                gchar       ***list)
 {
-  return gdk_text_property_to_utf8_list_for_display (gdk_get_default_display (),
+  return gdk_text_property_to_utf8_list_for_display (gdk_display_get_default (),
                                                     encoding, format, text, length, list);
 }
 
+gint
+gdk_string_to_compound_text (const gchar *str,
+                            GdkAtom     *encoding,
+                            gint        *format,
+                            guchar     **ctext,
+                            gint        *length)
+{
+  return gdk_string_to_compound_text_for_display (gdk_display_get_default (),
+                                                 str, encoding, format, 
+                                                 ctext, length);
+}
+
 /**
  * gdk_utf8_to_compound_text:
  * @str:      a UTF-8 string
@@ -79,8 +130,10 @@ gdk_utf8_to_compound_text (const gchar *str,
                           guchar     **ctext,
                           gint        *length)
 {
-  return gdk_utf8_to_compound_text_for_display (gdk_get_default_display (),
+  return gdk_utf8_to_compound_text_for_display (gdk_display_get_default (),
                                                str, encoding, format, 
                                                ctext, length);
 }
 
+#define __GDK_SELECTION_C__
+#include "gdkaliasdef.c"