Commit f5342df7 authored by Tristan Van Berkom's avatar Tristan Van Berkom

- Fixed cut/paste inside notebooks (widgets wanted to stay on the same


	* gladeui/glade-command.c: 
	  - Fixed cut/paste inside notebooks (widgets wanted to stay on the same page they 
	    were cut from)
	  - Fixed special-child-type handling, dont stomp on the special child type for a
	    delete/undo combination (a tab widget deleted and brought back was showing up
	    in the page).


svn path=/trunk/; revision=1347
parent 73d09358
2006-06-06 Tristan Van Berkom <tvb@gnome.org>
* gladeui/glade-command.c:
- Fixed cut/paste inside notebooks (widgets wanted to stay on the same page they
were cut from)
- Fixed special-child-type handling, dont stomp on the special child type for a
delete/undo combination (a tab widget deleted and brought back was showing up
in the page).
2006-06-13 Vincent Geddes <vincent.geddes@gmail.com>
* plugins/gtk+/gtk+.xml.in: HIG: Use "Edit.." instead of "Edit Menu", and so on.
* plugins/gtk+/gtk+.xml.in: HIG: Use "Edit.." instead of "Edit Menu", and so on.
* configure.ac: Calculate libtool CURRENT-minus-AGE value.
......
......@@ -1117,25 +1117,33 @@ glade_command_add_execute (GladeCommandAddRemove *me)
if (cdata->parent != NULL)
{
/* Prepare special-child-type for the paste. */
if (cdata->props_recorded == FALSE)
{
/* Clear it the first time */
g_object_set_data (cdata->widget->object,
"special-child-type", NULL);
}
else
if (me->from_clipboard)
{
g_object_set_data_full (cdata->widget->object,
"special-child-type",
g_strdup (cdata->special_type),
g_free);
if (cdata->props_recorded == FALSE)
{
/* Clear it the first time */
g_object_set_data (cdata->widget->object,
"special-child-type", NULL);
}
else
{
g_object_set_data_full (cdata->widget->object,
"special-child-type",
g_strdup (cdata->special_type),
g_free);
}
}
/* Only transfer properties when they are from the clipboard,
* otherwise prioritize packing defaults.
*/
if (me->from_clipboard)
saved_props = glade_widget_dup_properties (cdata->widget->packing_properties, FALSE);
{
saved_props =
glade_widget_dup_properties (cdata->widget->packing_properties, FALSE);
glade_widget_set_packing_properties (cdata->widget, cdata->parent);
}
/* glade_command_paste ganauntees that if
* there we are pasting to a placeholder,
......
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