Patch level : 4.0
Files correlati : xvaga.dll Ricompilazione Demo : [ ] Commento : Corretta generazione barra menu delle applicazioni BAO non generava correttamente il menu preferiti git-svn-id: svn://10.65.10.50/trunk@14952 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
ab3e9424d6
commit
4bd66668c9
@ -1235,11 +1235,7 @@ void TTaskWin::SetMenuTree(const MENU_ITEM* tree)
|
|||||||
item = new wxMenuItem(pMenu, wxID_SEPARATOR);
|
item = new wxMenuItem(pMenu, wxID_SEPARATOR);
|
||||||
else
|
else
|
||||||
item = new wxMenuItem(pMenu, mi->tag, mi->text, wxEmptyString, mi->checkable);
|
item = new wxMenuItem(pMenu, mi->tag, mi->text, wxEmptyString, mi->checkable);
|
||||||
#if wxCHECK_VERSION(2,8,0)
|
pMenu->Append(item);
|
||||||
|
|
||||||
#else
|
|
||||||
pMenu->DoAppend(item);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
const int nLast = bar->GetMenuCount()-1;
|
const int nLast = bar->GetMenuCount()-1;
|
||||||
int m;
|
int m;
|
||||||
@ -1274,10 +1270,7 @@ void TTaskWin::PushMenuTree(const MENU_ITEM* tree, wxWindow* owner)
|
|||||||
item = new wxMenuItem(pMenu, wxID_SEPARATOR);
|
item = new wxMenuItem(pMenu, wxID_SEPARATOR);
|
||||||
else
|
else
|
||||||
item = new wxMenuItem(pMenu, mi->tag, mi->text, wxEmptyString, mi->checkable);
|
item = new wxMenuItem(pMenu, mi->tag, mi->text, wxEmptyString, mi->checkable);
|
||||||
#if wxCHECK_VERSION(2,8,0)
|
pMenu->Append(item);
|
||||||
#else
|
|
||||||
pMenu->DoAppend(item);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
pBar->Append(pMenu, tree->text);
|
pBar->Append(pMenu, tree->text);
|
||||||
}
|
}
|
||||||
@ -3584,7 +3577,7 @@ BOOLEAN xvt_menu_popup(MENU_ITEM *menu_p, WINDOW win, PNT pos,
|
|||||||
item = new wxMenuItem(&menu, wxID_SEPARATOR);
|
item = new wxMenuItem(&menu, wxID_SEPARATOR);
|
||||||
else
|
else
|
||||||
item = new wxMenuItem(&menu, mi->tag, mi->text, wxEmptyString, mi->checkable);
|
item = new wxMenuItem(&menu, mi->tag, mi->text, wxEmptyString, mi->checkable);
|
||||||
menu.DoAppend(item);
|
menu.Append(item);
|
||||||
#endif
|
#endif
|
||||||
item->Enable(mi->enabled); // Fattibile solo dopo l'append
|
item->Enable(mi->enabled); // Fattibile solo dopo l'append
|
||||||
if (mi->checkable)
|
if (mi->checkable)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user