--- a/os2/dw.c	Tue Mar 09 05:58:52 2004 +0000
+++ b/os2/dw.c	Fri Mar 12 23:47:37 2004 +0000
@@ -938,7 +938,7 @@
 
 		if(text)
 		{
-			dw_font_text_extents(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady);
+			dw_font_text_extents_get(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady);
 			dw_free(text);
 		}
 
@@ -4612,7 +4612,7 @@
 			_load_bitmap_file(file, tmp, &pixmap->hbm, &pixmap->hdc, &pixmap->hps, &pixmap->width, &pixmap->height);
 
 		/* Create a disabled style pixmap */
-		disabled = dw_pixmap_new(tmp, pixmap->width, pixmap->height, dw_color_depth());
+		disabled = dw_pixmap_new(tmp, pixmap->width, pixmap->height, dw_color_depth_get());
 		dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
 
 		fore = _foreground;
@@ -5288,7 +5288,7 @@
 }
 
 /* This should return the current color depth */
-unsigned long API dw_color_depth(void)
+unsigned long API dw_color_depth_get(void)
 {
 	HDC hdc = WinOpenWindowDC(HWND_DESKTOP);
 	long colors;
@@ -7302,7 +7302,7 @@
  *       width: Pointer to a variable to be filled in with the width.
  *       height Pointer to a variable to be filled in with the height.
  */
-void API dw_font_text_extents(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
+void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
 {
 	HPS hps;
 	POINTL aptl[TXTBOX_COUNT];