Mercurial > hg > xemacs-beta

comparison src/events.c @ 5055:79564cbad5f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify assertion in events.c so it will build under Visual Studio 6
author Vin Shelton <acs@xemacs.org>
date Sun, 21 Feb 2010 23:20:44 -0500
parents 92dc90c0bb40
children 2a462149bd6a a48ef26d87ee
comparison
equal deleted inserted replaced
5054:24372c7e0e8f 5055:79564cbad5f3
2132 /* #### pixel_to_glyph_translation() sometimes returns garbage... 2132 /* #### pixel_to_glyph_translation() sometimes returns garbage...
2133 The word has type Lisp_Type_Record (presumably meaning `extent') but the 2133 The word has type Lisp_Type_Record (presumably meaning `extent') but the
2134 pointer points to random memory, often filled with 0, sometimes not. 2134 pointer points to random memory, often filled with 0, sometimes not.
2135 */ 2135 */
2136 /* #### Chuck, do we still need this crap? */ 2136 /* #### Chuck, do we still need this crap? */
2137 #ifdef HAVE_TOOLBARS
2137 assert (NILP (ret_obj1) || GLYPHP (ret_obj1) 2138 assert (NILP (ret_obj1) || GLYPHP (ret_obj1)
2138 #ifdef HAVE_TOOLBARS 2139 || TOOLBAR_BUTTONP (ret_obj1));
2139 || TOOLBAR_BUTTONP (ret_obj1) 2140 #else
2141 assert (NILP (ret_obj1) || GLYPHP (ret_obj1));
2140 #endif 2142 #endif
2141 );
2142 assert (NILP (ret_obj2) || EXTENTP (ret_obj2) || CONSP (ret_obj2)); 2143 assert (NILP (ret_obj2) || EXTENTP (ret_obj2) || CONSP (ret_obj2));
2143 2144
2144 if (char_x) 2145 if (char_x)
2145 *char_x = ret_x; 2146 *char_x = ret_x;
2146 if (char_y) 2147 if (char_y)