Mercurial > dwindows

changeset 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 c3c5d8e36aa3
files dw.def dw.h dwtest.c dww.def gtk/dw.c mac/dw.c os2/dw.c win/dw.c
diffstat 8 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/dw.def	Tue Mar 09 05:58:52 2004 +0000
+++ b/dw.def	Fri Mar 12 23:47:37 2004 +0000
@@ -149,7 +149,7 @@
   dw_screen_width                        @250
   dw_screen_height                       @251
 
-  dw_color_depth                         @260
+  dw_color_depth_get                     @260
   dw_color_foreground_set                @261
   dw_color_background_set                @262
 
@@ -225,7 +225,7 @@
   dw_tree_get_title                      @381
   dw_tree_get_parent                     @382
 
-  dw_font_text_extents                   @385
+  dw_font_text_extents_get               @385
 
   dw_slider_new                          @390
   dw_slider_get_pos                      @391
--- a/dw.h	Tue Mar 09 05:58:52 2004 +0000
+++ b/dw.h	Fri Mar 12 23:47:37 2004 +0000
@@ -1015,7 +1015,7 @@
 void API dw_taskbar_delete(HWND handle, unsigned long icon);
 int API dw_screen_width(void);
 int API dw_screen_height(void);
-unsigned long API dw_color_depth(void);
+unsigned long API dw_color_depth_get(void);
 HWND API dw_notebook_new(unsigned long id, int top);
 unsigned long API dw_notebook_page_new(HWND handle, unsigned long flags, int front);
 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid);
@@ -1057,7 +1057,7 @@
 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2);
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height);
 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text);
-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);
 void API dw_flush(void);
 void API dw_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc);
 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth);
--- a/dwtest.c	Tue Mar 09 05:58:52 2004 +0000
+++ b/dwtest.c	Fri Mar 12 23:47:37 2004 +0000
@@ -389,7 +389,7 @@
 int DWSIGNAL configure_event(HWND hwnd, int width, int height, void *data)
 {
 	HPIXMAP old1 = text1pm, old2 = text2pm;
-	int depth = dw_color_depth();
+	int depth = dw_color_depth_get();
 
 	rows = height / font_height;
 	cols = width / font_width;
@@ -580,7 +580,7 @@
 
 void text_add(void)
 {
-	int depth = dw_color_depth();
+	int depth = dw_color_depth_get();
 	HWND vscrollbox;
 
 	/* create a box to pack into the notebook page */
@@ -596,7 +596,7 @@
 	/* create render box for number pixmap */
 	textbox1 = dw_render_new( 100 );
 	dw_window_set_font(textbox1, FIXEDFONT);
-	dw_font_text_extents(textbox1, NULL, "(g", &font_width, &font_height);
+	dw_font_text_extents_get(textbox1, NULL, "(g", &font_width, &font_height);
 	font_width = font_width / 2;
 	vscrollbox = dw_box_new(BOXVERT, 0);
 	dw_box_pack_start(vscrollbox, textbox1, font_width*width1, font_height*rows, FALSE, TRUE, 0);
--- a/dww.def	Tue Mar 09 05:58:52 2004 +0000
+++ b/dww.def	Fri Mar 12 23:47:37 2004 +0000
@@ -146,7 +146,7 @@
   dw_screen_width                        @250
   dw_screen_height                       @251
 
-  dw_color_depth                         @260
+  dw_color_depth_get                         @260
   dw_color_foreground_set                @261
   dw_color_background_set                @262
 
@@ -222,7 +222,7 @@
   dw_tree_get_title                      @381
   dw_tree_get_parent                     @382
 
-  dw_font_text_extents                   @385
+  dw_font_text_extents_get                   @385
 
   dw_slider_new                          @390
   dw_slider_get_pos                      @391
--- a/gtk/dw.c	Tue Mar 09 05:58:52 2004 +0000
+++ b/gtk/dw.c	Fri Mar 12 23:47:37 2004 +0000
@@ -1295,7 +1295,7 @@
 	text_height = 0;
 	stext = dw_text_new(outbuf, 0);
 	dw_window_set_style(stext, DW_DT_WORDBREAK, DW_DT_WORDBREAK);
-	dw_font_text_extents(stext, NULL, outbuf, &width, &height);
+	dw_font_text_extents_get(stext, NULL, outbuf, &width, &height);
 	height = height+3;
 	if(width < text_width)
 		text_height = height*2;
@@ -5871,7 +5871,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 dw_font_text_extents(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
+void dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
 {
 	int _locked_by_me = FALSE;
 #if GTK_MAJOR_VERSION > 1
@@ -6659,7 +6659,7 @@
 }
 
 /* This should return the current color depth */
-unsigned long dw_color_depth(void)
+unsigned long dw_color_depth_get(void)
 {
 	int retval;
 	int _locked_by_me = FALSE;
--- a/mac/dw.c	Tue Mar 09 05:58:52 2004 +0000
+++ b/mac/dw.c	Fri Mar 12 23:47:37 2004 +0000
@@ -1510,7 +1510,7 @@
 }
 
 /* This should return the current color depth */
-unsigned long API dw_color_depth(void)
+unsigned long API dw_color_depth_get(void)
 {
 	return 0;
 }
@@ -2499,7 +2499,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)
 {
 }
 
--- 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];
--- a/win/dw.c	Tue Mar 09 05:58:52 2004 +0000
+++ b/win/dw.c	Fri Mar 12 23:47:37 2004 +0000
@@ -880,7 +880,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);
 		}
 
@@ -1247,7 +1247,7 @@
 						GetWindowText(handle, tmpbuf, 1023);
 
 						/* Figure out how big the text is */
-						dw_font_text_extents(handle, 0, tmpbuf, 0, &textheight);
+						dw_font_text_extents_get(handle, 0, tmpbuf, 0, &textheight);
 
 						diff = (total - textheight) / 2;
 
@@ -5033,7 +5033,7 @@
 }
 
 /* This should return the current color depth */
-unsigned long API dw_color_depth(void)
+unsigned long API dw_color_depth_get(void)
 {
 	int bpp;
 	HDC hdc = GetDC(HWND_DESKTOP);
@@ -7357,7 +7357,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)
 {
 	HDC hdc;
 	int mustdelete = 0;