Remove unused functions in W32 backend

diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index 499f287670ba11dfff9337a281b64f4220eae178..847c118c157afec5fbcee36458f892b8fb9c1b25 100644 (file)
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -2736,109 +2736,6 @@ _gdk_win32_transmute_contentformat (const gchar   *from_contentformat,
   return TRUE;
 }
 
-static GdkAtom
-convert_clipboard_selection_to_targets_target (GdkSurface *requestor)
-{
-  int i;
-  int format_count = CountClipboardFormats ();
-  GArray *targets = g_array_sized_new (FALSE, FALSE, sizeof (GdkWin32ContentFormatPair), format_count);
-/* FIXME: REMOVE ALL THAT STUFF
-  for (fmt = 0; 0 != (fmt = EnumClipboardFormats (fmt)); )
-    _gdk_win32_add_format_to_targets (fmt, targets, NULL);
-*/
-  GDK_NOTE (DND, {
-      g_print ("... ");
-      for (i = 0; i < targets->len; i++)
-        {
-          const char *atom_name = (const char *)g_array_index (targets, GdkWin32ContentFormatPair, i).contentformat;
-
-          g_print ("%s", atom_name);
-          if (i < targets->len - 1)
-            g_print (", ");
-        }
-      g_print ("\n");
-    });
-
-  if (targets->len > 0)
-    {
-      gint len = targets->len;
-      GdkAtom *targets_only = g_new0 (GdkAtom, len);
-
-      for (i = 0; i < targets->len; i++)
-        targets_only[i] = g_array_index (targets, GdkWin32ContentFormatPair, i).contentformat;
-
-      g_array_free (targets, TRUE);
-/* FIXME: REMOVE ALL THAT STUFF
-      selection_property_store (requestor, GDK_SELECTION_TYPE_ATOM,
-                                32, (guchar *) targets_only,
-                                len * sizeof (GdkAtom));
-*/
-      return _gdk_win32_clipdrop_atom (GDK_WIN32_ATOM_INDEX_GDK_SELECTION);
-    }
-  else
-    {
-      g_array_free (targets, TRUE);
-      return NULL;
-    }
-}
-
-/* It's hard to say whether implementing this actually is of any use
- * on the Win32 platform? gtk calls only
- * gdk_text_property_to_utf8_list_for_display().
- */
-gint
-gdk_text_property_to_text_list_for_display (GdkDisplay   *display,
-                                           GdkAtom       encoding,
-                                           gint          format,
-                                           const guchar *text,
-                                           gint          length,
-                                           gchar      ***list)
-{
-  gchar *result;
-  const gchar *charset;
-  gchar *source_charset;
-
-  GDK_NOTE (DND, {
-      const char *enc_name = (const char *)encoding;
-
-      g_print ("gdk_text_property_to_text_list_for_display: %s %d %.20s %d\n",
-              enc_name, format, text, length);
-    });
-
-  if (!list)
-    return 0;
-
-  if (encoding == g_intern_static_string ("STRING"))
-    source_charset = g_strdup ("ISO-8859-1");
-  else if (encoding == _gdk_win32_clipdrop_atom (GDK_WIN32_ATOM_INDEX_TEXT_PLAIN_UTF8))
-    source_charset = g_strdup ("UTF-8");
-  else
-    source_charset = g_strdup ((const char *)encoding);
-
-  g_get_charset (&charset);
-
-  result = g_convert ((const gchar *) text, length, charset, source_charset,
-                     NULL, NULL, NULL);
-  g_free (source_charset);
-
-  if (!result)
-    return 0;
-
-  *list = g_new (gchar *, 1);
-  **list = result;
-
-  return 1;
-}
-
-void
-gdk_free_text_list (gchar **list)
-{
-  g_return_if_fail (list != NULL);
-
-  g_free (*list);
-  g_free (list);
-}
-
 static gint
 make_list (const gchar  *text,
           gint          length,

diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c
index 9d1e234ce5aa7fcf10c9724cdedf10fd6becfbb2..ead0a4995072a2222e240200f1e085a8a354b3c8 100644 (file)
--- a/gdk/win32/gdkdisplaymanager-win32.c
+++ b/gdk/win32/gdkdisplaymanager-win32.c
@@ -56,9 +56,4 @@ gdk_win32_display_manager_class_init (GdkWin32DisplayManagerClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
   object_class->finalize = gdk_win32_display_manager_finalize;
-
-#if 0
-  manager_class->atom_intern = _gdk_win32_display_manager_atom_intern;
-  manager_class->get_atom_name = _gdk_win32_display_manager_get_atom_name;
-#endif
 }

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 57905f998ee32286b06107dee7d49fdd6ba496b9..b494816a0072f0a228789fba09d27681ea421e7c 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -439,11 +439,6 @@ GdkSurface *gdk_win32_display_get_root_window (GdkDisplay *display);
 
 /* Distributed display manager implementation */
 GdkDisplay *_gdk_win32_display_open (const gchar *display_name);
-GdkAtom _gdk_win32_display_manager_atom_intern (GdkDisplayManager *manager,
-                                                const gchar *atom_name,
-                                                gint         only_if_exists);
-gchar *_gdk_win32_display_manager_get_atom_name (GdkDisplayManager *manager,
-                                                 GdkAtom            atom);
 void _gdk_win32_append_event (GdkEvent *event);
 void _gdk_win32_emit_configure_event (GdkSurface *window);
 

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 6b37920858c467f1ae89ea1c7bbd4f9d1514991b..17729300dfac8aa3691cd82f7c508e84d914f6eb 100644 (file)
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -33,50 +33,6 @@
 #include "gdkprivate-win32.h"
 #include "gdkwin32.h"
 
-GdkAtom
-_gdk_win32_display_manager_atom_intern (GdkDisplayManager *manager,
-                                       const gchar *atom_name,
-                                       gint         only_if_exists)
-{
-  ATOM win32_atom;
-  GdkAtom retval;
-  static GHashTable *atom_hash = NULL;
-
-  if (!atom_hash)
-    atom_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-  retval = g_hash_table_lookup (atom_hash, atom_name);
-  if (!retval)
-    {
-      win32_atom = GlobalAddAtom (atom_name);
-      retval = GUINT_TO_POINTER ((guint) win32_atom);
-
-      g_hash_table_insert (atom_hash,
-                          g_strdup (atom_name),
-                          retval);
-    }
-
-  return retval;
-}
-
-gchar *
-_gdk_win32_display_manager_get_atom_name (GdkDisplayManager *manager,
-                                         GdkAtom            atom)
-{
-  ATOM win32_atom;
-  gchar name[256];
-
-  if (NULL == atom) return g_strdup ("<none>");
-
-  win32_atom = GPOINTER_TO_UINT (atom);
-
-  if (win32_atom < 0xC000)
-    return g_strdup_printf ("#%p", atom);
-  else if (GlobalGetAtomName (win32_atom, name, sizeof (name)) == 0)
-    return NULL;
-  return g_strdup (name);
-}
-
 /*
   For reference, from gdk/x11/gdksettings.c: