- Added GtkVolumeButton and GtkScaleButton widgets (Ross Burton)

	* plugins/gtk+/glade-gtk.c: 
	  - Added GtkVolumeButton and GtkScaleButton widgets (Ross Burton)


svn path=/trunk/; revision=1717

2 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index affc85d3..ba88d28f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
 	  - Fixed a crash detail bug 493418.
 	  - Reset "events" property for newly created widgets
 	    (workaround for bug 472555).
-
+	  - Added GtkVolumeButton and GtkScaleButton widgets (Ross Burton)
+	
 	* plugins/gnome/glade-gnome.c: Fixed some crashes on 
 	  gnome druid page properties (bug 511651).
 	
@@ -18,7 +19,7 @@
 	
 	* gladeui/glade-base-editor.c: Made sure idle handlers werent
 	  updating treeviews after the object is destroyed (also bug 506713).
-
+	
 	* gladeui/glade-app.c: When adding a first project, display the
 	  first toplevel in the design layout.
 
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index ef3a0d96..7f052b31 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -778,6 +778,24 @@ embedded in another object</_tooltip>
       </properties>
     </glade-widget-class>
 
+    <glade-widget-class name="GtkScaleButton" generic-name="scalebutton" _title="Scale Button">
+      <properties>
+        <property id="size">
+  	  <displayable-values>
+	    <value id="GTK_ICON_SIZE_INVALID" _name="Invalid"/>
+	    <value id="GTK_ICON_SIZE_MENU" _name="Menu"/>
+	    <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" _name="Small Toolbar"/>
+	    <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" _name="Large Toolbar"/>
+	    <value id="GTK_ICON_SIZE_BUTTON" _name="Button"/>
+	    <value id="GTK_ICON_SIZE_DND" _name="Drag'n Drop"/>
+	    <value id="GTK_ICON_SIZE_DIALOG" _name="Dialog"/>
+	  </displayable-values>
+        </property>
+      </properties>
+    </glade-widget-class>
+
+    <glade-widget-class name="GtkVolumeButton" generic-name="volumebutton" _title="Volume Button"/>
+
     <glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget" _title="File Chooser Widget">
       <post-create-function>glade_gtk_file_chooser_widget_post_create</post-create-function>
       <properties>
@@ -1678,6 +1696,8 @@ embedded in another object</_tooltip>
     <glade-widget-class-ref name="GtkColorButton"/>
     <glade-widget-class-ref name="GtkFontButton"/>
     <glade-widget-class-ref name="GtkLinkButton"/>
+    <glade-widget-class-ref name="GtkScaleButton"/>
+    <glade-widget-class-ref name="GtkVolumeButton"/>
 
     <glade-widget-class-ref name="GtkImage"/>
     <glade-widget-class-ref name="GtkLabel"/>