[libXaw PATCH] Remove more Xaw8 remnants
Julien Cristau
jcristau at debian.org
Wed Nov 25 05:03:18 PST 2009
!defined(OLDXAW) && !defined(XAW7) was only true for Xaw8, as far as I
can tell.
The Print.h and PrintSP.h headers were already removed from the build
system, but remained in git unused.
---
include/X11/Xaw/Print.h | 132 --------------------------------------------
include/X11/Xaw/PrintSP.h | 135 ---------------------------------------------
src/AllWidgets.c | 6 --
src/sharedlib.c | 8 ---
4 files changed, 0 insertions(+), 281 deletions(-)
delete mode 100644 include/X11/Xaw/Print.h
delete mode 100644 include/X11/Xaw/PrintSP.h
diff --git a/include/X11/Xaw/Print.h b/include/X11/Xaw/Print.h
deleted file mode 100644
index 7946e8a..0000000
--- a/include/X11/Xaw/Print.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* $Xorg: Print.h,v 1.1 2003/07/11 19:46:06 gisburn Exp $ */
-/******************************************************************************
- ******************************************************************************
- **
- ** (c) Copyright 2003 Danny Backx <danny.backx at skynet.be>
- ** (c) Copyright 2003-2004 Roland Mainz <roland.mainz at nrubsig.org>
- **
- ** Permission is hereby granted, free of charge, to any person obtaining a copy
- ** of this software and associated documentation files (the "Software"), to deal
- ** in the Software without restriction, including without limitation the rights
- ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- ** copies of the Software, and to permit persons to whom the Software is
- ** furnished to do so, subject to the following conditions:
- **
- ** The above copyright notice and this permission notice shall be included in
- ** all copies or substantial portions of the Software.
- **
- ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- ** COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- ** IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- ** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- **
- ** Except as contained in this notice, the names of the copyright holders shall
- ** not be used in advertising or otherwise to promote the sale, use or other
- ** dealings in this Software without prior written authorization from said
- ** copyright holders.
- **
- ******************************************************************************
- *****************************************************************************/
-
-
-#ifndef _XAW_PRINT_H
-#define _XAW_PRINT_H 1
-
-#include <X11/extensions/Print.h>
-
-/* Resources:
- NOT WRITTEN YET
-*/
-
-/* XawPrintConfigureLayoutMode - define how the shell resizes/moves itself
- * to match the paper size
- * Values:
- * - XawPrintLAYOUTMODE_NONE
- * do nothing
- * - XawPrintLAYOUTMODE_PAGESIZE
- * set width/height to page size
- * (this is the default (mainly for compatibilty to XmPrintShell))
- * - XawPrintLAYOUTMODE_DRAWABLEAREA
- * set x/y/width/height to drawable area of pag
- */
-typedef
-enum
-{
- XawPrintLAYOUTMODE_NONE,
- XawPrintLAYOUTMODE_PAGESIZE,
- XawPrintLAYOUTMODE_DRAWABLEAREA
-} XawPrintConfigureLayoutMode;
-
-
-#define XawNstartJobCallback "startJobCallback"
-#define XawNendJobCallback "endJobCallback"
-#define XawNdocSetupCallback "docSetupCallback"
-#define XawNpageSetupCallback "pageSetupCallback"
-#define XawNlayoutMode "layoutMode"
-#define XawCLayoutMode "LayoutMode"
-#define XawNminX "minX"
-#define XawCMinX "MinX"
-#define XawNminY "minY"
-#define XawCMinY "MinY"
-#define XawNmaxX "maxX"
-#define XawCMaxX "MaxX"
-#define XawNmaxY "maxY"
-#define XawCMaxY "MaxY"
-#define XawNcurrDocNumInJob "currDocNumInJob"
-#define XawCCurrDocNumInJob "CurrDocNumInJob"
-#define XawNcurrPageNumInDoc "currPageNumInDoc"
-#define XawCCurrPageNumInDoc "CurrPageNumInDoc"
-#define XawNcurrPageNumInJob "currPageNumInJob"
-#define XawCCurrPageNumInJob "CurrPageNumInJob"
-#define XawNdefaultPixmapResolution "defaultPixmapResolution"
-#define XawCDefaultPixmapResolution "DefaultPixmapResolution"
-
-#define XawCR_START_JOB 70
-#define XawCR_END_JOB 71
-#define XawCR_DOC_SETUP 72
-#define XawCR_PAGE_SETUP 73
-
-typedef struct
-{
- int reason;
- XEvent *event;
- XPContext context;
- Boolean last_page_in_doc;
- Boolean last_page_in_job;
- XtPointer detail;
-} XawPrintShellCallbackStruct;
-
-extern WidgetClass xawPrintShellWidgetClass;
-typedef struct XawPrintShellRec *XawPrintShellWidget;
-
-/************************************************************
- *
- * Public Functions.
- *
- ************************************************************/
-
-_XFUNCPROTOBEGIN
-
-/* Returns whether the widget passed in is a print shell or "print shell"-like
- * widget (e.g. print preview).
- * Note that this will return |True| for more classes than |XawPrintShell| in
- * the future (like for |XmPrintShell| etc.)
- */
-extern Boolean XawIsPrintShell(
-#if NeedFunctionPrototypes
- Widget w
-#endif
-);
-
-extern void XawPrintRedisplayWidget(
-#if NeedFunctionPrototypes
- Widget w /* Widget */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* !_XAW_PRINT_H */
-
diff --git a/include/X11/Xaw/PrintSP.h b/include/X11/Xaw/PrintSP.h
deleted file mode 100644
index e0aca27..0000000
--- a/include/X11/Xaw/PrintSP.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* $Xorg: PrintSP.h,v 1.1 2003/07/11 19:46:06 gisburn Exp $ */
-/******************************************************************************
- ******************************************************************************
- **
- ** (c) Copyright 2003 Danny Backx <danny.backx at skynet.be>
- ** (c) Copyright 2003-2004 Roland Mainz <roland.mainz at nrubsig.org>
- **
- ** Permission is hereby granted, free of charge, to any person obtaining a copy
- ** of this software and associated documentation files (the "Software"), to deal
- ** in the Software without restriction, including without limitation the rights
- ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- ** copies of the Software, and to permit persons to whom the Software is
- ** furnished to do so, subject to the following conditions:
- **
- ** The above copyright notice and this permission notice shall be included in
- ** all copies or substantial portions of the Software.
- **
- ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- ** COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- ** IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- ** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- **
- ** Except as contained in this notice, the names of the copyright holders shall
- ** not be used in advertising or otherwise to promote the sale, use or other
- ** dealings in this Software without prior written authorization from said
- ** copyright holders.
- **
- ******************************************************************************
- *****************************************************************************/
-
-#ifndef _XAW_PRINTSP_H
-#define _XAW_PRINTSP_H 1
-
-#include <X11/CoreP.h>
-#include <X11/ShellP.h>
-
-_XFUNCPROTOBEGIN
-
-/* New fields for the XawPrintShell widget class record */
-
-typedef struct {
- XtPointer extension; /* pointer to extension record */
-} XawPrintShellClassPart;
-
-typedef struct XawPrintShellClassRec {
- CoreClassPart core_class;
- CompositeClassPart composite_class;
- ShellClassPart shell_class;
- WMShellClassPart wm_shell_class;
- VendorShellClassPart vendor_shell_class;
- TopLevelShellClassPart top_level_shell_class;
- ApplicationShellClassPart application_shell_class;
- XawPrintShellClassPart print_shell_class;
-} XawPrintShellClassRec;
-
-extern XawPrintShellClassRec xawPrintShellClassRec;
-
-/* New fields for the XawPrint shell widget */
-
-typedef struct {
- XtCallbackList start_job_callback,
- end_job_callback,
- doc_setup_callback,
- page_setup_callback;
- XtEnum layoutmode; /* see XawPrintConfigureLayoutMode */
- unsigned short page_width,
- page_height;
- Dimension min_x,
- min_y,
- max_x,
- max_y;
- unsigned int curr_doc_num_in_job, /* Current document number in job */
- curr_page_num_in_doc, /* Current page number in doc */
- curr_page_num_in_job; /* Current page number in job */
- unsigned short default_pixmap_resolution;
- long print_resolution;
- Boolean last_page_in_doc;
- Boolean last_page_in_job;
-} XawPrintShellPart;
-
-typedef struct XawPrintShellRec {
- CorePart core;
- CompositePart composite;
- ShellPart shell;
- WMShellPart wm;
- VendorShellPart vendor;
- TopLevelShellPart topLevel;
- ApplicationShellPart application;
- XawPrintShellPart print;
-} XawPrintShellRec;
-extern WidgetClass xawPrintShellWidgetClass;
-
-#define PS_StartJobCallback(w) \
- (((XawPrintShellWidget) (w))->print.start_job_callback)
-#define PS_EndJobCallback(w) \
- (((XawPrintShellWidget) (w))->print.end_job_callback)
-#define PS_DocSetupCallback(w) \
- (((XawPrintShellWidget) (w))->print.doc_setup_callback)
-#define PS_PageSetupCallback(w) \
- (((XawPrintShellWidget) (w))->print.page_setup_callback)
-#define PS_LayoutMode(w) \
- (((XawPrintShellWidget) (w))->print.layoutmode)
-#define PS_PageWidth(w) \
- (((XawPrintShellWidget) (w))->print.page_width)
-#define PS_PageHeight(w) \
- (((XawPrintShellWidget) (w))->print.page_height)
-#define PS_MinX(w) \
- (((XawPrintShellWidget) (w))->print.min_x)
-#define PS_MinY(w) \
- (((XawPrintShellWidget) (w))->print.min_y)
-#define PS_MaxX(w) \
- (((XawPrintShellWidget) (w))->print.max_x)
-#define PS_MaxY(w) \
- (((XawPrintShellWidget) (w))->print.max_y)
-#define PS_CurrDocNumInJob(w) \
- (((XawPrintShellWidget) (w))->print.curr_doc_num_in_job)
-#define PS_CurrPageNumInDoc(w) \
- (((XawPrintShellWidget) (w))->print.curr_page_num_in_doc)
-#define PS_CurrPageNumInJob(w) \
- (((XawPrintShellWidget) (w))->print.curr_page_num_in_job)
-#define PS_DefaultPixmapResolution(w) \
- (((XawPrintShellWidget) (w))->print.default_pixmap_resolution)
-#define PS_PrintResolution(w) \
- (((XawPrintShellWidget) (w))->print.print_resolution)
-#define PS_LastPageInDoc(w) \
- (((XawPrintShellWidget) (w))->print.last_page_in_doc)
-#define PS_LastPageInJob(w) \
- (((XawPrintShellWidget) (w))->print.last_page_in_job)
-
-_XFUNCPROTOEND
-
-#endif /* !_XAW_PRINTSP_H */
-
diff --git a/src/AllWidgets.c b/src/AllWidgets.c
index 4d95887..3eb358f 100644
--- a/src/AllWidgets.c
+++ b/src/AllWidgets.c
@@ -71,9 +71,6 @@ extern WidgetClass treeWidgetClass;
extern WidgetClass vendorShellWidgetClass;
extern WidgetClass viewportWidgetClass;
extern WidgetClass wmShellWidgetClass;
-#if !defined(OLDXAW) && !defined(XAW7)
-extern WidgetClass xawPrintShellWidgetClass;
-#endif
XmuWidgetNode XawWidgetArray[] = {
{ "applicationShell", &applicationShellWidgetClass },
@@ -118,9 +115,6 @@ XmuWidgetNode XawWidgetArray[] = {
{ "vendorShell", &vendorShellWidgetClass },
{ "viewport", &viewportWidgetClass },
{ "wmShell", &wmShellWidgetClass },
-#if !defined(OLDXAW) && !defined(XAW7)
-{ "printShell", &xawPrintShellWidgetClass },
-#endif
};
int XawWidgetCount = XtNumber(XawWidgetArray);
diff --git a/src/sharedlib.c b/src/sharedlib.c
index d107f9f..fef4abc 100644
--- a/src/sharedlib.c
+++ b/src/sharedlib.c
@@ -62,9 +62,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xaw/TreeP.h>
#include <X11/VendorP.h>
#include <X11/Xaw/ViewportP.h>
-#if !defined(OLDXAW) && !defined(XAW7)
-#include <X11/Xaw/PrintSP.h>
-#endif
extern AsciiSinkClassRec asciiSinkClassRec;
WidgetClass asciiSinkObjectClass = (WidgetClass)&asciiSinkClassRec;
@@ -174,9 +171,4 @@ WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec;
extern ViewportClassRec viewportClassRec;
WidgetClass viewportWidgetClass = (WidgetClass)&viewportClassRec;
-#if !defined(OLDXAW) && !defined(XAW7)
-extern XawPrintShellClassRec xawPrintShellClassRec;
-WidgetClass xawPrintShellWidgetClass = (WidgetClass) &xawPrintShellClassRec;
-#endif
-
#endif /* SUNSHLIB */
--
1.6.5
More information about the xorg-devel
mailing list