Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ZenWalker
Glade
Commits
0b39338e
Commit
0b39338e
authored
Jan 09, 2011
by
Tristan Van Berkom
Browse files
* gladeui/glade-command.c: Ensure that menus can be added to menutoolbuttons.
parent
3e304041
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
0b39338e
...
...
@@ -21,6 +21,8 @@
optional property to discourage its use and gave it similar treatment as the
toolbar-style property.
* gladeui/glade-command.c: Ensure that menus can be added to menutoolbuttons.
2011-01-07 Emilio Pozuelo Monfort <pochu27@gmail.com>
* configure.ac: Bump the minimum GTK+ version to 2.99.0.
...
...
gladeui/glade-command.c
View file @
0b39338e
...
...
@@ -1066,11 +1066,11 @@ glade_command_add (GList *widgets,
/* Parent */
if
(
parent
==
NULL
)
cdata
->
parent
=
glade_widget_get_parent
(
widget
);
cdata
->
parent
=
glade_widget_get_parent
(
widget
);
else
if
(
placeholder
&&
GWA_IS_TOPLEVEL
(
adaptor
)
==
FALSE
)
cdata
->
parent
=
glade_placeholder_get_parent
(
placeholder
);
else
if
(
GWA_IS_TOPLEVEL
(
adaptor
)
==
FALSE
)
cdata
->
parent
=
parent
;
cdata
->
parent
=
glade_placeholder_get_parent
(
placeholder
);
else
cdata
->
parent
=
parent
;
/* Placeholder */
if
(
placeholder
!=
NULL
&&
g_list_length
(
widgets
)
==
1
)
...
...
@@ -1352,17 +1352,13 @@ glade_command_add_execute (GladeCommandAddRemove * me)
* there is only one widget.
*/
if
(
cdata
->
placeholder
)
{
glade_widget_replace
(
cdata
->
parent
,
G_OBJECT
(
cdata
->
placeholder
),
glade_widget_get_object
(
cdata
->
widget
));
}
glade_widget_replace
(
cdata
->
parent
,
G_OBJECT
(
cdata
->
placeholder
),
glade_widget_get_object
(
cdata
->
widget
));
else
{
glade_widget_add_child
(
cdata
->
parent
,
cdata
->
widget
,
cdata
->
props_recorded
==
FALSE
);
}
glade_widget_add_child
(
cdata
->
parent
,
cdata
->
widget
,
cdata
->
props_recorded
==
FALSE
);
glade_command_transfer_props
(
cdata
->
widget
,
saved_props
);
...
...
@@ -1584,6 +1580,7 @@ glade_command_create (GladeWidgetAdaptor * adaptor, GladeWidget * parent,
{
return
NULL
;
}
widgets
=
g_list_prepend
(
widgets
,
widget
);
glade_command_push_group
(
_
(
"Create %s"
),
glade_widget_get_name
(
widget
));
glade_command_add
(
widgets
,
parent
,
placeholder
,
project
,
FALSE
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment