XtArgVal should be a type that encompasses XtPointer
and long integer types. In the X.org implementation
it is currently defined as (long).
Don't use (unsigned int *) instead of (Window *).
---
cde/programs/dtprintinfo/UI/DtDetailsLabel.C | 6 ++++--
cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C | 3 ++-
cde/programs/dtprintinfo/libUI/MotifUI/Icon.c | 7 ++++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cde/programs/dtprintinfo/UI/DtDetailsLabel.C
b/cde/programs/dtprintinfo/UI/DtDetailsLabel.C
index d830c67..a61d45b 100644
--- a/cde/programs/dtprintinfo/UI/DtDetailsLabel.C
+++ b/cde/programs/dtprintinfo/UI/DtDetailsLabel.C
@@ -55,9 +55,11 @@ DtDetailsLabel::DtDetailsLabel(MotifUI *parent)
MESSAGE(JobNumberL), MESSAGE(TimeL), MESSAGE(DateL));
bottom_label[1] = StringCreate(label);
+ XtArgVal arg;
Dimension highlight;
XtVaGetValues(parent->BaseWidget(),
- XmNhighlightThickness, &highlight, NULL);
+ XmNhighlightThickness, &arg, NULL);
+ highlight = (Dimension)arg;
int height = 21 + 2 * highlight;
blank_pixmap = XCreatePixmap(display, root, 1, height, depth);
blank_mask = XCreatePixmap(display, root, 1, height, 1);
@@ -73,7 +75,7 @@ DtDetailsLabel::DtDetailsLabel(MotifUI *parent)
XmString top_string = StringCreate(MESSAGE(Position1L));
XmString label_string = StringCreate(MESSAGE(JobNameL));
Widget p = XtParent(parent->BaseWidget());
- Pixel bg;
+ XtArgVal bg;
XtVaGetValues(p, XmNbackground, &bg, NULL);
_w = XtVaCreateManagedWidget("DtDetailsLabel", iconWidgetClass, p,
GuiNsuperNode, parent->BaseWidget(),
diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C
b/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C
index 4e0853b..a781bb4 100644
--- a/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C
+++ b/cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C
@@ -191,6 +191,7 @@ void DtDND::GetDragPixmaps()
Dimension height, width;
unsigned int w, h, junk;
+ Window junkwin;
XtVaGetValues(icon->BaseWidget(), XmNbackground, &bg, XmNforeground, &fg,
GuiNselectColor, &selectColor, XmNalignment, &alignment,
@@ -219,7 +220,7 @@ void DtDND::GetDragPixmaps()
icon->GetPixmaps(icon->BaseWidget(), iconFile, &tmp_pixmap, &tmp_mask);
if (tmp_pixmap && tmp_pixmap != XmUNSPECIFIED_PIXMAP)
{
- XGetGeometry(icon->display, tmp_pixmap, (Window *) &junk,
+ XGetGeometry(icon->display, tmp_pixmap, &junkwin,
(int *) &junk, (int *) &junk, &w, &h, &junk, &junk);
p_w = w;
p_h = h;
diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c
b/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c
index e4f9a19..123e816 100644
--- a/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c
+++ b/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c
@@ -454,7 +454,7 @@ IconClassRec iconClassRec =
},
{
/* icon_class record */
- (int) NULL, /* extension */
+ 0, /* extension */
}
};
@@ -1052,6 +1052,7 @@ CalculateSize(
)
{
unsigned int width, height, junk;
+ Window junkwin;
int x, y;
Boolean show_fields = False;
Dimension _width;
@@ -1060,7 +1061,7 @@ CalculateSize(
{
if (Pixmap(w) != XmUNSPECIFIED_PIXMAP)
{
- XGetGeometry(XtDisplay(w), Pixmap(w), (Window *) &junk,
+ XGetGeometry(XtDisplay(w), Pixmap(w), &junkwin,
(int *) &junk, (int *) &junk, &width, &height, &junk, &junk);
PixmapWidth(w) = (Dimension) width;
PixmapHeight(w) = (Dimension) height;
@@ -1361,7 +1362,7 @@ CalculateSize(
{
Dimension x_offset, y_offset;
- XGetGeometry(XtDisplay(w), StatePixmap(w), (Window *) &junk,
+ XGetGeometry(XtDisplay(w), StatePixmap(w), &junkwin,
(int *) &junk, (int *) &junk, &width, &height, &junk, &junk);
StatePixmapWidth(w) = (Dimension) width;
StatePixmapHeight(w) = (Dimension) height;
--
1.7.9.2
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
