Commit 016d8917 authored by Tim Janik's avatar Tim Janik

Remove superflous gtkselection accessors and merge _get_data

svn path=/trunk/; revision=20628
parent 0e072ea8
......@@ -3333,17 +3333,11 @@ gtk_selection_data_get_target
gtk_selection_data_get_data_type
gtk_selection_data_get_format
gtk_selection_data_get_data
gtk_selection_data_get_length
gtk_selection_data_get_pixbuf
gtk_selection_data_get_targets
gtk_selection_data_get_text
gtk_selection_data_get_type G_GNUC_CONST
gtk_selection_data_get_uris
gtk_selection_data_set_target
gtk_selection_data_set_data_type
gtk_selection_data_set_format
gtk_selection_data_set_data
gtk_selection_data_set_length
gtk_selection_data_set
gtk_selection_data_set_pixbuf
gtk_selection_data_set_text
......
......@@ -1109,24 +1109,6 @@ gtk_selection_convert (GtkWidget *widget,
return TRUE;
}
/**
* gtk_selection_data_set_target:
* @selection_data: a pointer to a #GtkSelectionData structure.
* @target: target of the selection
*
* Sets the target of the selection.
*
* Since: GSEAL-branch
**/
void
gtk_selection_data_set_target (GtkSelectionData *selection_data,
GdkAtom target)
{
g_return_if_fail (selection_data != NULL);
selection_data->target = target;
}
/**
* gtk_selection_data_get_target:
* @selection_data: a pointer to a #GtkSelectionData structure.
......@@ -1143,24 +1125,6 @@ gtk_selection_data_get_target (GtkSelectionData *selection_data)
return selection_data->target;
}
/**
* gtk_selection_data_set_data_type:
* @selection_data: a pointer to a #GtkSelectionData structure.
* @data_type: data type of the selection
*
* Sets the data type of the selection.
*
* Since: GSEAL-branch
**/
void
gtk_selection_data_set_data_type (GtkSelectionData *selection_data,
GdkAtom data_type)
{
g_return_if_fail (selection_data != NULL);
selection_data->type = data_type;
}
/**
* gtk_selection_data_get_data_type:
* @selection_data: a pointer to a #GtkSelectionData structure.
......@@ -1177,24 +1141,6 @@ gtk_selection_data_get_data_type (GtkSelectionData *selection_data)
return selection_data->type;
}
/**
* gtk_selection_data_set_format:
* @selection_data: a pointer to a #GtkSelectionData structure.
* @format: format of the selection
*
* Sets the format of the selection.
*
* Since: GSEAL-branch
**/
void
gtk_selection_data_set_format (GtkSelectionData *selection_data,
gint format)
{
g_return_if_fail (selection_data != NULL);
selection_data->format = format;
}
/**
* gtk_selection_data_get_format:
* @selection_data: a pointer to a #GtkSelectionData structure.
......@@ -1211,73 +1157,27 @@ gtk_selection_data_get_format (GtkSelectionData *selection_data)
return selection_data->format;
}
/**
* gtk_selection_data_set_data:
* @selection_data: a pointer to a #GtkSelectionData structure.
* @data: data of the selection
*
* Sets the raw data of the selection.
*
* Since: GSEAL-branch
**/
void
gtk_selection_data_set_data (GtkSelectionData *selection_data,
const guchar *data)
{
g_return_if_fail (selection_data != NULL);
g_free (selection_data->data);
selection_data->data = (guchar*) g_strdup (data);
}
/**
* gtk_selection_data_get_data:
* @selection_data: a pointer to a #GtkSelectionData structure.
* @length: an integer to be filled in, or %NULL
*
* Retrieves the raw data of the selection.
*
* If @length is not %NULL it is filled with the length of data.
*
* Since: GSEAL-branch
**/
const guchar*
gtk_selection_data_get_data (GtkSelectionData *selection_data)
gtk_selection_data_get_data (GtkSelectionData *selection_data,
guint *length)
{
g_return_val_if_fail (selection_data != NULL, NULL);
return selection_data->data;
}
/**
* gtk_selection_data_set_target:
* @selection_data: a pointer to a #GtkSelectionData structure.
* @length: length of the selection
*
* Sets the length of the selection.
*
* Since: GSEAL-branch
**/
void
gtk_selection_data_set_length (GtkSelectionData *selection_data,
gint length)
{
g_return_if_fail (selection_data != NULL);
selection_data->length = length;
}
if (length)
*length = selection_data->length;
/**
* gtk_selection_data_get_length:
* @selection_data: a pointer to a #GtkSelectionData structure.
*
* Retrieves the length of the selection.
*
* Since: GSEAL-branch
**/
gint
gtk_selection_data_get_length (GtkSelectionData *selection_data)
{
g_return_val_if_fail (selection_data != NULL, 0);
return selection_data->length;
return selection_data->data;
}
/**
......
......@@ -148,21 +148,11 @@ gboolean gtk_selection_convert (GtkWidget *widget,
GdkAtom selection,
GdkAtom target,
guint32 time_);
void gtk_selection_data_set_target (GtkSelectionData *selection_data,
GdkAtom target);
GdkAtom gtk_selection_data_get_target (GtkSelectionData *selection_data);
void gtk_selection_data_set_data_type (GtkSelectionData *selection_data,
GdkAtom target);
GdkAtom gtk_selection_data_get_data_type (GtkSelectionData *selection_data);
void gtk_selection_data_set_format (GtkSelectionData *selection_data,
gint format);
gint gtk_selection_data_get_format (GtkSelectionData *selection_data);
void gtk_selection_data_set_data (GtkSelectionData *selection_data,
const guchar *data);
const guchar *gtk_selection_data_get_data (GtkSelectionData *selection_data);
void gtk_selection_data_set_length (GtkSelectionData *selection_data,
gint length);
gint gtk_selection_data_get_length (GtkSelectionData *selection_data);
const guchar *gtk_selection_data_get_data (GtkSelectionData *selection_data,
guint *length);
GdkDisplay *gtk_selection_data_get_display (GtkSelectionData *selection_data);
void gtk_selection_data_set (GtkSelectionData *selection_data,
GdkAtom type,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment