dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app/widgets/Makefile.am remove this evil hack.

Browse source 
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.


svn path=/trunk/; revision=28194
This commit is contained in:
Michael Natterer 2009-03-22 18:12:36 +00:00 committed by Michael Natterer
parent d85fb156b5
commit 9ae1fa8872
7 changed files with 12 additions and 1731 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
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.
2009-03-22 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpblobeditor.c

2
app/widgets/Makefile.am
View file

@ -347,8 +347,6 @@ libappwidgets_a_sources = \
gimpwidgets-utils.h \
gimpwindow.c \
gimpwindow.h \
gtkscalebutton.c \
gtkscalebutton.h \
gtkwrapbox.c \
gtkwrapbox.h \
gtkhwrapbox.c \

5
app/widgets/gimppropwidgets.c
View file

@ -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_notify (GObject *config,
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,

7
app/widgets/gimpscalebutton.c
View file

@ -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 @@ gimp_scale_button_update_tooltip (GimpScaleButton *button)
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 @@ gimp_scale_button_image_expose (GtkWidget *widget,
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;

3
app/widgets/gimpscalebutton.h
View file

@ -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))

1618
app/widgets/gtkscalebutton.c
View file

File diff suppressed because it is too large Load diff

99
app/widgets/gtkscalebutton.h
View file

@ -1,99 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2005 Ronald S. Bultje
* Copyright (C) 2006, 2007 Christian Persch
* Copyright (C) 2006 Jan Arne Petersen
* Copyright (C) 2007 Red Hat, Inc.
*
* Authors:
* - Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* - Bastien Nocera <bnocera@redhat.com>
* - Jan Arne Petersen <jpetersen@jpetersen.org>
* - Christian Persch <chpe@svn.gnome.org>
*
* This library is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
/*
* Modified by the GTK+ Team and others 2007. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GIMP_GTK_SCALE_BUTTON_H__
#define __GIMP_GTK_SCALE_BUTTON_H__
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define GTK_TYPE_SCALE_BUTTON (gimp_gtk_scale_button_get_type ())
#define GTK_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButton))
#define GTK_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
#define GTK_IS_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON))
#define GTK_IS_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE_BUTTON))
#define GTK_SCALE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
typedef struct _GtkScaleButton GtkScaleButton;
typedef struct _GtkScaleButtonClass GtkScaleButtonClass;
typedef struct _GtkScaleButtonPrivate GtkScaleButtonPrivate;
struct _GtkScaleButton
{
GtkButton parent;
GtkWidget *plus_button;
GtkWidget *minus_button;
/*< private >*/
GtkScaleButtonPrivate *priv;
};
struct _GtkScaleButtonClass
{
GtkButtonClass parent_class;
/* signals */
void (* value_changed) (GtkScaleButton *button,
gdouble value);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
};
GType gimp_gtk_scale_button_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_gtk_scale_button_new (GtkIconSize size,
gdouble min,
gdouble max,
gdouble step,
const gchar **icons);
void gimp_gtk_scale_button_set_icons (GtkScaleButton *button,
const gchar **icons);
gdouble gimp_gtk_scale_button_get_value (GtkScaleButton *button);
void gimp_gtk_scale_button_set_value (GtkScaleButton *button,
gdouble value);
GtkAdjustment * gimp_gtk_scale_button_get_adjustment (GtkScaleButton *button);
void gimp_gtk_scale_button_set_adjustment (GtkScaleButton *button,
GtkAdjustment *adjustment);
GtkOrientation gimp_gtk_scale_button_get_orientation (GtkScaleButton *button);
void gimp_gtk_scale_button_set_orientation (GtkScaleButton *button,
GtkOrientation orientation);
G_END_DECLS
#endif /* __GTK_SCALE_BUTTON_H__ */