callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpwidgets/Makefile.am cleanup.

Browse Source 
2008-02-14  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/Makefile.am
	* libgimpwidgets/gimpscaleentry.[ch]: cleanup.


svn path=/trunk/; revision=24888
This commit is contained in:
Michael Natterer
2008-02-14 17:49:53 +00:00
committed by Michael Natterer
parent 4397dc25bf
commit 77968a1baa
4 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-14 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/Makefile.am
* libgimpwidgets/gimpscaleentry.[ch]: cleanup.
2008-02-14 Bill Skaggs <weskaggs@primate.ucdavis.edu> 2008-02-14 Bill Skaggs <weskaggs@primate.ucdavis.edu>
Merged from weskaggs branch at Mitch's request. Will Merged from weskaggs branch at Mitch's request. Will
@ -9,9 +14,7 @@
* libgimpwidgets/gimpscaleentry.c * libgimpwidgets/gimpscaleentry.c
* libgimpwidgets/gimpscaleentry.h: new files. * libgimpwidgets/gimpscaleentry.h: new files.
* libgimpwidgets/gimpwidgets.h * libgimpwidgets/gimpwidgets.[ch]
* libgimpwidgets/gimpwidgets.c
* libgimpwidgets/gimpwidgets.h
* libgimpwidgets/Makefile.am: changed accordingly. * libgimpwidgets/Makefile.am: changed accordingly.
2008-02-14 Sven Neumann <sven@gimp.org> 2008-02-14 Sven Neumann <sven@gimp.org>

2
libgimpwidgets/Makefile.am
View File

@ -150,8 +150,8 @@ libgimpwidgets_2_0_la_sources = \
gimppropwidgets.h \ gimppropwidgets.h \
gimpquerybox.c \ gimpquerybox.c \
gimpquerybox.h \ gimpquerybox.h \
gimpscaleentry.h \
gimpscaleentry.c \ gimpscaleentry.c \
gimpscaleentry.h \
gimpscrolledpreview.c \ gimpscrolledpreview.c \
gimpscrolledpreview.h \ gimpscrolledpreview.h \
gimpsizeentry.c \ gimpsizeentry.c \

3
libgimpwidgets/gimpscaleentry.c
View File

@ -1,7 +1,7 @@
/* LIBGIMP - The GIMP Library /* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpwidgets.c * gimpscaleentry.c
* Copyright (C) 2000 Michael Natterer <mitch@gimp.org> * Copyright (C) 2000 Michael Natterer <mitch@gimp.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -30,6 +30,7 @@
#include "gimpwidgets.h" #include "gimpwidgets.h"
static void gimp_scale_entry_unconstrained_adjustment_callback (GtkAdjustment *adjustment, static void gimp_scale_entry_unconstrained_adjustment_callback (GtkAdjustment *adjustment,
GtkAdjustment *other_adj); GtkAdjustment *other_adj);
static void gimp_scale_entry_exp_adjustment_callback (GtkAdjustment *adjustment, static void gimp_scale_entry_exp_adjustment_callback (GtkAdjustment *adjustment,

77
libgimpwidgets/gimpscaleentry.h
View File

@ -3,7 +3,7 @@
* *
* gimpscaleentry.h * gimpscaleentry.h
* Copyright (C) 2000 Michael Natterer <mitch@gimp.org>, * Copyright (C) 2000 Michael Natterer <mitch@gimp.org>,
* 2008 Bill Skaggs <weskaggs@primate.ucdavis.edu> * 2008 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -24,6 +24,9 @@
#ifndef __GIMP_SCALE_ENTRY_H__ #ifndef __GIMP_SCALE_ENTRY_H__
#define __GIMP_SCALE_ENTRY_H__ #define __GIMP_SCALE_ENTRY_H__
G_BEGIN_DECLS
#define GIMP_SCALE_ENTRY_LABEL(adj) \ #define GIMP_SCALE_ENTRY_LABEL(adj) \
(g_object_get_data (G_OBJECT (adj), "label")) (g_object_get_data (G_OBJECT (adj), "label"))
@ -39,46 +42,46 @@
gtk_spin_button_get_adjustment \ gtk_spin_button_get_adjustment \
(GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton"))) (GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton")))
GtkObject * gimp_scale_entry_new (GtkTable *table,
gint column,
gint row,
const gchar *text,
gint scale_width,
gint spinbutton_width,
gdouble value,
gdouble lower,
gdouble upper,
gdouble step_increment,
gdouble page_increment,
guint digits,
gboolean constrain,
gdouble unconstrained_lower,
gdouble unconstrained_upper,
const gchar *tooltip,
const gchar *help_id);
GtkObject * gimp_scale_entry_new (GtkTable *table,
gint column,
gint row,
const gchar *text,
gint scale_width,
gint spinbutton_width,
gdouble value,
gdouble lower,
gdouble upper,
gdouble step_increment,
gdouble page_increment,
guint digits,
gboolean constrain,
gdouble unconstrained_lower,
gdouble unconstrained_upper,
const gchar *tooltip,
const gchar *help_id);
GtkObject * gimp_color_scale_entry_new (GtkTable *table, GtkObject * gimp_color_scale_entry_new (GtkTable *table,
gint column, gint column,
gint row, gint row,
const gchar *text, const gchar *text,
gint scale_width, gint scale_width,
gint spinbutton_width, gint spinbutton_width,
gdouble value, gdouble value,
gdouble lower, gdouble lower,
gdouble upper, gdouble upper,
gdouble step_increment, gdouble step_increment,
gdouble page_increment, gdouble page_increment,
guint digits, guint digits,
const gchar *tooltip, const gchar *tooltip,
const gchar *help_id); const gchar *help_id);
void gimp_scale_entry_set_sensitive (GtkObject *adjustment, void gimp_scale_entry_set_sensitive (GtkObject *adjustment,
gboolean sensitive); gboolean sensitive);
void gimp_scale_entry_set_logarithmic (GtkObject *adjustment, void gimp_scale_entry_set_logarithmic (GtkObject *adjustment,
gboolean logarithmic); gboolean logarithmic);
gboolean gimp_scale_entry_get_logarithmic (GtkObject *adjustment); gboolean gimp_scale_entry_get_logarithmic (GtkObject *adjustment);