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

* The new proxy of a control is now correctly unlinked if it was already the proxy of another control.

Browse Source 
[GB.GTK]
* BUG: The new proxy of a control is now correctly unlinked if it was already the proxy of another control.

[GB.GTK3]
* BUG: The new proxy of a control is now correctly unlinked if it was already the proxy of another control.

[GB.QT4]
* BUG: The new proxy of a control is now correctly unlinked if it was already the proxy of another control.

[GB.QT5]
* BUG: The new proxy of a control is now correctly unlinked if it was already the proxy of another control.
This commit is contained in:
Benoît Minisini 2022-04-28 23:48:30 +02:00
parent c771d1d316
commit 38aea6b3d5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gb.gtk/src/gcontrol.cpp
View File

@ -2634,6 +2634,9 @@ bool gControl::setProxy(gControl *proxy)
//fprintf(stderr, "proxy: (%p %s) -> (%p %s)\n", this, name(), proxy, proxy ? proxy->name() : "NULL");
if (proxy && proxy->_proxy_for)
proxy->_proxy_for->_proxy = NULL;
if (_proxy)
_proxy->_proxy_for = NULL;

12
gb.qt4/src/CWidget.cpp
View File

@ -289,6 +289,9 @@ void CWIDGET_register_proxy(void *_object, void *proxy)
else if (!proxy && !THIS_EXT)
return;
if (proxy && EXT(proxy) && EXT(proxy)->proxy_for)
EXT(EXT(proxy)->proxy_for)->proxy = NULL;
//fprintf(stderr, "proxy: (%p %s) -> (%p %s)\n", THIS, THIS->name, proxy, proxy ? ((CWIDGET *)proxy)->name : "NULL");
if (THIS_EXT && THIS_EXT->proxy && EXT(THIS_EXT->proxy))
@ -2256,7 +2259,8 @@ void CWidget::destroy()
if (!THIS)
return;
//qDebug("CWidget::destroy: (%s %p) %s [%p]", GB.GetClassName(THIS), THIS, THIS->name, _hovered);
/*fprintf(stderr, "CWidget::destroy: (%s %p) %s / proxy = %p / proxy_for = %p\n", GB.GetClassName(THIS), THIS, THIS->name,
THIS_EXT ? THIS_EXT->proxy : NULL, THIS_EXT ? THIS_EXT->proxy_for : NULL);*/
if (!_post_check_hovered)
{
@ -2288,14 +2292,14 @@ void CWidget::destroy()
if (THIS_EXT)
{
CACTION_register(THIS, THIS_EXT->action, NULL);
GB.FreeString(&THIS_EXT->action);
if (THIS_EXT->proxy)
EXT(THIS_EXT->proxy)->proxy_for = NULL;
if (THIS_EXT->proxy_for)
EXT(THIS_EXT->proxy_for)->proxy = NULL;
CACTION_register(THIS, THIS_EXT->action, NULL);
GB.FreeString(&THIS_EXT->action);
if (THIS_EXT->container_for)
{
((CCONTAINER *)THIS_EXT->container_for)->container = ((CWIDGET *)THIS_EXT->container_for)->widget;