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

Current state of my dtmail work.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtmail/MotifApp/InterruptibleCmd.C
View File

@@ -69,7 +69,7 @@
#include <Xm/MessageB.h>
#include <assert.h>
#if !defined(linux)
#if !defined(linux) && !defined(CSRG_BASED)
extern forceUpdate( Widget );
#endif

2
cde/programs/dtmail/MotifApp/MainWindow.C
View File

@@ -150,7 +150,7 @@ MainWindow::initialize( )
/* install callback */
// XtAddCallback(_main, XmNhelpCallback, HelpCB, helpId);
XtAddCallback(_main, XmNhelpCallback,
HelpCB, "_HOMETOPIC");
HelpCB, (void *)"_HOMETOPIC");
// Called derived class to create the work area

24
cde/programs/dtmail/MotifApp/MenuBar.C
View File

@@ -191,22 +191,22 @@ MenuBar::createPulldown (
helpId = XtName(*cascade);
if (helpId == "Mailbox") {
XtAddCallback(*cascade, XmNhelpCallback,
HelpCB, DTMAILCONTAINERMENUID);
HelpCB, (void *)DTMAILCONTAINERMENUID);
} else if (helpId == "Edit") {
XtAddCallback(*cascade, XmNhelpCallback,
HelpCB, DTMAILEDITMENUID);
HelpCB, (void *)DTMAILEDITMENUID);
} else if (helpId == "Message") {
XtAddCallback(*cascade, XmNhelpCallback,
HelpCB, DTMAILMESSAGEMENUID);
HelpCB, (void *)DTMAILMESSAGEMENUID);
} else if (helpId == "Attachments") {
XtAddCallback(*cascade, XmNhelpCallback,
HelpCB, DTMAILATTACHMENUID);
HelpCB, (void *)DTMAILATTACHMENUID);
} else if (helpId == "View") {
XtAddCallback(*cascade, XmNhelpCallback,
HelpCB, DTMAILVIEWMENUID);
HelpCB, (void *)DTMAILVIEWMENUID);
} else if (helpId == "Compose") {
XtAddCallback(*cascade, XmNhelpCallback,
HelpCB, DTMAILCOMPOSEMENUID);
HelpCB, (void *)DTMAILCOMPOSEMENUID);
}
}
} else
@@ -323,22 +323,22 @@ MenuBar::createPulldown (
helpId = XtName(cascade);
if (helpId == "Mailbox") {
XtAddCallback(cascade, XmNhelpCallback,
HelpCB, DTMAILCONTAINERMENUID);
HelpCB, (void *)DTMAILCONTAINERMENUID);
} else if (helpId == "Edit") {
XtAddCallback(cascade, XmNhelpCallback,
HelpCB, DTMAILEDITMENUID);
HelpCB, (void *)DTMAILEDITMENUID);
} else if (helpId == "Message") {
XtAddCallback(cascade, XmNhelpCallback,
HelpCB, DTMAILMESSAGEMENUID);
HelpCB, (void *)DTMAILMESSAGEMENUID);
} else if (helpId == "Attachments") {
XtAddCallback(cascade, XmNhelpCallback,
HelpCB, DTMAILATTACHMENUID);
HelpCB, (void *)DTMAILATTACHMENUID);
} else if (helpId == "View") {
XtAddCallback(cascade, XmNhelpCallback,
HelpCB, DTMAILVIEWMENUID);
HelpCB, (void *)DTMAILVIEWMENUID);
} else if (helpId == "Compose") {
XtAddCallback(cascade, XmNhelpCallback,
HelpCB, DTMAILCOMPOSEMENUID);
HelpCB, (void *)DTMAILCOMPOSEMENUID);
}
} else
pulldown = _w;

2
cde/programs/dtmail/MotifApp/SelectFileCmd.C
View File

@@ -88,7 +88,7 @@ extern XtPointer _XmStringUngenerate (
}
extern forceUpdate( Widget );
extern int forceUpdate( Widget );
SelectFileCmd::SelectFileCmd (const char * name,
const char * label,