* BUG: Menu.Children.Clear() works again.

[GB.GTK.OPENGL]
* BUG: GlArea can take the focus now.


git-svn-id: svn://localhost/gambas/trunk@6077 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-01-10 22:30:33 +00:00
parent cf7da09a46
commit e18c2016e7
2 changed files with 4 additions and 2 deletions

View File

@ -31,6 +31,7 @@ gGLArea::gGLArea(gContainer *parent, void (*init)(GtkWidget *)) : gControl(paren
g_typ = Type_gGLArea;
border = widget = gtk_event_box_new();
gtk_widget_set_can_focus(widget, TRUE);
(*init)(widget);
realize(false);
}

View File

@ -615,7 +615,8 @@ int gMenu::childCount()
while (item)
{
mn=(gMenu*)item->data;
if (mn->pr == (void*)this) ct++;
if (mn->pr == (void*)this && !mn->_delete_later)
ct++;
item=g_list_next(item);
}
@ -634,7 +635,7 @@ gMenu* gMenu::childMenu(int pos)
while (item)
{
mn=(gMenu*)item->data;
if (mn->pr == (void*)this)
if (mn->pr == (void*)this && !mn->_delete_later)
{
if (ct==pos) return mn;
ct++;