From 923951b414443faa4675e4640abec5ef0d09353c Mon Sep 17 00:00:00 2001 From: wmoxam Date: Sun, 13 Oct 2019 23:41:22 -0400 Subject: [PATCH] Remove NOTDONE code --- cde/lib/DtHelp/HelpQuickD.c | 74 ------------------------ cde/lib/DtTerm/TermPrim/TermPrimBuffer.c | 30 ---------- cde/programs/dtwm/README | 4 -- cde/programs/dtwm/WmFeedback.c | 9 --- 4 files changed, 117 deletions(-) diff --git a/cde/lib/DtHelp/HelpQuickD.c b/cde/lib/DtHelp/HelpQuickD.c index db25991f..cc507d25 100644 --- a/cde/lib/DtHelp/HelpQuickD.c +++ b/cde/lib/DtHelp/HelpQuickD.c @@ -1133,77 +1133,6 @@ static void Destroy( } - -#ifdef NOTDONE -/***************************************************************************** - * Function: static void MenuBarFix( - * XmGeoMatrix geoSpec, - * int action, - * XmGeoRowLayout layoutPtr, - * XmKidGeometry rowPtr) - * - * - * - * Parameters: - * - * Return Value: - * - * Purpose: This routine is a fixup routine which can be used for rows - * which consist of a single MenuBar RowColumn. The effect of - * this routine is to have the RowColumn ignore the margin - * width and height. - * - *****************************************************************************/ -static void MenuBarFix( - XmGeoMatrix geoSpec, - int action, -#if XmREVISION >= 2 - XmGeoMajorLayout layoutPtr, -#else - XmGeoRowLayout layoutPtr, -#endif - XmKidGeometry rowPtr ) -{ - Dimension marginW ; - Dimension marginH ; - Dimension twoMarginW ; - - - marginW = geoSpec->margin_w ; - twoMarginW = (marginW << 1) ; - marginH = geoSpec->margin_h ; - - switch( action ) - { - case XmGEO_PRE_SET: - { rowPtr->box.x -= marginW ; - rowPtr->box.width += twoMarginW ; - rowPtr->box.y -= marginH ; - break ; - } - default: - { if( rowPtr->box.width > twoMarginW ) - { - /* Avoid subtracting a margin from box width which would - * result in underflow. - */ - rowPtr->box.x += marginW ; - rowPtr->box.width -= twoMarginW ; - } - if( action == XmGET_PREFERRED_SIZE ) - { - /* Set width to some small value so it does not - * effect total width of matrix. - */ - rowPtr->box.width = 1 ; - } - break ; - } - } - return ; -} -#endif - /***************************************************************************** * Function: static void SeparatorFix( * XmGeoMatrix geoSpec, @@ -1292,9 +1221,6 @@ XmGeoMatrix _DtHelpQuickDialogWidgetGeoMatrixCreate( XmGeoRowLayout layoutPtr ; XmKidGeometry boxPtr ; XmKidGeometry firstButtonBox ; -#ifdef NOTDONE - int fix_menubar = False ; -#endif /* Replace the value "10" for the marginWidth resource when avail */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c index fcc251a9..fbad9c2f 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c @@ -1852,36 +1852,6 @@ _DtTermPrimBufferInsertLineFromTB } } - -#ifdef NOTDONE -/************************************************************************** - * Function: - * _DtTermPrimBufferScrollToHistory(): scroll one or more lines - * of text from the beginning of the active buffer into - * the history buffer. - * - * Parameters: - * TermBuffer tb: term buffer to scroll out of - * short length: number of lines to scroll - * - * Returns: - * the number of lines scrolled (removed from active buffer) - * - * Notes: - */ -int -_DtTermPrimBufferScrollToHistory() -( - const TermBuffer tb, - const short length, -) -{ - if (PREV_BUFFER(tb)) { - -} -#endif /* NOTDONE */ - - /************************************************************************** * Function: * _DtTermPrimBufferDeleteLine(): deletes one or more lines of text from diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README index 3ab2d969..93657386 100644 --- a/cde/programs/dtwm/README +++ b/cde/programs/dtwm/README @@ -83,10 +83,6 @@ header file include flags, and macros (e.g. ABS). NO Vestigal/experimental code for position help dialog (WmHelp.c). - NOTDONE - Vestigal/experimental code to reduce output to feedback window - (WmFeedback.c). - NO_OL_COMPAT If defined, then code to read and interpret Open Look window manager hints is removed. diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c index 3b8800de..26827c96 100644 --- a/cde/programs/dtwm/WmFeedback.c +++ b/cde/programs/dtwm/WmFeedback.c @@ -541,14 +541,6 @@ void UpdateFeedbackInfo (WmScreenData *pSD, int x, int y, unsigned int width, un * configuration outline. */ -#ifdef NOTDONE - /* only update if something changed */ - if (((pSD->fbStyle & FB_POSITION) && - ((pSD->fbLastX != x) || (pSD->fbLastY != y))) || - ((pSD->fbStyle & FB_SIZE) && - ((pSD->fbLastWidth != width) || (pSD->fbLastHeight != height)))) -#endif /* NOTDONE */ - { pSD->fbLastX = x; pSD->fbLastY = y; pSD->fbLastWidth = width; @@ -557,7 +549,6 @@ void UpdateFeedbackInfo (WmScreenData *pSD, int x, int y, unsigned int width, un UpdateFeedbackText (pSD, x, y, width, height); PaintFeedbackWindow(pSD); - } } -- 2.25.1