IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

add widget return values for menus

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@289 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1997-12-05 08:49:27 +00:00
parent 48ca96ac23
commit 11d4146363
6 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AccountMenu.c
View File

@ -157,6 +157,7 @@ xaccBuildAccountSubMenu (AccountGroup *grp,
menuList[i].accel_text = NULL;
menuList[i].callback = xaccAccountMenuCB;
menuList[i].callback_data = accData->menuEntry[*offset];
menuList[i].widget = 0;
(*offset) ++;
menuList[i].subitems = (MenuItem *)NULL;
@ -180,6 +181,7 @@ xaccBuildAccountSubMenu (AccountGroup *grp,
menuList[i+pad].accel_text = NULL;
menuList[i+pad].callback = xaccAccountMenuCB;
menuList[i+pad].callback_data = accData->menuEntry[*offset];
menuList[i+pad].widget = 0;
menuList[i+pad].subitems = (MenuItem *) NULL;
(*offset) ++;
@ -203,6 +205,7 @@ xaccBuildAccountSubMenu (AccountGroup *grp,
menuList[i+pad].accel_text = NULL;
menuList[i+pad].callback = xaccAccountMenuCB;
menuList[i+pad].callback_data = accData->menuEntry[*offset];
menuList[i+pad].widget = 0;
(*offset) ++;
menuList[i+pad].subitems = xaccBuildAccountSubMenu (acc->children, accData, offset, 0);

3
src/BuildMenu.c
View File

@ -128,6 +128,9 @@ Widget BuildMenu( Widget parent, int menu_type, char *menu_title,
NULL );
}
/* return the widget to the caller */
items[i].widget = widget;
/* possible grey out menu entries */
XtSetSensitive (widget, items[i].sensitive);

53
src/MainWindow.c
View File

@ -420,60 +420,63 @@ mainWindow( Widget parent )
\******************************************************************/
MenuItem fileMenu[] = {
{ "New File...", &xmPushButtonWidgetClass, 'N', NULL, NULL, True,
fileMenubarCB, (XtPointer)FMB_NEW, (MenuItem *)NULL },
fileMenubarCB, (XtPointer)FMB_NEW, (MenuItem *)NULL, 0 },
{ "Open File... ",&xmPushButtonWidgetClass, 'O', NULL, NULL, True,
fileMenubarCB, (XtPointer)FMB_OPEN, (MenuItem *)NULL },
fileMenubarCB, (XtPointer)FMB_OPEN, (MenuItem *)NULL, 0 },
{ "Import QIF... ",&xmPushButtonWidgetClass, 'I', NULL, NULL, True,
fileMenubarCB, (XtPointer)FMB_IMPORT, (MenuItem *)NULL },
fileMenubarCB, (XtPointer)FMB_IMPORT, (MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "Save", &xmPushButtonWidgetClass, 'S', NULL, NULL, True,
fileMenubarCB, (XtPointer)FMB_SAVE, (MenuItem *)NULL },
fileMenubarCB, (XtPointer)FMB_SAVE, (MenuItem *)NULL, 0 },
{ "Save As...", &xmPushButtonWidgetClass, 'A', NULL, NULL, True,
fileMenubarCB, (XtPointer)FMB_SAVEAS,(MenuItem *)NULL },
fileMenubarCB, (XtPointer)FMB_SAVEAS, (MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "Quit", &xmPushButtonWidgetClass, 'Q', NULL, NULL, True,
fileMenubarCB, (XtPointer)FMB_QUIT, (MenuItem *)NULL },
{ NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL},
fileMenubarCB, (XtPointer)FMB_QUIT, (MenuItem *)NULL, 0 },
{ NULL, NULL, 0, NULL, NULL, False,
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
};
MenuItem accountMenu[] = {
{ "New Account...", &xmPushButtonWidgetClass, 'N', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_NEW, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_NEW, (MenuItem *)NULL, 0 },
{ "Open Account", &xmPushButtonWidgetClass, 'O', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_OPEN, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_OPEN, (MenuItem *)NULL, 0 },
{ "Open Subaccounts", &xmPushButtonWidgetClass, 'S', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_LEDGER, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_LEDGER, (MenuItem *)NULL, 0 },
{ "Edit Account...", &xmPushButtonWidgetClass, 'E', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_EDIT, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_EDIT, (MenuItem *)NULL, 0 },
{ "Delete Account...", &xmPushButtonWidgetClass, 'D', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_DEL, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_DEL, (MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "Transfer", &xmPushButtonWidgetClass, 'T', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_TRNS, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_TRNS, (MenuItem *)NULL, 0 },
{ "Report", &xmPushButtonWidgetClass, 'R', NULL, NULL, False,
accountMenubarCB, (XtPointer)AMB_RPRT, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_RPRT, (MenuItem *)NULL, 0 },
#if 0
{ "Edit Categories...", &xmPushButtonWidgetClass, 'C', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_CAT, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_CAT, (MenuItem *)NULL, 0 },
#endif
{ NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL},
{ NULL, NULL, 0, NULL, NULL, False,
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
};
MenuItem helpMenu[] = {
{ "About...", &xmPushButtonWidgetClass, 'A', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_ABOUT, (MenuItem *)NULL },
helpMenubarCB, (XtPointer)HMB_ABOUT, (MenuItem *)NULL, 0 },
{ "Help...", &xmPushButtonWidgetClass, 'H', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_MAIN, (MenuItem *)NULL },
helpMenubarCB, (XtPointer)HMB_MAIN, (MenuItem *)NULL, 0 },
{ "Accounts...", &xmPushButtonWidgetClass, 'C', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_ACC, (MenuItem *)NULL },
helpMenubarCB, (XtPointer)HMB_ACC, (MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "License...", &xmPushButtonWidgetClass, 'L', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_LIC, (MenuItem *)NULL },
{ NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL},
helpMenubarCB, (XtPointer)HMB_LIC, (MenuItem *)NULL, 0 },
{ NULL, NULL, 0, NULL, NULL, False,
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
};
mainwindow = XtVaCreateManagedWidget( "mainwindow",

37
src/RegWindow.c
View File

@ -1811,43 +1811,46 @@ regWindowLedger( Widget parent, Account **acclist, int ledger_type )
\******************************************************************/
MenuItem reportMenu[] = {
{ "Simple...", &xmPushButtonWidgetClass, 'S', NULL, NULL, True,
NULL, (XtPointer)0, (MenuItem *)NULL },
{ NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL},
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
{ NULL, NULL, 0, NULL, NULL, False,
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
};
MenuItem activityMenu[] = {
{ "Transfer...", &xmPushButtonWidgetClass, 'T', NULL, NULL, True,
accountMenubarCB, (XtPointer)AMB_TRNS, (MenuItem *)NULL },
accountMenubarCB, (XtPointer)AMB_TRNS, (MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "Reconcile...", &xmPushButtonWidgetClass, 'C', NULL, NULL, True,
startRecnCB, NULL, (MenuItem *)NULL },
startRecnCB, NULL, (MenuItem *)NULL, 0 },
{ "Adjust Balance...", &xmPushButtonWidgetClass, 'A', NULL, NULL, True,
startAdjBCB, NULL, (MenuItem *)NULL },
startAdjBCB, NULL, (MenuItem *)NULL, 0 },
{ "Report", &xmPushButtonWidgetClass, 'R', NULL, NULL, False,
NULL, (XtPointer)0, reportMenu },
NULL, (XtPointer)0, reportMenu, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "Delete Transaction", &xmPushButtonWidgetClass, 'D', NULL, NULL, True,
deleteCB, NULL, (MenuItem *)NULL },
deleteCB, NULL, (MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "Close Window", &xmPushButtonWidgetClass, 'Q', NULL, NULL, True,
destroyShellCB, NULL, (MenuItem *)NULL },
{ NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL},
destroyShellCB, NULL, (MenuItem *)NULL, 0 },
{ NULL, NULL, 0, NULL, NULL, False,
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
};
MenuItem helpMenu[] = {
{ "About...", &xmPushButtonWidgetClass, 'A', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_ABOUT, (MenuItem *)NULL },
helpMenubarCB, (XtPointer)HMB_ABOUT, (MenuItem *)NULL, 0 },
{ "Help...", &xmPushButtonWidgetClass, 'H', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_REGWIN,(MenuItem *)NULL },
helpMenubarCB, (XtPointer)HMB_REGWIN,(MenuItem *)NULL, 0 },
{ "", &xmSeparatorWidgetClass, 0, NULL, NULL, True,
NULL, NULL, (MenuItem *)NULL },
NULL, NULL, (MenuItem *)NULL, 0 },
{ "License...", &xmPushButtonWidgetClass, 'L', NULL, NULL, True,
helpMenubarCB, (XtPointer)HMB_LIC, (MenuItem *)NULL },
{ NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL},
helpMenubarCB, (XtPointer)HMB_LIC, (MenuItem *)NULL, 0 },
{ NULL, NULL, 0, NULL, NULL, False,
NULL, (XtPointer)0, (MenuItem *)NULL, 0 },
};

2
src/XferWindow.c
View File

@ -264,6 +264,7 @@ xferWindow( Widget parent )
accountMenu[i].sensitive = True;
accountMenu[i].callback = menuCB;
accountMenu[i].callback_data = xferData->menuData[2*i];
accountMenu[i].widget = 0;
accountMenu[i].subitems = (MenuItem *)NULL;
}
accountMenu[i] .label= NULL;
@ -298,6 +299,7 @@ xferWindow( Widget parent )
accountMenu[i].sensitive = True;
accountMenu[i].callback = menuCB;
accountMenu[i].callback_data = xferData->menuData[2*i+1];
accountMenu[i].widget = 0;
accountMenu[i].subitems = (MenuItem *)NULL;
}
accountMenu[i] .label= NULL;

1
src/main.c
View File

@ -27,7 +27,6 @@
#include "config.h"
#include "BuildMenu.h"
#include "Data.h"
#include "FileBox.h"
#include "FileIO.h"