projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nsgml: Resolve symbol collision when building with SunStudio 12.1
[oweals/cde.git]
/
cde
/
programs
/
dtfile
/
ChangeDirP.c
diff --git
a/cde/programs/dtfile/ChangeDirP.c
b/cde/programs/dtfile/ChangeDirP.c
index b24b30416f447617b8307a4c6b725af4128ba66c..cbe885e222622454eb64b5553b809acfe8adff7e 100644
(file)
--- a/
cde/programs/dtfile/ChangeDirP.c
+++ b/
cde/programs/dtfile/ChangeDirP.c
@@
-16,7
+16,7
@@
* details.
*
* You should have received a copy of the GNU Lesser General Public
* details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with these librar
ar
ies and programs; if not, write
+ * License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
@@
-61,9
+61,11
@@
#include <limits.h>
#include <Xm/Xm.h>
#include <Xm/XmP.h>
#include <limits.h>
#include <Xm/Xm.h>
#include <Xm/XmP.h>
+#include <Xm/DrawP.h>
#include <Xm/TextFP.h>
#include <Xm/PushBG.h>
#include <Xm/DragDrop.h>
#include <Xm/TextFP.h>
#include <Xm/PushBG.h>
#include <Xm/DragDrop.h>
+#include <Xm/RowColumn.h>
#include <Dt/Icon.h>
#include <Dt/IconP.h>
#include <Dt/DtNlUtils.h>
#include <Dt/Icon.h>
#include <Dt/IconP.h>
#include <Dt/DtNlUtils.h>
@@
-302,7
+304,7
@@
ShowChangeDirDialog(
if (w)
{
if (w)
{
- if((
int
)client_data == FM_POPUP)
+ if((
XtArgVal
)client_data == FM_POPUP)
mbar = XtParent(w);
else
mbar = (Widget) XmGetPostedFromWidget(XtParent(w));
mbar = XtParent(w);
else
mbar = (Widget) XmGetPostedFromWidget(XtParent(w));
@@
-602,7
+604,7
@@
CurrentDirDropCallback(
/************************************************************************
*
* CurrentDirIconCallback
/************************************************************************
*
* CurrentDirIconCallback
- * Callback function invoked upon an action occuring on an icon.
+ * Callback function invoked upon an action occur
r
ing on an icon.
*
************************************************************************/
*
************************************************************************/
@@
-790,7
+792,7
@@
GetStatusMsg(
file_mgr_data->busy_status == busy_readdir)
{
if (file_mgr_data->busy_detail == 0)
file_mgr_data->busy_status == busy_readdir)
{
if (file_mgr_data->busy_detail == 0)
- sprintf (buf, (GETMESSAGE(3,5, "Reading ...")));
+ sprintf (buf,
"%s",
(GETMESSAGE(3,5, "Reading ...")));
else if (file_mgr_data->busy_detail == 1)
sprintf (buf, (GETMESSAGE(3,11, "%d Item(s)...")),
file_mgr_data->busy_detail);
else if (file_mgr_data->busy_detail == 1)
sprintf (buf, (GETMESSAGE(3,11, "%d Item(s)...")),
file_mgr_data->busy_detail);