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

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.59 by sf-exg, Sun Jun 3 15:50:22 2012 UTC vs.
Revision 1.61 by root, Mon Jun 4 15:18:52 2012 UTC

 #endif
 };
 /////////////////////////////////////////////////////////////////////////////
-#ifdef USE_XIM
+#if USE_XIM
 struct rxvt_xim : refcounted
 {
   void destroy ();
   rxvt_display *display;
   event_vec<xevent_watcher> xw;
   ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents);
   ev::io      x_ev    ; void x_cb     (ev::io      &w, int revents);
-#ifdef USE_XIM
+#if USE_XIM
   refcache<rxvt_xim> xims;
   vector<im_watcher *> imw;
   void im_change_cb ();
   void im_change_check ();
   {
     flush_ev.start ();
   }
   Atom atom (const char *name);
+  Pixmap get_pixmap_property (Atom property);
   void set_selection_owner (rxvt_term *owner, bool clipboard);
   void reg (xevent_watcher *w);
   void unreg (xevent_watcher *w);
-#ifdef USE_XIM
+#if USE_XIM
   void reg (im_watcher *w);
   void unreg (im_watcher *w);
   rxvt_xim *get_xim (const char *locale, const char *modifiers);
   void put_xim (rxvt_xim *xim);
 #endif
 };
-#ifdef USE_XIM
+#if USE_XIM
 struct im_watcher : rxvt_watcher, callback<void (void)>
 {
   void start (rxvt_display *display)
   {
     display->reg (this);

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