Mercurial > hg > xemacs-beta

diff src/dialog-msw.c @ 647:b39c14581166

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.
author ben
date Mon, 13 Aug 2001 04:46:48 +0000
parents af57a77cbc92
children fdefd0186b75
line wrap: on
line diff
--- a/src/dialog-msw.c	Wed Aug 08 12:15:04 2001 +0000
+++ b/src/dialog-msw.c	Mon Aug 13 04:46:48 2001 +0000
@@ -207,7 +207,7 @@
 	if (w_param != IDCANCEL) /* user pressed escape */
 	  {
 	    assert (w_param >= ID_ITEM_BIAS 
-		    && w_param
+		    && (EMACS_INT) w_param
 		    < XVECTOR_LENGTH (did->callbacks) + ID_ITEM_BIAS);
 	    
 	    get_gui_callback (XVECTOR_DATA (did->callbacks)
@@ -270,10 +270,10 @@
 }
 
 /* Given button TEXT, return button width in DLU */
-static unsigned int
+static int
 button_width (Lisp_Object text)
 {
-  unsigned int width = X_DLU_PER_CHAR * XSTRING_CHAR_LENGTH (text);
+  int width = X_DLU_PER_CHAR * XSTRING_CHAR_LENGTH (text);
   return max (X_MIN_BUTTON, width);
 }
 
@@ -286,16 +286,16 @@
 }
 
 
-#define ALIGN_TEMPLATE						\
-{								\
-  unsigned int slippage = Dynarr_length (template_) & 3;	\
-  if (slippage)							\
-    Dynarr_add_many (template_, &zeroes, slippage);		\
+#define ALIGN_TEMPLATE					\
+{							\
+  int slippage = Dynarr_length (template_) & 3;		\
+  if (slippage)						\
+    Dynarr_add_many (template_, &zeroes, slippage);	\
 }
 
 static struct
 {
-  int errmess;
+  DWORD errmess;
   char *errname;
 } common_dialog_errors[] =
 {
@@ -414,8 +414,8 @@
 {
   Lisp_Object_dynarr *dialog_items = Dynarr_new (Lisp_Object);
   unsigned_char_dynarr *template_ = Dynarr_new (unsigned_char);
-  unsigned int button_row_width = 0;
-  unsigned int text_width, text_height;
+  int button_row_width = 0;
+  int text_width, text_height;
   Lisp_Object question = Qnil, title = Qnil;
 
   int unbind_count = specpdl_depth ();