debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable all code related to libXp

Browse Source 
deprecated and mostly no longer included on current OSes
This commit is contained in:
Peter Howkins
2016-04-20 20:17:22 +01:00
parent b251a15844
commit 2ea057d511
54 changed files with 302 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/programs/dtcm/dtcm/print.c
View File

@@ -38,7 +38,9 @@
#include <Xm/Form.h>
#include <Xm/LabelG.h>
#include <Xm/DialogS.h>
#if 0 && defined(PRINTING_SUPPORTED)
#include <Xm/Print.h>
#endif /* PRINTING_SUPPORTED */
#include <Xm/Protocols.h>
#include <Xm/PushBG.h>
#include <Xm/SeparatoG.h>
@@ -872,7 +874,7 @@ clearSetupData(_DtCmPrintData *pd)
static void
createPrintShell(Calendar *c)
{
#if defined(PRINTING_SUPPORTED)
#if 0 && defined(PRINTING_SUPPORTED)
_DtCmPrintData *pd = (_DtCmPrintData *)c->print_data;
#ifdef GR_DEBUG
@@ -1254,7 +1256,7 @@ report_error(Calendar *c, char *title, char *errText)
static void
pdm_notify_cb(Widget w, XtPointer uData, XtPointer cbData)
{
#if defined(PRINTING_SUPPORTED)
#if 0 && defined(PRINTING_SUPPORTED)
XmPrintShellCallbackStruct *cbStruct =
(XmPrintShellCallbackStruct *)cbData;
Calendar *c = (Calendar *)uData;
@@ -1332,7 +1334,7 @@ print_cb(Widget w, XtPointer data, XtPointer cbDataP)
static void
print_setup_cb(Widget w, XtPointer uData, XtPointer cbData)
{
#if defined(PRINTING_SUPPORTED)
#if 0 && defined(PRINTING_SUPPORTED)
Calendar *c = (Calendar *)uData;
_DtCmPrintData *pd = (_DtCmPrintData *)c->print_data;
DtPrintSetupCallbackStruct *cbStruct =

16
cde/programs/dtcm/dtcm/x_graphics.c
View File

@@ -57,12 +57,16 @@
#include "print.h"
#include <X11/Intrinsic.h>
#if 0 && defined(PRINTING_SUPPORTED)
#include <X11/extensions/Print.h>
#endif /* PRINTING_SUPPORTED */
#include <Xm/Xm.h>
#include <Xm/DialogS.h>
#include <Xm/DrawingA.h>
#if 0 && defined(PRINTING_SUPPORTED)
#include <Xm/Print.h>
#endif /* PRINTING_SUPPORTED */
#define XOS_USE_XT_LOCKING
#define X_INCLUDE_TIME_H
@@ -497,8 +501,10 @@ typedef struct _CMGraphicsInfo
static void local_dayname(Calendar *, char **, int);
static void local_dayname3(Calendar *, char **, int);
static char *get_report_type_string(CMGraphicsInfo *);
#if 0 && defined(PRINTING_SUPPORTED)
static void filePrintDoneCB(Display *, XPContext, XPGetDocStatus,
XPointer);
#endif /* PRINTING_SUPPORTED */
static void filePrintReportStatus(Calendar *, Boolean);
static void showBadAllocError(Calendar *);
@@ -2089,6 +2095,7 @@ get_report_type_string(CMGraphicsInfo *gInfo)
return reportStrs[reportType];
}
#if 0 && defined(PRINTING_SUPPORTED)
static void
filePrintDoneCB(Display *dsp, XPContext context, XPGetDocStatus status,
XPointer uData)
@@ -2103,6 +2110,7 @@ filePrintDoneCB(Display *dsp, XPContext context, XPGetDocStatus status,
else
filePrintReportStatus(c, (status == XPGetDocFinished));
}
#endif /* PRINTING_SUPPORTED */
static void
filePrintReportStatus(Calendar *c, Boolean ok)
@@ -2228,7 +2236,7 @@ x_open_file(Calendar *c)
NULL, 0);
#endif
#if defined(PRINTING_SUPPORTED)
#if 0 && defined(PRINTING_SUPPORTED)
#ifdef GR_DEBUG
if (!inDebugMode(c))
@@ -2372,7 +2380,9 @@ x_print_file(void *gInfoP, Calendar *c)
if (!inDebugMode(c))
#endif
{
#if 0 && defined(PRINTING_SUPPORTED)
XpEndJob(dsp);
#endif /* PRINTING_SUPPORTED */
/* Make sure we know about a BadAlloc if it happens. */
XSync(XtDisplay(gInfo->drawingArea), FALSE);
@@ -2410,6 +2420,7 @@ x_init_printer(void *gInfoP, short orientation)
int inchWd;
Dimension daWd, daHt;
#if 0 && defined(PRINTING_SUPPORTED)
#ifdef GR_DEBUG
if (inDebugMode(gInfo->c))
{
@@ -2419,6 +2430,7 @@ x_init_printer(void *gInfoP, short orientation)
else
#endif
XpStartPage(XtDisplay(w), XtWindow(XtParent(w)));
#endif /* PRINTING_SUPPORTED */
/* XpStartPage() sets the shell width/height correctly. */
nargs = 0;
@@ -2943,7 +2955,9 @@ x_finish_printer(void *gInfoP)
tmpSpin(w);
else
#endif
#if 0 && defined(PRINTING_SUPPORTED)
XpEndPage(XtDisplay(w));
#endif /* PRINTING_SUPPORTED */
}
void