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

XPM: Replace calls to XmeXpm*() with regular Xpm*()

Browse Source 
This is no longer needed on modern Motif's.
This commit is contained in:
Jon Trulson
2018-06-08 18:28:23 -06:00
parent 59b83865ef
commit 825a504a11
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cde/lib/DtSvc/DtXpm/xpm.c
View File

@@ -49,7 +49,7 @@ int _DtXpmCreatePixmapFromData(Display *display,
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
return XmeXpmCreatePixmapFromData(display, d, data,
return XpmCreatePixmapFromData(display, d, data,
pixmap_return, shapemask_return,
attributes);
}
@@ -61,7 +61,7 @@ int _DtXpmReadFileToPixmap(Display *display,
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
return XmeXpmReadFileToPixmap(display, d, filename,
return XpmReadFileToPixmap(display, d, filename,
pixmap_return, shapemask_return,
attributes);
}
@@ -72,7 +72,7 @@ int _DtXpmWriteFileFromPixmap(Display *display,
Pixmap shapemask,
XpmAttributes *attributes)
{
return XmeXpmWriteFileFromPixmap(display, filename,
return XpmWriteFileFromPixmap(display, filename,
pixmap, shapemask,
attributes);
}
@@ -83,7 +83,7 @@ int _DtXpmReadFileToImage(Display *display,
XImage **shapeimage_return,
XpmAttributes *attributes)
{
return XmeXpmReadFileToImage(display, filename,
return XpmReadFileToImage(display, filename,
image_return, shapeimage_return,
attributes);
}
@@ -94,12 +94,12 @@ int _DtXpmWriteFileFromImage(Display *display,
XImage *shapeimage,
XpmAttributes *attributes)
{
return XmeXpmWriteFileFromImage(display, filename,
return XpmWriteFileFromImage(display, filename,
image, shapeimage,
attributes);
}
void _DtXpmFreeAttributes(XpmAttributes *attributes)
{
XmeXpmFreeAttributes(attributes);
XpmFreeAttributes(attributes);
}

6
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
View File

@@ -1115,7 +1115,7 @@ WindowSystem::default_pixmap (Dimension *width, Dimension *height)
XpmAttributes xpm_attr ;
xpm_attr.valuemask = 0 ;
XmeXpmCreatePixmapFromData(f_display,
XpmCreatePixmapFromData(f_display,
XtWindow((Widget)toplevel()),
(char**)graphic_unavailable_data,
&temp_pixmap,
@@ -1175,7 +1175,7 @@ WindowSystem::detached_pixmap(Dimension *width, Dimension *height)
XpmAttributes xpm_attr;
xpm_attr.valuemask = 0 ;
int status = XmeXpmCreatePixmapFromData(f_display,
int status = XpmCreatePixmapFromData(f_display,
XtWindow((Widget)toplevel()),
(char**)detached_pixmap_data,
&f_detached_pixmap,
@@ -1217,7 +1217,7 @@ WindowSystem::read_pixmap(const char *pname,
status = xpm_lib().ReadFileToPixmap (f_display, XtWindow ((Widget)toplevel()),
fname, &pixmap, NULL, &xpm_attributes);
#else
status = XmeXpmReadFileToPixmap (f_display, XtWindow ((Widget)toplevel()),
status = XpmReadFileToPixmap (f_display, XtWindow ((Widget)toplevel()),
fname, &pixmap, NULL, &xpm_attributes);
#endif