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

dtprintinfo: Use 64-bit values for XtVaGetValues() pointers

Browse Source 
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 *).
This commit is contained in:
Marcin Cieslak
2012-09-24 03:15:03 +02:00
committed by Jon Trulson
parent fc0f1ff697
commit df1da3432e
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtprintinfo/libUI/MotifUI/DtDND.C
View File

@@ -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;

7
cde/programs/dtprintinfo/libUI/MotifUI/Icon.c
View File

@@ -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;