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> 2008-07-20 Andre Klapper <a9016009@gmx.de>
Bug 543915 - translation issues Bug 543915 - translation issues

47
gtk/gtkspinbutton.c
View File

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