AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

Revert commit a9b778931c

Browse Source 
The change turned out to break the pygtk build. So add the
pointless return values back, and document them as going
away in the future.
This commit is contained in:
Matthias Clasen 2010-06-29 21:07:54 -04:00
parent c47c91cd3a
commit f23c956473
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkcalendar.c
View File

@ -3678,14 +3678,20 @@ gtk_calendar_set_display_options (GtkCalendar *calendar,
* @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.
*
* Note that this function always returns %TRUE, and you should
* ignore the return value. In GTK+ 3, this function will not
* return a value.
*
* Returns: %TRUE, always
**/ **/
void gboolean
gtk_calendar_select_month (GtkCalendar *calendar, gtk_calendar_select_month (GtkCalendar *calendar,
guint month, guint month,
guint year) guint year)
{ {
g_return_if_fail (GTK_IS_CALENDAR (calendar)); g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
g_return_if_fail (month <= 11); g_return_val_if_fail (month <= 11, FALSE);
calendar->month = month; calendar->month = month;
calendar->year = year; calendar->year = year;
@ -3701,6 +3707,8 @@ 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;
} }
/** /**
@ -3773,12 +3781,18 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
* @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.
*
* Note that this function always returns %TRUE, and you should
* ignore the return value. In GTK+ 3, this function will not
* return a value.
*
* Returns: %TRUE, always
*/ */
void gboolean
gtk_calendar_mark_day (GtkCalendar *calendar, gtk_calendar_mark_day (GtkCalendar *calendar,
guint day) guint day)
{ {
g_return_if_fail (GTK_IS_CALENDAR (calendar)); g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
if (day >= 1 && day <= 31 && !calendar->marked_date[day-1]) if (day >= 1 && day <= 31 && !calendar->marked_date[day-1])
{ {
@ -3786,6 +3800,8 @@ gtk_calendar_mark_day (GtkCalendar *calendar,
calendar->num_marked_dates++; calendar->num_marked_dates++;
calendar_invalidate_day_num (calendar, day); calendar_invalidate_day_num (calendar, day);
} }
return TRUE;
} }
/** /**
@ -3794,12 +3810,18 @@ gtk_calendar_mark_day (GtkCalendar *calendar,
* @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.
*
* Note that this function always returns %TRUE, and you should
* ignore the return value. In GTK+ 3, this function will not
* return a value.
*
* Returns: %TRUE, always
*/ */
void gboolean
gtk_calendar_unmark_day (GtkCalendar *calendar, gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day) guint day)
{ {
g_return_if_fail (GTK_IS_CALENDAR (calendar)); g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
if (day >= 1 && day <= 31 && calendar->marked_date[day-1]) if (day >= 1 && day <= 31 && calendar->marked_date[day-1])
{ {
@ -3807,6 +3829,8 @@ gtk_calendar_unmark_day (GtkCalendar *calendar,
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

@ -159,15 +159,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);
void gtk_calendar_select_month (GtkCalendar *calendar, gboolean 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);
void gtk_calendar_mark_day (GtkCalendar *calendar, gboolean gtk_calendar_mark_day (GtkCalendar *calendar,
guint day); guint day);
void gtk_calendar_unmark_day (GtkCalendar *calendar, gboolean gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day); guint day);
void gtk_calendar_clear_marks (GtkCalendar *calendar); void gtk_calendar_clear_marks (GtkCalendar *calendar);