diff --git a/ChangeLog b/ChangeLog index 0953aa8294..1db7d1bc78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-05-02 Matthias Clasen + * gtk/gtkselection.c: Small doc fixes. + * gtk/gtkmenushell.c (gtk_menu_shell_set_take_focus): (gtk_menu_shell_get_take_focus): Fix up the docs a bit. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0953aa8294..1db7d1bc78 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2005-05-02 Matthias Clasen + * gtk/gtkselection.c: Small doc fixes. + * gtk/gtkmenushell.c (gtk_menu_shell_set_take_focus): (gtk_menu_shell_get_take_focus): Fix up the docs a bit. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0953aa8294..1db7d1bc78 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,7 @@ 2005-05-02 Matthias Clasen + * gtk/gtkselection.c: Small doc fixes. + * gtk/gtkmenushell.c (gtk_menu_shell_set_take_focus): (gtk_menu_shell_get_take_focus): Fix up the docs a bit. diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 6786d336d2..095189b2c8 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,7 @@ 2005-05-02 Matthias Clasen + * gtk/tmpl/gtkselection.sgml: Remove inlined docs. + * gtk/gtk-sections.txt: Remove nonexisting functions. 2005-04-29 Matthias Clasen diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml index 2aa80bf90a..a2ff37963b 100644 --- a/docs/reference/gtk/tmpl/gtkselection.sgml +++ b/docs/reference/gtk/tmpl/gtkselection.sgml @@ -85,50 +85,44 @@ selection handling code. -Creates a new #GtkTargetList from an array of #GtkTargetEntry. -@targets: Pointer to an array of #GtkTargetEntry -@ntargets: number of entries in @targets. -@Returns: the new #GtkTargetList. +@targets: +@ntargets: +@Returns: -Increases the reference count of a #GtkTargetList by one. -@list: a #GtkTargetList +@list: -Decreases the reference count of a #GtkTargetList by one. -If the resulting reference count is zero, frees the list. -@list: a #GtkTargetList +@list: -Adds another target to a #GtkTargetList. -@list: a #GtkTargetList -@target: the interned atom representing the target -@flags: the flags for this target -@info: an ID that will be passed back to the application +@list: +@target: +@flags: +@info: -Adds a table of #GtkTargetEntry into a target list. -@list: a #GtkTargetList -@targets: the table of #GtkTargetEntry -@ntargets: number of targets in the table +@list: +@targets: +@ntargets: @@ -161,22 +155,20 @@ Adds a table of #GtkTargetEntry into a target list. -Removes a target from a target list. -@list: a #GtkTargetList -@target: the interned atom representing the target +@list: +@target: -Looks up a given target in a #GtkTargetList. -@list: a #GtkTargetList -@target: an interned atom representing the target to search for -@info: a pointer to the location to store application info for target -@Returns: %TRUE if the target was found, otherwise %FALSE +@list: +@target: +@info: +@Returns: @@ -203,26 +195,22 @@ Looks up a given target in a #GtkTargetList. -Adds specified target to the list of supported targets for a -given widget and selection. -@widget: a #GtkTarget -@selection: the selection -@target: target to add. -@info: A unsigned integer which will be passed back to the application. +@widget: +@selection: +@target: +@info: -Adds a table of targets to the list of supported targets -for a given widget and selection. -@widget: a #GtkWidget -@selection: the selection -@targets: a table of targets to add -@ntargets: number of entries in @targets +@widget: +@selection: +@targets: +@ntargets: @@ -236,32 +224,24 @@ for a given widget and selection. -Requests the contents of a selection. When received, -a "selection_received" signal will be generated. -@widget: The widget which acts as requestor -@selection: Which selection to get -@target: Form of information desired (e.g., STRING) -@time_: Time of request (usually of triggering event) - In emergency, you could use #GDK_CURRENT_TIME -@Returns: %TRUE if requested succeeded. %FALSE if we could not process - request. (e.g., there was already a request in process for - this widget). +@widget: +@selection: +@target: +@time_: +@Returns: x -Stores new data into a #GtkSelectionData object. Should -only be called from a selection handler callback. -Zero-terminates the stored data. @selection_data: -@type: the type of selection data -@format: format (number of bits in a unit) -@data: pointer to the data (will be copied) -@length: length of the data +@type: +@format: +@data: +@length: @@ -354,13 +334,9 @@ Zero-terminates the stored data. -Removes all handlers and unsets ownership of all -selections for a widget. Called when widget is being -destroyed. This function will not generally be -called by applications. -@widget: a #GtkWidget +@widget: @@ -374,19 +350,16 @@ called by applications. -Makes a copy of a #GtkSelectionData structure and its data. -@data: a pointer to a #GtkSelectionData structure. -@Returns: a pointer to a copy of @data. +@data: +@Returns: -Frees a #GtkSelectionData structure returned from -gtk_selection_data_copy(). -@data: a pointer to a #GtkSelectionData structure. +@data: diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 328c5d3901..f3230902fd 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -2553,26 +2553,26 @@ gtk_selection_default_handler (GtkWidget *widget, /** * gtk_selection_data_copy: - * @selection_data: a pointer to a #GtkSelectionData structure. + * @data: a pointer to a #GtkSelectionData structure. * * Makes a copy of a #GtkSelectionData structure and its data. * * Return value: a pointer to a copy of @data. **/ GtkSelectionData* -gtk_selection_data_copy (GtkSelectionData *selection_data) +gtk_selection_data_copy (GtkSelectionData *data) { GtkSelectionData *new_data; - g_return_val_if_fail (selection_data != NULL, NULL); + g_return_val_if_fail (data != NULL, NULL); new_data = g_new (GtkSelectionData, 1); *new_data = *selection_data; - if (selection_data->data) + if (data->data) { - new_data->data = g_malloc (selection_data->length + 1); - memcpy (new_data->data, selection_data->data, selection_data->length + 1); + new_data->data = g_malloc (data->length + 1); + memcpy (new_data->data, data->data, data->length + 1); } return new_data;