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

remove g_return_if_fail() from private functions and virtual function

Browse Source 
2008-07-21  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkspinbutton.c: remove g_return_if_fail() from private
	functions and virtual function implementations. Some minor
	cleanups.


svn path=/trunk/; revision=20873
This commit is contained in:
Michael Natterer
2008-07-21 09:41:28 +00:00
committed by Michael Natterer
parent 4346194869
commit c6bb5b4882
2 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-21 Michael Natterer <mitch@imendio.com>
* gtk/gtkspinbutton.c: remove g_return_if_fail() from private
functions and virtual function implementations. Some minor
cleanups.
2008-07-20 Andre Klapper <a9016009@gmx.de>
Bug 543915 - translation issues

43
gtk/gtkspinbutton.c
View File

@ -164,15 +164,11 @@ static void
gtk_spin_button_class_init (GtkSpinButtonClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkEntryClass *entry_class;
GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkEntryClass *entry_class = GTK_ENTRY_CLASS (class);
GtkBindingSet *binding_set;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
entry_class = (GtkEntryClass*) class;
gobject_class->finalize = gtk_spin_button_finalize;
gobject_class->set_property = gtk_spin_button_set_property;
@ -394,9 +390,7 @@ gtk_spin_button_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GtkSpinButton *spin_button;
spin_button = GTK_SPIN_BUTTON (object);
GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
switch (prop_id)
{
@ -447,9 +441,7 @@ gtk_spin_button_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GtkSpinButton *spin_button;
spin_button = GTK_SPIN_BUTTON (object);
GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
switch (prop_id)
{
@ -547,13 +539,12 @@ gtk_spin_button_unmap (GtkWidget *widget)
static void
gtk_spin_button_realize (GtkWidget *widget)
{
GtkSpinButton *spin_button;
GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
GdkWindowAttr attributes;
gint attributes_mask;
gboolean return_val;
gint arrow_size;
spin_button = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin_button);
gtk_widget_set_events (widget, gtk_widget_get_events (widget) |
@ -634,12 +625,10 @@ static void
gtk_spin_button_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkEntry *entry;
GtkSpinButton *spin_button;
GtkSpinButton *spin_button = GTK_SPIN_BUTTON (widget);
GtkEntry *entry = GTK_ENTRY (widget);
gint arrow_size;
entry = GTK_ENTRY (widget);
spin_button = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin_button);
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->size_request (widget, requisition);
@ -702,15 +691,11 @@ static void
gtk_spin_button_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkSpinButton *spin;
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
GtkAllocation panel_allocation;
gint arrow_size;
gint panel_width;
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
g_return_if_fail (allocation != NULL);
spin = GTK_SPIN_BUTTON (widget);
arrow_size = spin_button_get_arrow_size (spin);
panel_width = arrow_size + 2 * widget->style->xthickness;
@ -744,12 +729,7 @@ static gint
gtk_spin_button_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkSpinButton *spin;
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
spin = GTK_SPIN_BUTTON (widget);
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
if (GTK_WIDGET_DRAWABLE (widget))
{
@ -820,7 +800,6 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
gint width;
gint h, w;
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
g_return_if_fail (arrow_type == GTK_ARROW_UP || arrow_type == GTK_ARROW_DOWN);
widget = GTK_WIDGET (spin_button);
@ -1411,8 +1390,6 @@ gtk_spin_button_get_text_area_size (GtkEntry *entry,
gint arrow_size;
gint panel_width;
g_return_if_fail (GTK_IS_SPIN_BUTTON (entry));
GTK_ENTRY_CLASS (gtk_spin_button_parent_class)->get_text_area_size (entry, x, y, width, height);
arrow_size = spin_button_get_arrow_size (GTK_SPIN_BUTTON (entry));