Index: gtk/gtkcheckmenuitem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcheckmenuitem.c,v
retrieving revision 1.41
diff -u -b -B -p -r1.41 gtkcheckmenuitem.c
--- gtk/gtkcheckmenuitem.c	5 Oct 2002 01:51:16 -0000	1.41
+++ gtk/gtkcheckmenuitem.c	25 Oct 2002 21:48:37 -0000
@@ -355,6 +355,10 @@ gtk_real_check_menu_item_draw_indicator 
 
       width = 8;
       height = 8;
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
+	x = widget->allocation.x + widget->allocation.width - (GTK_CONTAINER (check_menu_item)->border_width +
+				  widget->style->xthickness + 2) - width;
+      else 
       x = widget->allocation.x + (GTK_CONTAINER (check_menu_item)->border_width +
 				  widget->style->xthickness + 2);
       y = widget->allocation.y + (widget->allocation.height - height) / 2;
Index: gtk/gtkimagemenuitem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkimagemenuitem.c,v
retrieving revision 1.17
diff -u -b -B -p -r1.17 gtkimagemenuitem.c
--- gtk/gtkimagemenuitem.c	11 Oct 2002 20:36:13 -0000	1.17
+++ gtk/gtkimagemenuitem.c	25 Oct 2002 21:48:37 -0000
@@ -245,8 +245,15 @@ gtk_image_menu_item_size_allocate (GtkWi
       width = image_menu_item->image->requisition.width;
       height = image_menu_item->image->requisition.height;
 
-      x = (GTK_CONTAINER (image_menu_item)->border_width +
-	   widget->style->xthickness) +
+      g_print ("toggle_size %d width %d\n", GTK_MENU_ITEM (image_menu_item)->toggle_size, width);
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
+	x = widget->allocation.width - GTK_CONTAINER (image_menu_item)->border_width -
+	  widget->style->xthickness - 
+	  GTK_MENU_ITEM (image_menu_item)->toggle_size +
+	  (GTK_MENU_ITEM (image_menu_item)->toggle_size - width) / 2;
+	else
+	  x = GTK_CONTAINER (image_menu_item)->border_width +
+	       widget->style->xthickness +
         (GTK_MENU_ITEM (image_menu_item)->toggle_size - width) / 2;
       y = (widget->allocation.height - height) / 2;
 
Index: gtk/gtkmenuitem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmenuitem.c,v
retrieving revision 1.89
diff -u -b -B -p -r1.89 gtkmenuitem.c
--- gtk/gtkmenuitem.c	20 Oct 2002 22:29:57 -0000	1.89
+++ gtk/gtkmenuitem.c	25 Oct 2002 21:48:38 -0000
@@ -486,6 +486,7 @@ gtk_menu_item_size_allocate (GtkWidget  
   GtkMenuItem *menu_item;
   GtkBin *bin;
   GtkAllocation child_allocation;
+  GtkTextDirection direction;
 
   g_return_if_fail (GTK_IS_MENU_ITEM (widget));
   g_return_if_fail (allocation != NULL);
@@ -493,6 +494,8 @@ gtk_menu_item_size_allocate (GtkWidget  
   menu_item = GTK_MENU_ITEM (widget);
   bin = GTK_BIN (widget);
   
+  direction = gtk_widget_get_direction (widget);
+
   widget->allocation = *allocation;
 
   if (bin->child)
@@ -506,14 +509,18 @@ gtk_menu_item_size_allocate (GtkWidget  
 			    widget->style->ythickness);
       child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2);
       child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2);
+      if (direction == GTK_TEXT_DIR_LTR)
       child_allocation.x += GTK_MENU_ITEM (widget)->toggle_size;
       child_allocation.width -= GTK_MENU_ITEM (widget)->toggle_size;
       child_allocation.x += widget->allocation.x;
       child_allocation.y += widget->allocation.y;
 
       gtk_widget_get_child_requisition (bin->child, &child_requisition);
-      if (menu_item->submenu && menu_item->show_submenu_indicator)
+      if (menu_item->submenu && menu_item->show_submenu_indicator) {
+	if (direction == GTK_TEXT_DIR_RTL)
+	  child_allocation.x += child_requisition.height;
 	child_allocation.width -= child_requisition.height;
+      }
 
       if (child_allocation.width < 1)
 	child_allocation.width = 1;
@@ -638,6 +645,10 @@ gtk_menu_item_paint (GtkWidget    *widge
 	  gint arrow_x, arrow_y;
 	  gint arrow_size;
 	  gint arrow_extent;
+	  GtkTextDirection direction;
+	  GtkArrowType arrow_type;
+
+	  direction = gtk_widget_get_direction (widget);
 
 	  gtk_widget_get_child_requisition (GTK_BIN (menu_item)->child,
 					    &child_requisition);
@@ -649,13 +660,21 @@ gtk_menu_item_paint (GtkWidget    *widge
 	  if (state_type == GTK_STATE_PRELIGHT)
 	    shadow_type = GTK_SHADOW_IN;
 
+	  if (direction == GTK_TEXT_DIR_RTL) {
+	    arrow_x = x + 1;
+	    arrow_type = GTK_ARROW_LEFT;
+	  }
+	  else {
 	  arrow_x = x + width - 1 - arrow_size + (arrow_size - arrow_extent) / 2;
+	    arrow_type = GTK_ARROW_RIGHT;
+	  }
+
 	  arrow_y = y + (height - arrow_extent) / 2;
 
 	  gtk_paint_arrow (widget->style, widget->window,
 			   state_type, shadow_type, 
 			   area, widget, "menuitem", 
-			   GTK_ARROW_RIGHT, TRUE,
+			   arrow_type, TRUE,
 			   arrow_x, arrow_y,
 			   arrow_extent, arrow_extent);
 	}
Index: gtk/gtkradiomenuitem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkradiomenuitem.c,v
retrieving revision 1.24
diff -u -b -B -p -r1.24 gtkradiomenuitem.c
--- gtk/gtkradiomenuitem.c	5 Oct 2002 01:51:16 -0000	1.24
+++ gtk/gtkradiomenuitem.c	25 Oct 2002 21:48:38 -0000
@@ -315,6 +315,10 @@ gtk_radio_menu_item_draw_indicator (GtkC
 
       width = 8;
       height = 8;
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
+	x = widget->allocation.x + widget->allocation.width - (GTK_CONTAINER (check_menu_item)->border_width +
+							       widget->style->xthickness + 2) - width;
+      else 
       x = widget->allocation.x + (GTK_CONTAINER (check_menu_item)->border_width +
 				  widget->style->xthickness + 2);
       y = widget->allocation.y + (widget->allocation.height - height) / 2;
Index: gtk/gtktearoffmenuitem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktearoffmenuitem.c,v
retrieving revision 1.13
diff -u -b -B -p -r1.13 gtktearoffmenuitem.c
--- gtk/gtktearoffmenuitem.c	16 Oct 2002 15:13:43 -0000	1.13
+++ gtk/gtktearoffmenuitem.c	25 Oct 2002 21:48:38 -0000
@@ -132,12 +132,16 @@ gtk_tearoff_menu_item_paint (GtkWidget  
   gint width, height;
   gint x, y;
   gint right_max;
+  GtkArrowType arrow_type;
+  GtkTextDirection direction;
 
   if (GTK_WIDGET_DRAWABLE (widget))
     {
       menu_item = GTK_MENU_ITEM (widget);
       tearoff_item = GTK_TEAROFF_MENU_ITEM (widget);
 
+      direction = gtk_widget_get_direction (widget);
+
       x = widget->allocation.x + GTK_CONTAINER (menu_item)->border_width;
       y = widget->allocation.y + GTK_CONTAINER (menu_item)->border_width;
       width = widget->allocation.width - x * 2;
@@ -172,12 +176,26 @@ gtk_tearoff_menu_item_paint (GtkWidget  
 
 	  if (menu_item->toggle_size > ARROW_SIZE)
 	    {
+	      if (direction == GTK_TEXT_DIR_RTL) {
+		arrow_x = x + width - menu_item->toggle_size + (menu_item->toggle_size - ARROW_SIZE)/2; 
+		arrow_type = GTK_ARROW_RIGHT;	    
+	      }
+	      else {
 	      arrow_x = x + (menu_item->toggle_size - ARROW_SIZE)/2;
+		arrow_type = GTK_ARROW_LEFT;
+	      }
 	      x += menu_item->toggle_size + BORDER_SPACING;
 	    }
 	  else
 	    {
+	      if (direction == GTK_TEXT_DIR_RTL) {
+		arrow_x = x + width - 2 * ARROW_SIZE + ARROW_SIZE / 2; 
+		arrow_type = GTK_ARROW_RIGHT;	    
+	      }
+	      else {
 	      arrow_x = ARROW_SIZE / 2;
+		arrow_type = GTK_ARROW_LEFT;
+	      }
 	      x += 2 * ARROW_SIZE;
 	    }
 	  
@@ -184,13 +203,19 @@ gtk_tearoff_menu_item_paint (GtkWidget  
 	  gtk_paint_arrow (widget->style, widget->window,
 			   widget->state, shadow_type,
 			   NULL, widget, "tearoffmenuitem",
-			   GTK_ARROW_LEFT, FALSE,
+			   arrow_type, FALSE,
 			   arrow_x, y + height / 2 - 5, 
 			   ARROW_SIZE, ARROW_SIZE);
 	}
 
       while (x < right_max)
 	{
+	  if (direction == GTK_TEXT_DIR_RTL)
+	    gtk_paint_hline (widget->style, widget->window, GTK_STATE_NORMAL,
+			     NULL, widget, "tearoffmenuitem",
+			     right_max - x, MAX (right_max - x - TEAR_LENGTH, 0),
+			     y + (height - widget->style->ythickness) / 2);
+	  else 
 	  gtk_paint_hline (widget->style, widget->window, GTK_STATE_NORMAL,
 			   NULL, widget, "tearoffmenuitem",
 			   x, MIN (x + TEAR_LENGTH, right_max),
