summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2007-08-28 10:14:02 +0000
committerJan Djärv <jan.h.d@swipnet.se>2007-08-28 10:14:02 +0000
commitcf0590c4514d90669f65437a72819f442db47dbb (patch)
tree7ef93ef60865cdee978d2e99196eb44186bdcdad
parentfface67742861c83f2e01e1d1847ba674fd31035 (diff)
downloademacs-cf0590c4514d90669f65437a72819f442db47dbb.tar.gz
Qrtl is new.
(parse_tool_bar_item): Handle :rtl keyword. (syms_of_keyboard): Intern :rtl keyword.
-rw-r--r--src/ChangeLog15
-rw-r--r--src/keyboard.c9
2 files changed, 23 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b402b1c7646..231f18dd312 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2007-08-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
+
+ * keyboard.c: Qrtl is new.
+ (parse_tool_bar_item): Handle :rtl keyword.
+ (syms_of_keyboard): Intern :rtl keyword.
+
+ * dispextern.h (enum tool_bar_item_idx): Add TOOL_BAR_ITEM_RTL_IMAGE.
+
+ * gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
+ so no Lisp code is executed.
+ (file_for_image, find_rtl_image): New functions.
+ (xg_get_image_for_pixmap): Use file_for_image
+ (update_frame_tool_bar): If direction is RTL, use RTL image if
+ defined. Use Gtk stock images if defined.
+
2007-08-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macterm.c (x_draw_composite_glyph_string_foreground): Draw rectangle
diff --git a/src/keyboard.c b/src/keyboard.c
index c542d291b46..adbbbcf85dd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7907,10 +7907,11 @@ static Lisp_Object tool_bar_item_properties;
static int ntool_bar_items;
-/* The symbols `tool-bar', and `:image'. */
+/* The symbols `tool-bar', `:image' and `:rtl'. */
extern Lisp_Object Qtool_bar;
Lisp_Object QCimage;
+Lisp_Object Qrtl;
/* Function prototypes. */
@@ -8196,6 +8197,9 @@ parse_tool_bar_item (key, item)
/* Value is either a single image specification or a vector
of 4 such specifications for the different button states. */
PROP (TOOL_BAR_ITEM_IMAGES) = value;
+ else if (EQ (key, Qrtl))
+ /* ':rtl STRING' */
+ PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value;
}
/* If got a filter apply it on binding. */
@@ -11223,6 +11227,9 @@ syms_of_keyboard ()
staticpro (&Qhelp_echo);
Qhelp_echo = intern ("help-echo");
+ staticpro (&Qrtl);
+ Qrtl = intern (":rtl");
+
staticpro (&item_properties);
item_properties = Qnil;