Prevent toolbars from screwing with private XfeManager components.
git-svn-id: svn://10.0.0.236/trunk@465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -223,7 +223,7 @@ XFE_TaskBar::setIconGroupForCommand(CommandType cmd, IconGroup *icons)
|
||||
|
||||
for (i = 0; i < num_children; i ++)
|
||||
{
|
||||
if (XfeIsButton(children[i]))
|
||||
if (XfeIsButton(children[i]) && !XfeIsPrivateComponent(children[i]))
|
||||
{
|
||||
if (Command::intern(XtName(children[i])) == cmd)
|
||||
{
|
||||
|
||||
@@ -165,7 +165,7 @@ XFE_Toolbar::updateButton(Widget w)
|
||||
XP_ASSERT( XfeIsButton(w) );
|
||||
|
||||
// Make very sure we deal with a valid button/cascade
|
||||
if (!w || !XfeIsButton(w) || !XfeIsAlive(w))
|
||||
if (!w || !XfeIsButton(w) || !XfeIsAlive(w) || XfeIsPrivateComponent(w))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -286,7 +286,7 @@ XFE_CALLBACK_DEFN(XFE_Toolbar, updateCommand)(XFE_NotificationCenter */*obj*/,
|
||||
|
||||
for (i = 0; i < num_children; i ++)
|
||||
{
|
||||
if (XfeIsButton(children[i]))
|
||||
if (XfeIsButton(children[i]) && !XfeIsPrivateComponent(children[i]))
|
||||
{
|
||||
XFE_Button * button =
|
||||
(XFE_Button *) XfeInstancePointer(children[i]);
|
||||
@@ -405,7 +405,7 @@ XFE_Toolbar::findButton(const char *name,
|
||||
|
||||
for (i = 0; i < num_children; i ++)
|
||||
{
|
||||
if (XfeIsButton(children[i]))
|
||||
if (XfeIsButton(children[i]) && !XfeIsPrivateComponent(children[i]))
|
||||
{
|
||||
XFE_Button * button =
|
||||
(XFE_Button *) XfeInstancePointer(children[i]);
|
||||
|
||||
Reference in New Issue
Block a user