From: Arun Persaud Date: Sun, 11 Oct 2009 18:31:30 +0000 (-0700) Subject: removed X-version of buttonbar X-Git-Tag: gtk-20091122~19 X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=4213fe0ecdc947c528a7c6f23f9c56fca7e1eea4 removed X-version of buttonbar --- diff --git a/xboard.c b/xboard.c index ead2202..6058ec1 100644 --- a/xboard.c +++ b/xboard.c @@ -251,7 +251,6 @@ void CreateXPMPieces P((void)); void CreatePieces P((void)); void CreatePieceMenus P((void)); Widget CreateMenuBar P((Menu *mb)); -Widget CreateButtonBar P ((MenuItem *mi)); char *FindFont P((char *pattern, int targetPxlSize)); void PieceMenuPopup P((Widget w, XEvent *event, String *params, Cardinal *num_params)); @@ -414,7 +413,7 @@ Pixmap iconPixmap, wIconPixmap, bIconPixmap, xMarkPixmap; Widget shellWidget, layoutWidget, formWidget, boardWidget, messageWidget, whiteTimerWidget, blackTimerWidget, titleWidget, widgetList[16], commentShell, promotionShell, whitePieceMenu, blackPieceMenu, dropMenu, - menuBarWidget, buttonBarWidget, editShell, errorShell, analysisShell, + menuBarWidget, editShell, errorShell, analysisShell, ICSInputShell, fileNameShell, askQuestionShell; Font clockFontID, coordFontID, countFontID; XFontStruct *clockFontStruct, *coordFontStruct, *countFontStruct; @@ -733,16 +732,6 @@ Menu menuBar[] = { {NULL, NULL} }; -#define PAUSE_BUTTON N_("P") -MenuItem buttonBar[] = { - // {"<<", ToStartProc}, - // {"<", BackwardProc}, - // {PAUSE_BUTTON, PauseProc}, - // {">", ForwardProc}, - // {">>", ToEndProc}, - {NULL, NULL} -}; - #define PIECE_MENU_SIZE 18 String pieceMenuStrings[2][PIECE_MENU_SIZE] = { { N_("White"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), @@ -3211,39 +3200,6 @@ Widget CreateMenuBar(mb) return menuBar; } -Widget CreateButtonBar(mi) - MenuItem *mi; -{ - int j; - Widget button, buttonBar; - Arg args[16]; - - j = 0; - XtSetArg(args[j], XtNorientation, XtorientHorizontal); j++; - if (tinyLayout) { - XtSetArg(args[j], XtNhSpace, 0); j++; - } - XtSetArg(args[j], XtNborderWidth, 0); j++; - XtSetArg(args[j], XtNvSpace, 0); j++; - buttonBar = XtCreateWidget("buttonBar", boxWidgetClass, - formWidget, args, j); - - while (mi->string != NULL) { - j = 0; - if (tinyLayout) { - XtSetArg(args[j], XtNinternalWidth, 2); j++; - XtSetArg(args[j], XtNborderWidth, 0); j++; - } - XtSetArg(args[j], XtNlabel, XtNewString(_(mi->string))); j++; - button = XtCreateManagedWidget(mi->string, commandWidgetClass, - buttonBar, args, j); - XtAddCallback(button, XtNcallback, - (XtCallbackProc) MenuBarSelect, - (caddr_t) mi->proc); - mi++; - } - return buttonBar; -} Widget CreatePieceMenu(name, color)