gimp r25019 - in branches/weskaggs: . app/widgets

[weskaggs svn gnome org]

Author: weskaggs
Date: Mon Mar  3 23:06:49 2008
New Revision: 25019
URL: http://svn.gnome.org/viewvc/gimp?rev=25019&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* app/widgets/gimpbrushfactoryview.[ch]
	* app/widgets/gimpbrushselect.c: use scale control instead of
	scale entry for brush spacing.


Modified:
   branches/weskaggs/ChangeLog
   branches/weskaggs/app/widgets/gimpbrushfactoryview.c
   branches/weskaggs/app/widgets/gimpbrushfactoryview.h
   branches/weskaggs/app/widgets/gimpbrushselect.c

Modified: branches/weskaggs/app/widgets/gimpbrushfactoryview.c
==============================================================================
--- branches/weskaggs/app/widgets/gimpbrushfactoryview.c	(original)
+++ branches/weskaggs/app/widgets/gimpbrushfactoryview.c	Mon Mar  3 23:06:49 2008
@@ -78,14 +78,15 @@
   gtk_widget_show (table);
 
   view->spacing_adjustment =
-    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
+    GTK_ADJUSTMENT (gimp_scale_control_new (GTK_TABLE (table), 0, 0,
                                           _("Spacing:"), -1, -1,
                                           0.0, 1.0, 200.0, 1.0, 10.0, 1,
                                           FALSE, 1.0, 5000.0,
                                           _("Percentage of width of brush"),
                                           NULL));
 
-  view->spacing_scale = GIMP_SCALE_ENTRY_SCALE (view->spacing_adjustment);
+  /* FIXME -- change "scale" to something else */
+  view->spacing_widget = gimp_scale_control_get_widget (view->spacing_adjustment);
 
   g_signal_connect (view->spacing_adjustment, "value-changed",
                     G_CALLBACK (gimp_brush_factory_view_spacing_update),
@@ -155,7 +156,7 @@
 
   /*  eek  */
   gtk_box_pack_end (GTK_BOX (editor->view),
-                    factory_view->spacing_scale->parent,
+                    factory_view->spacing_widget->parent,
                     FALSE, FALSE, 0);
 
   factory_view->spacing_changed_handler_id =
@@ -197,7 +198,7 @@
                                          view);
     }
 
-  gtk_widget_set_sensitive (view->spacing_scale, spacing_sensitive);
+  gtk_widget_set_sensitive (view->spacing_widget, spacing_sensitive);
 }
 
 static void

Modified: branches/weskaggs/app/widgets/gimpbrushfactoryview.h
==============================================================================
--- branches/weskaggs/app/widgets/gimpbrushfactoryview.h	(original)
+++ branches/weskaggs/app/widgets/gimpbrushfactoryview.h	Mon Mar  3 23:06:49 2008
@@ -39,7 +39,7 @@
 {
   GimpDataFactoryView  parent_instance;
 
-  GtkWidget           *spacing_scale;
+  GtkWidget           *spacing_widget;
   GtkAdjustment       *spacing_adjustment;
 
   gboolean             change_brush_spacing;

Modified: branches/weskaggs/app/widgets/gimpbrushselect.c
==============================================================================
--- branches/weskaggs/app/widgets/gimpbrushselect.c	(original)
+++ branches/weskaggs/app/widgets/gimpbrushselect.c	Mon Mar  3 23:06:49 2008
@@ -168,7 +168,7 @@
   gtk_widget_show (dialog->view);
 
   /*  Create the frame and the table for the options  */
-  table = GIMP_BRUSH_FACTORY_VIEW (dialog->view)->spacing_scale->parent;
+  table = GIMP_BRUSH_FACTORY_VIEW (dialog->view)->spacing_widget->parent;
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_table_set_row_spacings (GTK_TABLE (table), 2);