luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.GTK]

Browse source 
* BUG: The inner container of a UserContainer is now automatically its 
  proxy control.


git-svn-id: svn://localhost/gambas/trunk@4472 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-02-12 16:37:55 +00:00
parent f6ee863e0c
commit e291d41edc
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gb.gtk/src/CContainer.cpp
View file

@ -321,7 +321,7 @@ BEGIN_PROPERTY(CUSERCONTROL_container)
gControl *test;
int count;
int bucle;
bool ok=false;
bool ok = false;
if (READ_PROPERTY)
{
@ -335,6 +335,7 @@ BEGIN_PROPERTY(CUSERCONTROL_container)
{
THIS_UC->container = THIS;
WIDGET->setProxyContainer(NULL);
WIDGET->setProxy(NULL);
return;
}
@ -343,17 +344,17 @@ BEGIN_PROPERTY(CUSERCONTROL_container)
count = PANEL->childCount();
for (bucle=0;bucle<count;bucle++)
for (bucle = 0; bucle < count; bucle++)
{
test=PANEL->child(bucle);
test = PANEL->child(bucle);
do
{
if (test->parent()==WIDGET )
if (test->parent() == WIDGET)
{
ok=true;
ok = true;
break;
}
test=test->parent();
test = test->parent();
} while (test);
}
@ -365,6 +366,7 @@ BEGIN_PROPERTY(CUSERCONTROL_container)
THIS_UC->container = (CCONTAINER *)GetObject(((gContainer *)ct->ob.widget)->proxyContainer());
WIDGET->setProxyContainer(WIDGET_CONT->proxyContainer());
WIDGET->setProxy(THIS_UC->container->ob.widget);
WIDGET_CONT->performArrange();
END_PROPERTY