From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 12:56:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- widgets/misc/e-activity-handler.h | 9 ++------- widgets/misc/e-calendar-item.h | 8 ++------ widgets/misc/e-calendar.h | 8 ++------ widgets/misc/e-canvas-vbox.h | 9 ++------- widgets/misc/e-canvas.h | 9 ++------- widgets/misc/e-combo-button.h | 9 ++------- widgets/misc/e-config-page.h | 9 ++------- widgets/misc/e-dropdown-button.h | 9 ++------- widgets/misc/e-filter-bar.h | 9 ++------- widgets/misc/e-info-label.h | 9 ++------- widgets/misc/e-multi-config-dialog.h | 9 ++------- widgets/misc/e-reflow-model.h | 8 ++------ widgets/misc/e-reflow.h | 9 ++------- widgets/misc/e-selection-model-array.h | 8 ++------ widgets/misc/e-selection-model-simple.h | 8 ++------ widgets/misc/e-selection-model.h | 8 ++------ widgets/misc/e-task-bar.h | 9 ++------- widgets/misc/e-task-widget.h | 9 ++------- widgets/misc/e-url-entry.h | 9 ++------- 19 files changed, 38 insertions(+), 127 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index 65bd1ded97..880972867e 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -27,10 +27,7 @@ #include "e-util/e-logger.h" #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_ACTIVITY_HANDLER (e_activity_handler_get_type ()) #define E_ACTIVITY_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ACTIVITY_HANDLER, EActivityHandler)) @@ -101,8 +98,6 @@ e_activity_handler_operation_set_error (EActivityHandler *activity_handler, void e_activity_handler_set_error_flush_time (EActivityHandler *handler, gint time); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_ACTIVITY_HANDLER_H_ */ diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index 926ba1c077..f86fc4fd79 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -27,9 +27,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * ECalendarItem - canvas item displaying a calendar. @@ -367,8 +365,6 @@ gint e_calendar_item_get_week_number (ECalendarItem *calitem, void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_CALENDAR_ITEM_H_ */ diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index 7a3c8fd010..911e9ee22a 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -27,9 +27,7 @@ #include #include "e-calendar-item.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * ECalendar - displays a table of monthly calendars, allowing highlighting @@ -95,8 +93,6 @@ void e_calendar_get_border_size (ECalendar *cal, void e_calendar_set_focusable (ECalendar *cal, gboolean focusable); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_CALENDAR_H_ */ diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index 7fa38fa778..fb049c3e9c 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -26,10 +26,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* ECanvasVbox - A canvas item container. * @@ -84,9 +81,7 @@ void e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *i void e_canvas_vbox_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item); GType e_canvas_vbox_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CANVAS_VBOX_H__ */ diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index 5f60fc4046..58994d6e29 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -26,10 +26,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* ECanvas - A class derived from canvas for the purpose of adding * evolution specific canvas hacks. @@ -148,9 +145,7 @@ void e_canvas_popup_tooltip (ECanvas gint y); void e_canvas_hide_tooltip (ECanvas *canvas); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CANVAS_H__ */ diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h index c36948cbde..29d4b2efe7 100644 --- a/widgets/misc/e-combo-button.h +++ b/widgets/misc/e-combo-button.h @@ -29,10 +29,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_COMBO_BUTTON (e_combo_button_get_type ()) #define E_COMBO_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMBO_BUTTON, EComboButton)) @@ -76,8 +73,6 @@ GtkWidget *e_combo_button_get_label (EComboButton *combo_button); gboolean e_combo_button_popup_menu (EComboButton *combo_button); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_COMBO_BUTTON_H_ */ diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h index 886d89d851..1de9591397 100644 --- a/widgets/misc/e-config-page.h +++ b/widgets/misc/e-config-page.h @@ -29,10 +29,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_CONFIG_PAGE (e_config_page_get_type ()) #define E_CONFIG_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONFIG_PAGE, EConfigPage)) @@ -60,8 +57,6 @@ struct _EConfigPageClass { GType e_config_page_get_type (void); GtkWidget *e_config_page_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_CONFIG_PAGE_H_ */ diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h index 19f678b4eb..f58cd73085 100644 --- a/widgets/misc/e-dropdown-button.h +++ b/widgets/misc/e-dropdown-button.h @@ -29,10 +29,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_DROPDOWN_BUTTON (e_dropdown_button_get_type ()) #define E_DROPDOWN_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DROPDOWN_BUTTON, EDropdownButton)) @@ -63,8 +60,6 @@ void e_dropdown_button_construct (EDropdownButton *dropdown_button, GtkWidget *e_dropdown_button_new (const gchar *label_text, GtkMenu *menu); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DROPDOWN_BUTTON_H_ */ diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 3e22182021..f25a66fa73 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -32,10 +32,7 @@ #include "filter/rule-context.h" #include "filter/filter-rule.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* EFilterBar - A filter rule driven search bar. * @@ -137,9 +134,7 @@ e_filter_bar_new_construct (RuleContext *context, EFilterBarConfigRule config, gpointer data ,EFilterBar *bar ); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_FILTER_BAR_H__ */ diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index 1541fb8f10..8509e30130 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -26,10 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_INFO_LABEL_GET_CLASS(emfv) ((EInfoLabelClass *) G_OBJECT_GET_CLASS (emfv)) @@ -52,8 +49,6 @@ GType e_info_label_get_type(void); GtkWidget *e_info_label_new(const gchar *icon); void e_info_label_set_info(EInfoLabel *, const gchar *loc, const gchar *info); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _E_INFO_LABEL_H */ diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h index 88a538bb1f..1bc310b888 100644 --- a/widgets/misc/e-multi-config-dialog.h +++ b/widgets/misc/e-multi-config-dialog.h @@ -31,10 +31,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_MULTI_CONFIG_DIALOG (e_multi_config_dialog_get_type ()) #define E_MULTI_CONFIG_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MULTI_CONFIG_DIALOG, EMultiConfigDialog)) @@ -69,8 +66,6 @@ void e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, void e_multi_config_dialog_show_page (EMultiConfigDialog *dialog, gint page); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MULTI_CONFIG_DIALOG_H_ */ diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h index d606edf8cd..ebbf3c1f75 100644 --- a/widgets/misc/e-reflow-model.h +++ b/widgets/misc/e-reflow-model.h @@ -27,9 +27,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_REFLOW_MODEL_TYPE (e_reflow_model_get_type ()) #define E_REFLOW_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_REFLOW_MODEL_TYPE, EReflowModel)) @@ -105,8 +103,6 @@ void e_reflow_model_item_removed (EReflowModel *e_reflow_m void e_reflow_model_item_changed (EReflowModel *e_reflow_model, gint n); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_REFLOW_MODEL_H_ */ diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 69527bdf05..19e6d4a709 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -28,10 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* EReflow - A canvas item container. * @@ -139,8 +136,6 @@ struct _EReflowClass */ GType e_reflow_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_REFLOW_H__ */ diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index be21a5557e..3f69fca342 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -28,9 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_SELECTION_MODEL_ARRAY_TYPE (e_selection_model_array_get_type ()) #define E_SELECTION_MODEL_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArray)) @@ -89,9 +87,7 @@ void e_selection_model_array_confirm_row_count (ESelectionModelArray *esm); /* Protected Virtual Function */ gint e_selection_model_array_get_row_count (ESelectionModelArray *esm); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_SELECTION_MODEL_ARRAY_H_ */ diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 8db463b32f..2433543ade 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_SELECTION_MODEL_SIMPLE_TYPE (e_selection_model_simple_get_type ()) #define E_SELECTION_MODEL_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimple)) @@ -62,9 +60,7 @@ void e_selection_model_simple_move_row (ESelectionModelS void e_selection_model_simple_set_row_count (ESelectionModelSimple *selection, gint row_count); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_SELECTION_MODEL_SIMPLE_H_ */ diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index 16194000a5..c87ccf960e 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -27,9 +27,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_SELECTION_MODEL_TYPE (e_selection_model_get_type ()) #define E_SELECTION_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_TYPE, ESelectionModel)) @@ -160,9 +158,7 @@ void e_selection_model_selection_row_changed (ESelectionModel *selection, gint row); void e_selection_model_selection_changed (ESelectionModel *selection); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_SELECTION_MODEL_H_ */ diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index f208603b63..d88c0697dd 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -27,10 +27,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_TASK_BAR (e_task_bar_get_type ()) #define E_TASK_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_BAR, ETaskBar)) @@ -74,8 +71,6 @@ void e_task_bar_remove_task_from_id (ETaskBar *task_bar, ETaskWidget *e_task_bar_get_task_widget (ETaskBar *task_bar, gint n); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_TASK_BAR_H_ */ diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h index c023d45030..b650bd8ac5 100644 --- a/widgets/misc/e-task-widget.h +++ b/widgets/misc/e-task-widget.h @@ -25,10 +25,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_TASK_WIDGET (e_task_widget_get_type ()) #define E_TASK_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_WIDGET, ETaskWidget)) @@ -75,8 +72,6 @@ void e_task_wiget_alert (ETaskWidget *task_widget); void e_task_wiget_unalert (ETaskWidget *task_widget); const gchar * e_task_widget_get_component_id (ETaskWidget *task_widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_TASK_WIDGET_H_ */ diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h index a4edc51df2..e5c83323db 100644 --- a/widgets/misc/e-url-entry.h +++ b/widgets/misc/e-url-entry.h @@ -29,10 +29,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_URL_ENTRY (e_url_entry_get_type ()) #define E_URL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_URL_ENTRY, EUrlEntry)) @@ -61,8 +58,6 @@ GType e_url_entry_get_type (void); GtkWidget *e_url_entry_new (void); GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_URL_ENTRY_H_ */ -- cgit v1.2.3 From 547e123d2777bd3beba36e74e018efb590ed44d4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- widgets/misc/e-info-label.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index 8509e30130..977cc6ac4f 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -36,8 +36,8 @@ typedef struct _EInfoLabelClass EInfoLabelClass; struct _EInfoLabel { GtkHBox parent; - struct _GtkWidget *location; - struct _GtkWidget *info; + GtkWidget *location; + GtkWidget *info; }; struct _EInfoLabelClass { -- cgit v1.2.3 From d492860ffe395d219cd79e5abff314061517ff45 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 19 Jun 2009 16:58:10 -0400 Subject: Remove a weak pointer when disposing EAttachmentHandler. --- widgets/misc/e-attachment-handler.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c index 0a6ed0505d..303fc33cc2 100644 --- a/widgets/misc/e-attachment-handler.c +++ b/widgets/misc/e-attachment-handler.c @@ -90,6 +90,23 @@ attachment_handler_constructed (GObject *object) * something here in the future. */ } +static void +attachment_handler_dispose (GObject *object) +{ + EAttachmentHandlerPrivate *priv; + + priv = E_ATTACHMENT_HANDLER_GET_PRIVATE (object); + + if (priv->view != NULL) { + g_object_remove_weak_pointer ( + G_OBJECT (priv->view), &priv->view); + priv->view = NULL; + } + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); +} + static void attachment_handler_class_init (EAttachmentHandlerClass *class) { @@ -102,6 +119,7 @@ attachment_handler_class_init (EAttachmentHandlerClass *class) object_class->set_property = attachment_handler_set_property; object_class->get_property = attachment_handler_get_property; object_class->constructed = attachment_handler_constructed; + object_class->dispose = attachment_handler_dispose; g_object_class_install_property ( object_class, -- cgit v1.2.3 From 2d0ca7939abde5a7cfe1dcbb974e52939637e5a9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Jun 2009 14:54:43 +0200 Subject: Bug #245723 - Show days with transparent events in italic --- widgets/misc/e-calendar-item.c | 38 +++++++++++++++++++++++++++----------- widgets/misc/e-calendar-item.h | 10 +++++++--- widgets/misc/test-calendar.c | 4 ++-- 3 files changed, 36 insertions(+), 16 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 890355620b..5f4b828783 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -139,7 +139,8 @@ static void e_calendar_item_get_day_style (ECalendarItem *calitem, GdkColor **bg_color, GdkColor **fg_color, GdkColor **box_color, - gboolean *bold); + gboolean *bold, + gboolean *italic); static void e_calendar_item_check_selection_end (ECalendarItem *calitem, gint start_month, gint start_day, @@ -1420,7 +1421,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, gint week_num, mon, days_from_week_start; gint years[3], months[3], days_in_month[3]; gboolean today, selected, has_focus, drop_target = FALSE; - gboolean bold, draw_day, finished = FALSE; + gboolean bold, italic, draw_day, finished = FALSE; gint today_year, today_month, today_mday, month_offset; gchar buffer[9]; gint day_style = 0; @@ -1579,6 +1580,9 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, else has_focus = FALSE; + bold = FALSE; + italic = FALSE; + if (calitem->style_callback) (*calitem->style_callback) (calitem, @@ -1595,6 +1599,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, &fg_color, &box_color, &bold, + &italic, calitem->style_callback_data); else e_calendar_item_get_day_style @@ -1611,7 +1616,8 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, &bg_color, &fg_color, &box_color, - &bold); + &bold, + &italic); /* Draw the background, if set. */ if (bg_color) { @@ -1664,6 +1670,13 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, } else { pango_font_description_set_weight (font_desc, PANGO_WEIGHT_NORMAL); } + + if (italic) { + pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC); + } else { + pango_font_description_set_style (font_desc, PANGO_STYLE_NORMAL); + } + pango_layout_set_font_description (layout, font_desc); pango_layout_set_text (layout, buffer, num_chars); cairo_translate (cr, day_x, day_y); @@ -2053,7 +2066,8 @@ e_calendar_item_get_day_style (ECalendarItem *calitem, GdkColor **bg_color, GdkColor **fg_color, GdkColor **box_color, - gboolean *bold) + gboolean *bold, + gboolean *italic) { GtkWidget *widget; GtkStyle *style; @@ -2064,10 +2078,9 @@ e_calendar_item_get_day_style (ECalendarItem *calitem, *bg_color = NULL; *fg_color = NULL; *box_color = NULL; - *bold = FALSE; - if (day_style == 1) - *bold = TRUE; + *bold = (day_style & E_CALENDAR_ITEM_MARK_BOLD) == E_CALENDAR_ITEM_MARK_BOLD; + *italic = (day_style & E_CALENDAR_ITEM_MARK_ITALIC) == E_CALENDAR_ITEM_MARK_ITALIC; if (today) *box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX]; @@ -2849,12 +2862,14 @@ e_calendar_item_clear_marks (ECalendarItem *calitem) } +/* add_day_style - whether bit-or with the actual style or change the style fully */ void e_calendar_item_mark_day (ECalendarItem *calitem, gint year, gint month, gint day, - guint8 day_style) + guint8 day_style, + gboolean add_day_style) { gint month_offset; @@ -2865,7 +2880,7 @@ e_calendar_item_mark_day (ECalendarItem *calitem, if (!calitem->styles) calitem->styles = g_new0 (guint8, (calitem->rows * calitem->cols + 2) * 32); - calitem->styles[(month_offset + 1) * 32 + day] = day_style; + calitem->styles[(month_offset + 1) * 32 + day] = (add_day_style ? calitem->styles[(month_offset + 1) * 32 + day] : 0) | day_style; gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem)); } @@ -2879,7 +2894,8 @@ e_calendar_item_mark_days (ECalendarItem *calitem, gint end_year, gint end_month, gint end_day, - guint8 day_style) + guint8 day_style, + gboolean add_day_style) { gint month_offset, end_month_offset, day; @@ -2920,7 +2936,7 @@ e_calendar_item_mark_days (ECalendarItem *calitem, #if 0 g_print ("Marking Month:%i Day:%i\n", month_offset, day); #endif - calitem->styles[(month_offset + 1) * 32 + day] = day_style; + calitem->styles[(month_offset + 1) * 32 + day] = (add_day_style ? calitem->styles[(month_offset + 1) * 32 + day] : 0) | day_style; day++; if (day == 32) { diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index f86fc4fd79..936e86ebab 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -41,7 +41,8 @@ G_BEGIN_DECLS #define E_CALENDAR_COLS_PER_MONTH 7 /* Used to mark days as bold in e_calendar_item_mark_day(). */ -#define E_CALENDAR_ITEM_MARK_BOLD 1 +#define E_CALENDAR_ITEM_MARK_BOLD (1 << 0) +#define E_CALENDAR_ITEM_MARK_ITALIC (1 << 1) /* * These are the padding sizes between various pieces of the calendar. @@ -101,6 +102,7 @@ typedef void (*ECalendarItemStyleCallback) (ECalendarItem *calitem, GdkColor **fg_color, GdkColor **box_color, gboolean *bold, + gboolean *italic, gpointer data); /* The type of the callback function optionally used to get the current time. @@ -329,7 +331,8 @@ void e_calendar_item_mark_day (ECalendarItem *calitem, gint year, gint month, gint day, - guint8 day_style); + guint8 day_style, + gboolean add_day_style); /* Mark a range of days. Any days outside the currently shown range are ignored. */ @@ -340,7 +343,8 @@ void e_calendar_item_mark_days (ECalendarItem *calitem, gint end_year, gint end_month, gint end_day, - guint8 day_style); + guint8 day_style, + gboolean add_day_style); /* Sets the function to call to get the colors to use for a particular day. */ void e_calendar_item_set_style_callback (ECalendarItem *calitem, diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 68a9cc12f7..20b8773c34 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -120,9 +120,9 @@ on_date_range_changed (ECalendarItem *calitem) /* These days should appear bold. Remember month is 0 to 11. */ e_calendar_item_mark_day (calitem, 2000, 7, 26, /* 26th Aug 2000. */ - E_CALENDAR_ITEM_MARK_BOLD); + E_CALENDAR_ITEM_MARK_BOLD, FALSE); e_calendar_item_mark_day (calitem, 2000, 8, 13, /* 13th Sep 2000. */ - E_CALENDAR_ITEM_MARK_BOLD); + E_CALENDAR_ITEM_MARK_BOLD, FALSE); } -- cgit v1.2.3 From 42e75c9162402078ac629740821c3533925ee342 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 17:18:36 -0400 Subject: Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am. --- widgets/misc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'widgets/misc') diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index e40664be05..303efa878b 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/a11y/widgets \ -I$(top_srcdir)/widgets \ -- cgit v1.2.3