Fixed spelling and formatting typos.

	* doc/catalogintro.sgml, doc/children.sgml, doc/gladeui-docs.sgml,
	  doc/tmpl/glade-app.sgml, doc/tmpl/glade-fixed.sgml,
	  doc/tmpl/glade-palette.sgml, doc/tmpl/glade-project.sgml,
	  src/glade-editor.c: Fixed spelling and formatting typos.

	* src/glade-palette.c: Add documentation.

	* widgets/glade-catalog.dtd: Removed xml document tag
	  (DTD expressions are not xml). Add 'toplevel' attribute to
	  'glade-widget-class' attribute list.

	* widgets/gtk+.xml.in: Change default widget
	  properties (in line with HIG).
	  o The scrolling policies of GtkScrolledWindow are now
	    GTK_POLICY_AUTOMATIC.
	  o The GtkDialog 'has-separator' property is now set to FALSE.
	  o The GtkFrame 'shadow-type' property is now GTK_SHADOW_NONE.

	* src/glade-gtk.c: Changed glade_gtk_frame_post_create(). By default,
	  GtkFrame's are now more HIG compliant.

	* pixmaps/22x22/Makefile.am: Another icon.

18 files changed, 97 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index c5ecf16c..bf27ea28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-08-04  Vincent Geddes <vincent.geddes@gmail.com>
+
+	* doc/catalogintro.sgml, doc/children.sgml, doc/gladeui-docs.sgml,
+	  doc/tmpl/glade-app.sgml, doc/tmpl/glade-fixed.sgml,
+	  doc/tmpl/glade-palette.sgml, doc/tmpl/glade-project.sgml,
+	  src/glade-editor.c: Fixed spelling and formatting typos.
+
+	* src/glade-palette.c: Add documentation.
+
+	* widgets/glade-catalog.dtd: Removed xml document tag 
+	  (DTD expressions are not xml). Add 'toplevel' attribute to 
+	  'glade-widget-class' attribute list.
+
+	* widgets/gtk+.xml.in: Change default widget 
+	  properties (in line with HIG).
+	  o The scrolling policies of GtkScrolledWindow are now 
+	    GTK_POLICY_AUTOMATIC.
+	  o The GtkDialog 'has-separator' property is now set to FALSE.
+	  o The GtkFrame 'shadow-type' property is now GTK_SHADOW_NONE.
+
+	* src/glade-gtk.c: Changed glade_gtk_frame_post_create(). By default,
+	  GtkFrame's are now more HIG compliant.
+
+	* pixmaps/22x22/Makefile.am: Another icon.
+
+
 2006-08-02  Juan Pablo Ugarte <juanpablougarte@gmail.com>
 
 	* src/glade-fixed.c, src/glade-utils.[ch]: fixed bug 348570
diff --git a/TODO b/TODO
index 66c02fc4..334f002f 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ Tasks/Bugs Blocking glade-3 3.0:
 ================================
  o Default notebook tab labels (bug 345438) (Tristan)
    (We'll do a clean-up here... but not command recursion just yet).
- o Missing icon (Vincent)
  o Unable to paste widget into other empty placeholder than the first one (bug 349494)
 
 Wishlist items for 3.0 release:
diff --git a/doc/catalogintro.sgml b/doc/catalogintro.sgml
index 6678ad5a..e5fa2ba4 100644
--- a/doc/catalogintro.sgml
+++ b/doc/catalogintro.sgml
@@ -78,7 +78,7 @@ you can also use 'depends' and 'domain'.
           <para>
 The 'name' property is simply a string identifier for the catalog in 
 question, it will be used to identify your catalog so that the glade file can explicitly
-require it and to manage inter catalog dependancies.
+require it and to manage inter catalog dependencies.
           </para>
         </listitem>
       </varlistentry>
@@ -145,7 +145,7 @@ to be handled with a #GladeFixed.
           <para>
 The 'init-function' tag is used to retrieve an optional global entry point to your plugin; 
 if you need to initialize any backends or whatnot this is a good place. 
-Your catalog's init-function will be called before any widget classes are instanciated.
+Your catalog's init-function will be called before any widget classes are instantiated.
           </para>
         </listitem>
       </varlistentry>
diff --git a/doc/children.sgml b/doc/children.sgml
index 5ebf77a3..718a30bf 100644
--- a/doc/children.sgml
+++ b/doc/children.sgml
@@ -6,7 +6,7 @@
   <refnamediv>
     <refname>Containers</refname>
     <refpurpose>
-How to add support for heirarchic widget relationships
+How to add support for hierarchic widget relationships
     </refpurpose>
   </refnamediv>
 
diff --git a/doc/gladeui-docs.sgml b/doc/gladeui-docs.sgml
index 64f3d9e4..062644dd 100644
--- a/doc/gladeui-docs.sgml
+++ b/doc/gladeui-docs.sgml
@@ -35,7 +35,7 @@
       custom (GTK+ based) widget toolkit into the Glade UI Builder.</para>
 
       <para>You can always get the latest version of this document here (XXX linkme) 
-      and you should have recieved a copy with the glade-3 tarball.</para>
+      and you should have received a copy with the glade-3 tarball.</para>
     </abstract>
     <releaseinfo>for &version;</releaseinfo>
     <authorgroup>
@@ -81,7 +81,7 @@
   </part>
 
   <part id="misc">
-    <title>Miscalanious utilities</title>
+    <title>Miscellaneous utilities</title>
     &GladeParameter;
     &GladeUtils;
   </part>
diff --git a/doc/tmpl/glade-app.sgml b/doc/tmpl/glade-app.sgml
index 87257b91..4841e700 100644
--- a/doc/tmpl/glade-app.sgml
+++ b/doc/tmpl/glade-app.sgml
@@ -2,7 +2,7 @@
 GladeApp
 
 <!-- ##### SECTION Short_Description ##### -->
-The central control point of the Glade core.
+The central control point of the Glade core
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/doc/tmpl/glade-fixed.sgml b/doc/tmpl/glade-fixed.sgml
index bd17029d..c312b5a1 100644
--- a/doc/tmpl/glade-fixed.sgml
+++ b/doc/tmpl/glade-fixed.sgml
@@ -2,7 +2,7 @@
 GladeFixed
 
 <!-- ##### SECTION Short_Description ##### -->
-An object wrapper for free-form placement container widgets.
+An object wrapper for free-form placement container widgets
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/doc/tmpl/glade-palette.sgml b/doc/tmpl/glade-palette.sgml
index 56bb3e67..39ad8c90 100644
--- a/doc/tmpl/glade-palette.sgml
+++ b/doc/tmpl/glade-palette.sgml
@@ -6,7 +6,7 @@ A widget to select a #GladeWidgetClass for addition
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#GladePalette is responsable for displaying the list of available
+#GladePalette is responsible for displaying the list of available
 #GladeWidgetClass types and publishing the currently selected class
 to the Glade core.
 </para>
diff --git a/doc/tmpl/glade-project.sgml b/doc/tmpl/glade-project.sgml
index 734b2ce0..59f8fb93 100644
--- a/doc/tmpl/glade-project.sgml
+++ b/doc/tmpl/glade-project.sgml
@@ -2,7 +2,7 @@
 GladeProject
 
 <!-- ##### SECTION Short_Description ##### -->
-The Glade document hub and Load/Save interface.
+The Glade document hub and Load/Save interface
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/pixmaps/16x16/notebook.png b/pixmaps/16x16/notebook.png
index b7ee9cbc..6285a782 100644
--- a/pixmaps/16x16/notebook.png
+++ b/pixmaps/16x16/notebook.png
diff --git a/pixmaps/22x22/Makefile.am b/pixmaps/22x22/Makefile.am
index f2ebbf9d..42cd4c34 100644
--- a/pixmaps/22x22/Makefile.am
+++ b/pixmaps/22x22/Makefile.am
@@ -52,6 +52,7 @@ largeicons_DATA = \
 	menu.png \
 	menuitem.png \
 	menubar.png \
+	menutoolbutton.png \
 	messagedialog.png \
 	notebook.png \
 	optionmenu.png \
diff --git a/pixmaps/22x22/menutoolbutton.png b/pixmaps/22x22/menutoolbutton.png
new file mode 100644
index 00000000..8db5d314
--- /dev/null
+++ b/pixmaps/22x22/menutoolbutton.png
diff --git a/pixmaps/22x22/notebook.png b/pixmaps/22x22/notebook.png
index 1b974447..8aeebe74 100644
--- a/pixmaps/22x22/notebook.png
+++ b/pixmaps/22x22/notebook.png
diff --git a/src/glade-editor.c b/src/glade-editor.c
index 43ba3692..1570a268 100644
--- a/src/glade-editor.c
+++ b/src/glade-editor.c
@@ -295,7 +295,7 @@ glade_editor_create_reset_button (GladeEditor *editor)
 
 	gtk_container_add (GTK_CONTAINER (button), image);
 
-	glade_util_widget_set_tooltip (button, _("Reset widget properties to thier defaults"));
+	glade_util_widget_set_tooltip (button, _("Reset widget properties to their defaults"));
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (glade_editor_on_reset_click), editor);
 
diff --git a/src/glade-gtk.c b/src/glade-gtk.c
index 051b126c..6f28a70c 100644
--- a/src/glade-gtk.c
+++ b/src/glade-gtk.c
@@ -1699,39 +1699,57 @@ glade_gtk_table_verify_bottom_attach (GObject *object, GValue *value)
 void GLADEGTK_API
 glade_gtk_frame_post_create (GObject *frame, GladeCreateReason reason)
 {
-	static GladeWidgetClass *wclass = NULL;
-	GladeWidget *gframe, *glabel;
+	static GladeWidgetClass *label_class = NULL, *alignment_class = NULL;
+	GladeWidget *gframe, *glabel, *galignment;
 	GtkWidget *label;
+	gchar     *label_text;
 	
-	if (wclass == NULL)
-		wclass = glade_widget_class_get_by_type (GTK_TYPE_LABEL);
-	
-	if (reason != GLADE_CREATE_USER) return;
+	if (reason != GLADE_CREATE_USER)
+		return;
 		
 	g_return_if_fail (GTK_IS_FRAME (frame));
 	gframe = glade_widget_get_from_gobject (frame);
 	g_return_if_fail (GLADE_IS_WIDGET (gframe));
-
-	glade_gtk_container_post_create (frame, reason);
 	
-	/* If we didnt put this object here... */
-	if ((label = gtk_frame_get_label_widget (GTK_FRAME (frame))) == NULL ||
-	    (glade_widget_get_from_gobject (label) == NULL))
+	/* If we didnt put this object here or if frame is an aspect frame... */
+	if (((label = gtk_frame_get_label_widget (GTK_FRAME (frame))) == NULL ||
+	    (glade_widget_get_from_gobject (label) == NULL)) &&
+	    (GTK_IS_ASPECT_FRAME (frame) == FALSE))
 	{
-		glabel = glade_widget_class_create_widget (wclass, FALSE,
+
+		if (label_class == NULL)
+			label_class = glade_widget_class_get_by_type (GTK_TYPE_LABEL);
+		if (alignment_class == NULL)
+			alignment_class = glade_widget_class_get_by_type (GTK_TYPE_ALIGNMENT);
+
+		/* add label (as an internal child) */
+		glabel = glade_widget_class_create_widget (label_class, FALSE,
 							   "parent", gframe, 
 							   "project", glade_widget_get_project (gframe), 
 							   NULL);
-		if (GTK_IS_ASPECT_FRAME (frame))
-			glade_widget_property_set (glabel, "label", "aspect frame");
-		else
-			glade_widget_property_set (glabel, "label", "frame");
+
+		label_text = g_strdup_printf ("<b>%s</b>", glade_widget_get_name (gframe));
+
+		glade_widget_property_set (glabel, "label", label_text);
+		glade_widget_property_set (glabel, "use-markup", "TRUE");
 
 		g_object_set_data (glabel->object, "special-child-type", "label_item");
 		gtk_frame_set_label_widget (GTK_FRAME (frame), GTK_WIDGET (glabel->object));
-
 		gtk_widget_show (GTK_WIDGET (glabel->object));
+		g_free (label_text);
+
+		/* add alignment */
+		galignment = glade_widget_class_create_widget (alignment_class, FALSE,
+						 	       "parent", gframe, 
+						               "project", glade_widget_get_project (gframe), 
+					                       NULL);
+
+		glade_widget_property_set (galignment, "left-padding", 12);
+		gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (galignment->object));
+		gtk_widget_show (GTK_WIDGET (galignment->object));
 	}
+
+	glade_gtk_container_post_create (frame, reason);
 }
 
 void GLADEGTK_API
diff --git a/src/glade-palette.c b/src/glade-palette.c
index 0cfff7ba..c37f4cf4 100644
--- a/src/glade-palette.c
+++ b/src/glade-palette.c
@@ -90,7 +90,13 @@ static void glade_palette_update_appearance (GladePalette *palette);
 
 static GtkVBoxClass *parent_class = NULL;
 
-
+/**
+ * glade_palette_set_item_appearance:
+ * @palette: a #GladePalette
+ * @item_appearance: the item appearance
+ *
+ * Sets the appearance of the palette items.
+ */
 void
 glade_palette_set_item_appearance (GladePalette *palette, GladeItemAppearance item_appearance)
 {
@@ -108,6 +114,13 @@ glade_palette_set_item_appearance (GladePalette *palette, GladeItemAppearance it
 	}
 }
 
+/**
+ * glade_palette_set_use_small_item_icons:
+ * @palette: a #GladePalette
+ * @use_small_item_icons: Whether to use small item icons
+ *
+ * Sets whether to use small item icons.
+ */
 void
 glade_palette_set_use_small_item_icons (GladePalette *palette, gboolean use_small_item_icons)
 {
@@ -618,9 +631,9 @@ glade_palette_deselect_current_item (GladePalette *palette)
 
 /**
  * glade_palette_get_item_appearance:
- * @palette: A #GladePalette
+ * @palette: a #GladePalette
  *
- * Returns: The appearance of the palette items.
+ * Returns: The appearance of the palette items
  */
 GladeItemAppearance
 glade_palette_get_item_appearance (GladePalette *palette)
@@ -634,8 +647,8 @@ glade_palette_get_item_appearance (GladePalette *palette)
 }
 
 /**
- * glade_palette_get_item_appearance:
- * @palette: A #GladePalette
+ * glade_palette_get_use_small_item_icons:
+ * @palette: a #GladePalette
  *
  * Returns: Whether small item icons are used
  */
diff --git a/widgets/glade-catalog.dtd b/widgets/glade-catalog.dtd
index 5241a7cb..5a77c3f1 100644
--- a/widgets/glade-catalog.dtd
+++ b/widgets/glade-catalog.dtd
@@ -1,5 +1,3 @@
-<?xml version ='1.0' encoding='UTF-8'?>
-
 <!ELEMENT glade-catalog (glade-widget-classes?, 
 			 glade-widget-group*)>
 
@@ -16,7 +14,8 @@
 			      children?,
 			      packing-defaults?)>
 
-<!ATTLIST glade-widget-class name         CDATA #REQUIRED
+<!ATTLIST glade-widget-class toplevel     CDATA #IMPLIED
+			     name         CDATA #REQUIRED
                              generic-name CDATA #IMPLIED
 			     title        CDATA #IMPLIED>
 
diff --git a/widgets/gtk+.xml.in b/widgets/gtk+.xml.in
index cccae25d..c0db7987 100644
--- a/widgets/gtk+.xml.in
+++ b/widgets/gtk+.xml.in
@@ -734,6 +734,7 @@
       <properties>
 	<property id="default-width"  default="0" optional="True" optional-default="False"/>
 	<property id="default-height" default="0" optional="True" optional-default="False"/>
+	<property id="has-separator"  default="False"/>
       </properties>
 
       <children>
@@ -884,7 +885,7 @@
 	<property id="shadow" disabled="True"/>
 	<property id="label-widget" disabled="True"/>
 	<property id="label-xalign" default="0.0"/>
-      	<property id="shadow-type">
+      	<property id="shadow-type" default="GTK_SHADOW_NONE">
   	  <displayable-values>
 	    <value id="GTK_SHADOW_NONE" _name="None"/>
 	    <value id="GTK_SHADOW_IN" _name="In"/>
@@ -903,6 +904,7 @@
 	</child>
       </children>
     </glade-widget-class>
+
     <glade-widget-class name="GtkAspectFrame" generic-name="aspectframe" _title="Aspect Frame"/>
 
     <glade-widget-class name="GtkRange" _title="Range">
@@ -1101,14 +1103,14 @@
 	    <value id="GTK_SHADOW_ETCHED_OUT" _name="Etched Out"/>
 	  </displayable-values>
 	</property>
-      	<property id="hscrollbar-policy">
+      	<property id="hscrollbar-policy" default="GTK_POLICY_AUTOMATIC">
   	  <displayable-values>
 	    <value id="GTK_POLICY_ALWAYS" _name="Always"/>
 	    <value id="GTK_POLICY_AUTOMATIC" _name="Automatic"/>
 	    <value id="GTK_POLICY_NEVER" _name="Never"/>
 	  </displayable-values>
 	</property>
-      	<property id="vscrollbar-policy">
+      	<property id="vscrollbar-policy" default="GTK_POLICY_AUTOMATIC">
   	  <displayable-values>
 	    <value id="GTK_POLICY_ALWAYS" _name="Always"/>
 	    <value id="GTK_POLICY_AUTOMATIC" _name="Automatic"/>