comparison src/dialog-msw.c @ 288:e11d67e05968 r21-0b42

Import from CVS: tag r21-0b42
author cvs
date Mon, 13 Aug 2007 10:35:54 +0200
parents 57709be46d1b
children c9fe270a4101
comparison
equal deleted inserted replaced
287:13a0bd77a29d 288:e11d67e05968
140 VOID_TO_LISP (data, GetWindowLong (hwnd, DWL_USER)); 140 VOID_TO_LISP (data, GetWindowLong (hwnd, DWL_USER));
141 141
142 assert (w_param >= ID_ITEM_BIAS 142 assert (w_param >= ID_ITEM_BIAS
143 && w_param < XVECTOR_LENGTH (XCDR (data)) + ID_ITEM_BIAS); 143 && w_param < XVECTOR_LENGTH (XCDR (data)) + ID_ITEM_BIAS);
144 144
145 get_callback (XVECTOR_DATA (XCDR (data)) [w_param - ID_ITEM_BIAS], 145 get_gui_callback (XVECTOR_DATA (XCDR (data)) [w_param - ID_ITEM_BIAS],
146 &fn, &arg); 146 &fn, &arg);
147 enqueue_misc_user_event (XCAR (data), fn, arg); 147 mswindows_enqueue_misc_user_event (XCAR (data), fn, arg);
148 148
149 DestroyWindow (hwnd); 149 DestroyWindow (hwnd);
150 } 150 }
151 break; 151 break;
152 152
172 uni_string, sizeof(WCHAR) * (length + 1)); 172 uni_string, sizeof(WCHAR) * (length + 1));
173 Dynarr_add_many (dynarr, uni_string, sizeof(WCHAR) * length); 173 Dynarr_add_many (dynarr, uni_string, sizeof(WCHAR) * length);
174 } 174 }
175 175
176 /* Given button TEXT, return button width in DLU */ 176 /* Given button TEXT, return button width in DLU */
177 static INLINE unsigned int 177 static inline unsigned int
178 button_width (Lisp_Object text) 178 button_width (Lisp_Object text)
179 { 179 {
180 unsigned int width = X_DLU_PER_CHAR * XSTRING_CHAR_LENGTH (text); 180 unsigned int width = X_DLU_PER_CHAR * XSTRING_CHAR_LENGTH (text);
181 return max (X_MIN_BUTTON, width); 181 return max (X_MIN_BUTTON, width);
182 } 182 }