gimp r28194 - in trunk: . app/widgets

[mitch svn gnome org]

Author: mitch
Date: Sun Mar 22 18:12:36 2009
New Revision: 28194
URL: http://svn.gnome.org/viewvc/gimp?rev=28194&view=rev

Log:
2009-03-22  Michael Natterer  <mitch gimp org>

	* app/widgets/Makefile.am
	* app/widgets/gtkscalebutton.[ch]: remove this evil hack.

	* app/widgets/gimpscalebutton.[ch]
	* app/widgets/gimppropwidgets.c: minor adjustments so the widget
	from GTK+ gets used.



Removed:
   trunk/app/widgets/gtkscalebutton.c
   trunk/app/widgets/gtkscalebutton.h
Modified:
   trunk/ChangeLog
   trunk/app/widgets/Makefile.am
   trunk/app/widgets/gimppropwidgets.c
   trunk/app/widgets/gimpscalebutton.c
   trunk/app/widgets/gimpscalebutton.h

Modified: trunk/app/widgets/Makefile.am
==============================================================================
--- trunk/app/widgets/Makefile.am	(original)
+++ trunk/app/widgets/Makefile.am	Sun Mar 22 18:12:36 2009
@@ -347,8 +347,6 @@
 	gimpwidgets-utils.h		\
 	gimpwindow.c			\
 	gimpwindow.h			\
-	gtkscalebutton.c		\
-	gtkscalebutton.h		\
 	gtkwrapbox.c			\
 	gtkwrapbox.h			\
 	gtkhwrapbox.c			\

Modified: trunk/app/widgets/gimppropwidgets.c
==============================================================================
--- trunk/app/widgets/gimppropwidgets.c	(original)
+++ trunk/app/widgets/gimppropwidgets.c	Sun Mar 22 18:12:36 2009
@@ -24,9 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define __GTK_SCALE_BUTTON_H__
-#define __GTK_VOLUME_BUTTON_H__
-
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
@@ -435,7 +432,7 @@
                                    gimp_prop_scale_button_callback,
                                    config);
 
-  gimp_gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), value);
+  gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), value);
 
   g_signal_handlers_unblock_by_func (button,
                                      gimp_prop_scale_button_callback,

Modified: trunk/app/widgets/gimpscalebutton.c
==============================================================================
--- trunk/app/widgets/gimpscalebutton.c	(original)
+++ trunk/app/widgets/gimpscalebutton.c	Sun Mar 22 18:12:36 2009
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#define __GTK_SCALE_BUTTON_H__
-#define __GTK_VOLUME_BUTTON_H__
-
 #include <gtk/gtk.h>
 
 #include "widgets-types.h"
@@ -93,7 +90,7 @@
   gdouble        lower;
   gdouble        upper;
 
-  adj = gimp_gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
+  adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
 
   value = gtk_adjustment_get_value (adj);
   lower = gtk_adjustment_get_lower (adj);
@@ -123,7 +120,7 @@
 
   steps = MIN (widget->allocation.width, widget->allocation.height) / 2;
 
-  adj = gimp_gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
+  adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
 
   if (steps < 1)
     return TRUE;

Modified: trunk/app/widgets/gimpscalebutton.h
==============================================================================
--- trunk/app/widgets/gimpscalebutton.h	(original)
+++ trunk/app/widgets/gimpscalebutton.h	Sun Mar 22 18:12:36 2009
@@ -22,9 +22,6 @@
 #define __GIMP_SCALE_BUTTON_H__
 
 
-#include "gtkscalebutton.h"
-
-
 #define GIMP_TYPE_SCALE_BUTTON            (gimp_scale_button_get_type ())
 #define GIMP_SCALE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButton))
 #define GIMP_SCALE_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass))