[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.h

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.34 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.36 by root, Tue Dec 4 14:50:44 2007 UTC

 #endif
 };
 #ifdef USE_XIM
 struct im_watcher : rxvt_watcher, callback<void (void)> {
-  template<class O, class M>
-  im_watcher (O object, M method)
-  : callback<void (void)> (object, method)
-  { }
   void start (rxvt_display *display)
   {
     display->reg (this);
   }
 };
 #endif
 struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)> {
   Window window;
-  template<class O, class M>
-  xevent_watcher (O object, M method)
-  : callback<void (XEvent &)> (object, method)
-  { }
   void start (rxvt_display *display, Window window)
   {
     this->window = window;
     display->reg (this);
   bool set (rxvt_screen *screen, const rgba &color);
   void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
 };
-#endif
+#if TRACE_PIXMAPS
+Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d);
+void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p);
+# define XCreatePixmap(dpy,r,w,h,d) trace_XCreatePixmap (__FILE__,__LINE__,dpy,r,w,h,d)
+# define XFreePixmap(dpy,p) trace_XFreePixmap (__FILE__,__LINE__,dpy,p)
+#endif
+#endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines