Current state of my dtmail work.

Mostly #ifdefs and casts; also, do not redefine strcasestr().  This will
probably be needed for Linux too when compiling without -fpermissive.
This commit is contained in:
Pascal Stumpf
2012-08-11 13:57:26 +02:00
committed by Jon Trulson
parent 7c3a972d32
commit e3ad7e24e3
23 changed files with 75 additions and 57 deletions

View File

@@ -325,7 +325,7 @@ DmxPrintSetup::createPrintSetupDialog (Widget parent)
widgets->dtprint_setup,
XmNhelpCallback,
HelpCB,
DTMAILPRINTSETUPDIALOG);
(void *)DTMAILPRINTSETUPDIALOG);
XtAddCallback(
widgets->dtprint_setup,

View File

@@ -728,6 +728,7 @@ FindDialog::compareMessage(DtMailMessageHandle handle)
return(found);
}
#if !defined(CSRG_BASED)
//
// See if string 'toFind' is anyware in string 'str'.
// A case-insensitive version of strstr().
@@ -762,6 +763,7 @@ strcasestr(const char *str, const char *toFind)
}
return(result);
}
#endif
Boolean
FindDialog::compareHeader(DtMailEnv & error,

View File

@@ -65,7 +65,7 @@
#include <X11/IntrinsicP.h> // Include for moving X location of titles
extern force( Widget );
extern int force( Widget );
MsgScrollingList::MsgScrollingList(
RoamMenuWindow *menuwindow,

View File

@@ -70,7 +70,7 @@
#include <unistd.h>
#include <wchar.h>
#if defined(USL) || defined(__uxp__) || defined(linux)
#if defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
#define wcswcs wcsstr
#include <wctype.h> // iswspace is defined in this header on USL */
#endif
@@ -2015,7 +2015,7 @@ char *formatPropPair(char * key, void * data)
int m_size;
if (data == NULL)
data = "";
data = (void *)"";
// figure out whitespace for formatting
// assume 13 for normal sized alias name

View File

@@ -143,7 +143,7 @@ extern XtPointer _XmStringUngenerate (
#include <sys/file.h>
extern forceUpdate( Widget );
extern int forceUpdate( Widget );
RoamCmd::RoamCmd
(char *name, char *label, int active, RoamMenuWindow *window)
@@ -1548,7 +1548,7 @@ MoveCopyCmd::doit()
_copy_button,
XmNhelpCallback,
HelpCB,
"dtmailViewmainWindowWork-AreapanedWform2RowColumnMoveCopy");
(void *)"dtmailViewmainWindowWork-AreapanedWform2RowColumnMoveCopy");
XtAddCallback(
_copy_button,
XmNactivateCallback,

View File

@@ -48,7 +48,7 @@
#include <Xm/Xm.h>
#include <Xm/MessageB.h>
#include <assert.h>
extern forceUpdate( Widget );
extern int forceUpdate( Widget );
RoamInterruptibleCmd::RoamInterruptibleCmd ( char *name,

View File

@@ -1374,7 +1374,7 @@ SendMsgDialog::createWorkArea ( Widget parent )
printHelpId("form", _main_form);
/* add help callback */
XtAddCallback(_main_form, XmNhelpCallback, HelpCB, DTMAILCOMPOSEWINDOW);
XtAddCallback(_main_form, XmNhelpCallback, HelpCB, (void *)DTMAILCOMPOSEWINDOW);
XtVaSetValues(_main_form, XmNallowResize, True, NULL);

View File

@@ -398,6 +398,7 @@ Sort::sortMessages(MsgScrollingList *displayList,
#define Record(i) (base + (width * (i)))
#define Link(i) (*((int *) (Record(i) + offset)))
int
Sort::_msort (char * base,
int nel,
int width,