libgimpwidgets/Makefile.am cleanup.

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

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>
Merged from weskaggs branch at Mitch's request. Will
@ -9,9 +14,7 @@
* libgimpwidgets/gimpscaleentry.c
* libgimpwidgets/gimpscaleentry.h: new files.
* libgimpwidgets/gimpwidgets.h
* libgimpwidgets/gimpwidgets.c
* libgimpwidgets/gimpwidgets.h
* libgimpwidgets/gimpwidgets.[ch]
* libgimpwidgets/Makefile.am: changed accordingly.
2008-02-14 Sven Neumann <sven@gimp.org>

View File

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

View File

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

View File

@ -24,6 +24,9 @@
#ifndef __GIMP_SCALE_ENTRY_H__
#define __GIMP_SCALE_ENTRY_H__
G_BEGIN_DECLS
#define GIMP_SCALE_ENTRY_LABEL(adj) \
(g_object_get_data (G_OBJECT (adj), "label"))
@ -39,6 +42,7 @@
gtk_spin_button_get_adjustment \
(GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton")))
GtkObject * gimp_scale_entry_new (GtkTable *table,
gint column,
gint row,
@ -57,7 +61,6 @@ GtkObject * gimp_scale_entry_new (GtkTable *table,
const gchar *tooltip,
const gchar *help_id);
GtkObject * gimp_color_scale_entry_new (GtkTable *table,
gint column,
gint row,