Mercurial > dwindows

comparison os2/dw.c @ 514:08d770271709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More function name changes for Rexx/DW compatibility.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 12 Mar 2004 23:47:37 +0000
parents 7755599311d4
children caa7ed17c132
comparison
equal deleted inserted replaced
513:7755599311d4 514:08d770271709
936 936
937 thisbox->grouppady = 0; 937 thisbox->grouppady = 0;
938 938
939 if(text) 939 if(text)
940 { 940 {
941 dw_font_text_extents(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady); 941 dw_font_text_extents_get(thisbox->grouphwnd, 0, text, NULL, &thisbox->grouppady);
942 dw_free(text); 942 dw_free(text);
943 } 943 }
944 944
945 if(thisbox->grouppady) 945 if(thisbox->grouppady)
946 thisbox->grouppady += 3; 946 thisbox->grouppady += 3;
4610 /* Try to load the bitmap from file */ 4610 /* Try to load the bitmap from file */
4611 if(pixmap) 4611 if(pixmap)
4612 _load_bitmap_file(file, tmp, &pixmap->hbm, &pixmap->hdc, &pixmap->hps, &pixmap->width, &pixmap->height); 4612 _load_bitmap_file(file, tmp, &pixmap->hbm, &pixmap->hdc, &pixmap->hps, &pixmap->width, &pixmap->height);
4613 4613
4614 /* Create a disabled style pixmap */ 4614 /* Create a disabled style pixmap */
4615 disabled = dw_pixmap_new(tmp, pixmap->width, pixmap->height, dw_color_depth()); 4615 disabled = dw_pixmap_new(tmp, pixmap->width, pixmap->height, dw_color_depth_get());
4616 dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0); 4616 dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
4617 4617
4618 fore = _foreground; 4618 fore = _foreground;
4619 dw_color_foreground_set(DW_CLR_PALEGRAY); 4619 dw_color_foreground_set(DW_CLR_PALEGRAY);
4620 lim = pixmap->width/2; 4620 lim = pixmap->width/2;
5286 { 5286 {
5287 return WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN); 5287 return WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN);
5288 } 5288 }
5289 5289
5290 /* This should return the current color depth */ 5290 /* This should return the current color depth */
5291 unsigned long API dw_color_depth(void) 5291 unsigned long API dw_color_depth_get(void)
5292 { 5292 {
5293 HDC hdc = WinOpenWindowDC(HWND_DESKTOP); 5293 HDC hdc = WinOpenWindowDC(HWND_DESKTOP);
5294 long colors; 5294 long colors;
5295 5295
5296 DevQueryCaps(hdc, CAPS_COLOR_BITCOUNT, 1, &colors); 5296 DevQueryCaps(hdc, CAPS_COLOR_BITCOUNT, 1, &colors);
7300 * pixmap: Handle to the pixmap. (choose only one of these) 7300 * pixmap: Handle to the pixmap. (choose only one of these)
7301 * text: Text to be queried. 7301 * text: Text to be queried.
7302 * width: Pointer to a variable to be filled in with the width. 7302 * width: Pointer to a variable to be filled in with the width.
7303 * height Pointer to a variable to be filled in with the height. 7303 * height Pointer to a variable to be filled in with the height.
7304 */ 7304 */
7305 void API dw_font_text_extents(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height) 7305 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
7306 { 7306 {
7307 HPS hps; 7307 HPS hps;
7308 POINTL aptl[TXTBOX_COUNT]; 7308 POINTL aptl[TXTBOX_COUNT];
7309 7309
7310 if(handle) 7310 if(handle)