don't try to handle alignment here, because it's done by PangoLayout after

2001-09-20  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_get_line_display): don't
	try to handle alignment here, because it's done by PangoLayout
	after we set the layout width. Fix from Dov.

5 files changed, 25 insertions, 28 deletions

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index a745705aa..b6ac0926f 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1793,6 +1793,19 @@ arrow.
 @show_toggle_indicator: unused
 @show_submenu_indicator: whether to show the arrow or not
 
+<!-- ##### FUNCTION gtk_menu_item_set_placement ##### -->
+<para>
+Specifies the placement of the submenu around the menu item. The placement
+is usually #GTK_LEFT_RIGHT for menu items in a popup menu and
+#GTK_TOP_BOTTOM in menu bars.
+</para>
+<para>
+This function is useless in usual applications.
+</para>
+
+@menu_item: the menu item
+@placement: the submenu placement
+
 <!-- ##### FUNCTION gtk_object_arg_get ##### -->
 <para>
 Private function to get an argument and argument info from an object.
@@ -2480,6 +2493,15 @@ fundamental type.
 @group_cycling: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_widget_get_usize ##### -->
+<para>
+
+</para>
+
+@widget: 
+@width: 
+@height: 
+
 <!-- ##### FUNCTION gtk_widget_pop_style ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index 13e9c079d..e9a9ccfcf 100644
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -96,9 +96,9 @@ Creates a new #GtkMenu.
 Adds a new #GtkMenuItem to the end of the menu's item list.
 </para>
 
+<!-- # Unused Parameters # -->
 @menu: a #GtkMenu.
 @child: The #GtkMenuItem to add.
-<!-- # Unused Parameters # -->
 @m: 
 @c: 
 
@@ -108,8 +108,8 @@ Adds a new #GtkMenuItem to the end of the menu's item list.
 Adds a new #GtkMenuItem to the beginning of the menu's item list.
 </para>
 
-@menu_child: 
 <!-- # Unused Parameters # -->
+@menu_child: 
 @m: 
 @c: 
 @menu: a #GtkMenu.
@@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position
 indicated by @position. 
 </para>
 
+<!-- # Unused Parameters # -->
 @menu: a #GtkMenu.
 @child: The #GtkMenuItem to add.
 @pos: 
-<!-- # Unused Parameters # -->
 @position: The position in the item list where @child is added.
 Positions are numbered from 0 to n-1.
 
diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index 286ab7b6d..9694f0822 100644
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -91,20 +91,6 @@ Removes the widget's submenu.
 @menu_item: the menu item widget
 
 
-<!-- ##### FUNCTION gtk_menu_item_set_placement ##### -->
-<para>
-Specifies the placement of the submenu around the menu item. The placement
-is usually #GTK_LEFT_RIGHT for menu items in a popup menu and
-#GTK_TOP_BOTTOM in menu bars.
-</para>
-<para>
-This function is useless in usual applications.
-</para>
-
-@menu_item: the menu item
-@placement: the submenu placement
-
-
 <!-- ##### FUNCTION gtk_menu_item_select ##### -->
 <para>
 Emits the "select" signal on the given item. Behaves exactly like
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index cc0b23b6d..30ffca823 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,7 +495,6 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
-@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 8d6c08c9a..b360b44d7 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -1372,16 +1372,6 @@ GtkWidget
 @height: 
 
 
-<!-- ##### FUNCTION gtk_widget_get_usize ##### -->
-<para>
-
-</para>
-
-@widget: 
-@width: 
-@height: 
-
-
 <!-- ##### MACRO gtk_widget_pop_visual ##### -->
 <para>