AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkCalendar: some functions always return TRUE, so change them to void

Browse Source 
Certain functions for GtkCalendar always return the same value. Therefore
they do not actually need to return a value at all.
Bug #621136.
This commit is contained in:
Thomas Wood 2010-06-15 00:00:40 -04:00 committed by Matthias Clasen
parent e9fc660d7e
commit e19c50b538
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gtk/gtkcalendar.c
View File

@ -3660,22 +3660,20 @@ gtk_calendar_set_display_options (GtkCalendar *calendar,
* @calendar: a #GtkCalendar * @calendar: a #GtkCalendar
* @month: a month number between 0 and 11. * @month: a month number between 0 and 11.
* @year: the year the month is in. * @year: the year the month is in.
* *
* Shifts the calendar to a different month. * Shifts the calendar to a different month.
*
* Return value: %TRUE, always
**/ **/
gboolean void
gtk_calendar_select_month (GtkCalendar *calendar, gtk_calendar_select_month (GtkCalendar *calendar,
guint month, guint month,
guint year) guint year)
{ {
g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE); g_return_if_fail (GTK_IS_CALENDAR (calendar));
g_return_val_if_fail (month <= 11, FALSE); g_return_if_fail (month <= 11);
calendar->month = month; calendar->month = month;
calendar->year = year; calendar->year = year;
calendar_compute_days (calendar); calendar_compute_days (calendar);
calendar_queue_refresh (calendar); calendar_queue_refresh (calendar);
@ -3687,7 +3685,6 @@ gtk_calendar_select_month (GtkCalendar *calendar,
g_signal_emit (calendar, g_signal_emit (calendar,
gtk_calendar_signals[MONTH_CHANGED_SIGNAL], gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
0); 0);
return TRUE;
} }
/** /**
@ -3756,52 +3753,44 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
/** /**
* gtk_calendar_mark_day: * gtk_calendar_mark_day:
* @calendar: a #GtkCalendar * @calendar: a #GtkCalendar
* @day: the day number to mark between 1 and 31. * @day: the day number to mark between 1 and 31.
* *
* Places a visual marker on a particular day. * Places a visual marker on a particular day.
* */
* Return value: %TRUE, always void
**/
gboolean
gtk_calendar_mark_day (GtkCalendar *calendar, gtk_calendar_mark_day (GtkCalendar *calendar,
guint day) guint day)
{ {
g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE); g_return_if_fail (GTK_IS_CALENDAR (calendar));
if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE) if (day >= 1 && day <= 31 && !calendar->marked_date[day-1])
{ {
calendar->marked_date[day - 1] = TRUE; calendar->marked_date[day - 1] = TRUE;
calendar->num_marked_dates++; calendar->num_marked_dates++;
calendar_invalidate_day_num (calendar, day); calendar_invalidate_day_num (calendar, day);
} }
return TRUE;
} }
/** /**
* gtk_calendar_unmark_day: * gtk_calendar_unmark_day:
* @calendar: a #GtkCalendar. * @calendar: a #GtkCalendar.
* @day: the day number to unmark between 1 and 31. * @day: the day number to unmark between 1 and 31.
* *
* Removes the visual marker from a particular day. * Removes the visual marker from a particular day.
* */
* Return value: %TRUE, always void
**/
gboolean
gtk_calendar_unmark_day (GtkCalendar *calendar, gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day) guint day)
{ {
g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE); g_return_if_fail (GTK_IS_CALENDAR (calendar));
if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE) if (day >= 1 && day <= 31 && calendar->marked_date[day-1])
{ {
calendar->marked_date[day - 1] = FALSE; calendar->marked_date[day - 1] = FALSE;
calendar->num_marked_dates--; calendar->num_marked_dates--;
calendar_invalidate_day_num (calendar, day); calendar_invalidate_day_num (calendar, day);
} }
return TRUE;
} }
/** /**

6
gtk/gtkcalendar.h
View File

@ -156,15 +156,15 @@ struct _GtkCalendarClass
GType gtk_calendar_get_type (void) G_GNUC_CONST; GType gtk_calendar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_calendar_new (void); GtkWidget* gtk_calendar_new (void);
gboolean gtk_calendar_select_month (GtkCalendar *calendar, void gtk_calendar_select_month (GtkCalendar *calendar,
guint month, guint month,
guint year); guint year);
void gtk_calendar_select_day (GtkCalendar *calendar, void gtk_calendar_select_day (GtkCalendar *calendar,
guint day); guint day);
gboolean gtk_calendar_mark_day (GtkCalendar *calendar, void gtk_calendar_mark_day (GtkCalendar *calendar,
guint day); guint day);
gboolean gtk_calendar_unmark_day (GtkCalendar *calendar, void gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day); guint day);
void gtk_calendar_clear_marks (GtkCalendar *calendar); void gtk_calendar_clear_marks (GtkCalendar *calendar);