gtk+ r20873 - in trunk: . gtk
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk+ r20873 - in trunk: . gtk
- Date: Mon, 21 Jul 2008 09:41:28 +0000 (UTC)
Author: mitch
Date: Mon Jul 21 09:41:28 2008
New Revision: 20873
URL: http://svn.gnome.org/viewvc/gtk+?rev=20873&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/gtk/gtkspinbutton.c
Modified: trunk/gtk/gtkspinbutton.c
==============================================================================
--- trunk/gtk/gtkspinbutton.c (original)
+++ trunk/gtk/gtkspinbutton.c Mon Jul 21 09:41:28 2008
@@ -164,15 +164,11 @@
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,10 +390,8 @@
const GValue *value,
GParamSpec *pspec)
{
- GtkSpinButton *spin_button;
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
- spin_button = GTK_SPIN_BUTTON (object);
-
switch (prop_id)
{
GtkAdjustment *adjustment;
@@ -447,10 +441,8 @@
GValue *value,
GParamSpec *pspec)
{
- GtkSpinButton *spin_button;
+ GtkSpinButton *spin_button = GTK_SPIN_BUTTON (object);
- spin_button = GTK_SPIN_BUTTON (object);
-
switch (prop_id)
{
case PROP_ADJUSTMENT:
@@ -547,13 +539,12 @@
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,14 +625,12 @@
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);
if (entry->width_chars < 0)
@@ -702,15 +691,11 @@
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 @@
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,9 +800,8 @@
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);
if (GTK_WIDGET_DRAWABLE (widget))
@@ -1411,8 +1390,6 @@
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));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]