From a73d4a04538dc0d9f6203f292c6103b5825287f3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Dec 2005 16:41:40 +0000 Subject: [PATCH] *** empty log message *** --- Changes | 4 ++++ src/callback.h | 16 ++++++++-------- src/menubar.C | 3 +-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Changes b/Changes index 9ae1a3be..314377b4 100644 --- a/Changes +++ b/Changes @@ -12,6 +12,10 @@ WISH: meta-tagging of data by regex/master process (my dream project) WISH: OnTheSpot editing, or maybe switch to miiiiiiif WISH: just for fun, do shade and tint with XRender. +6.2 + - replaced callback.h by a fixed version from gvpe that correctly + returns the callback result. Reported by darix. + 6.1 Tue Dec 27 13:23:40 CET 2005 - update iso8859-7 table (euro and drachma round-trip et al.). - fix a crash when the selection scrolls out of the scrollback diff --git a/src/callback.h b/src/callback.h index 168bfbbb..c1cde4d7 100644 --- a/src/callback.h +++ b/src/callback.h @@ -41,7 +41,7 @@ class callback0 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)()) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (); } }; @@ -84,7 +84,7 @@ class callback1 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1), A1 a1) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1); } }; @@ -127,7 +127,7 @@ class callback2 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1, A2), A1 a1, A2 a2) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1, a2); } }; @@ -170,7 +170,7 @@ class callback3 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1, A2, A3), A1 a1, A2 a2, A3 a3) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1, a2, a3); } }; @@ -213,7 +213,7 @@ class callback4 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4), A1 a1, A2 a2, A3 a3, A4 a4) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1, a2, a3, a4); } }; @@ -256,7 +256,7 @@ class callback5 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4, A5), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1, a2, a3, a4, a5); } }; @@ -299,7 +299,7 @@ class callback6 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4, A5, A6), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1, a2, a3, a4, a5, a6); } }; @@ -342,7 +342,7 @@ class callback7 { struct proxy : proxy_base { virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4, A5, A6, A7), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) + return (R)((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) (a1, a2, a3, a4, a5, a6, a7); } }; diff --git a/src/menubar.C b/src/menubar.C index babf7c7f..2b46bff5 100644 --- a/src/menubar.C +++ b/src/menubar.C @@ -2080,16 +2080,15 @@ rxvt_term::menubar_expose () if (x < ncol) { const char *str; - int ncol; unsigned int len; char title[256]; - ncol = (int)ncol; if (x < (ncol - (NARROWS + 1))) { ncol -= (NARROWS + 1); Arrows_x = Width2Pixel (ncol); } + draw_Arrows (0, +1); str = (CurrentBar -- 2.34.1