Commit d480fe3e authored by Morten Welinder's avatar Morten Welinder

Compilation: cleanup.

parent 3e371fb8
...@@ -69,7 +69,7 @@ insert_error_info (GtkTextBuffer* text, GOErrorInfo *error, gint level) ...@@ -69,7 +69,7 @@ insert_error_info (GtkTextBuffer* text, GOErrorInfo *error, gint level)
* SHOULD BE IN GOFFICE * SHOULD BE IN GOFFICE
* Returns: (transfer full): the newly allocated dialog. * Returns: (transfer full): the newly allocated dialog.
*/ */
GtkWidget * static GtkWidget *
gnumeric_go_error_info_list_dialog_create (GSList *errs) gnumeric_go_error_info_list_dialog_create (GSList *errs)
{ {
GtkWidget *dialog; GtkWidget *dialog;
......
...@@ -13,7 +13,6 @@ G_BEGIN_DECLS ...@@ -13,7 +13,6 @@ G_BEGIN_DECLS
void name (GtkAction *a, WBCGtk *wbcg) void name (GtkAction *a, WBCGtk *wbcg)
GtkWidget* gnumeric_go_error_info_dialog_create (GOErrorInfo *error); GtkWidget* gnumeric_go_error_info_dialog_create (GOErrorInfo *error);
GtkWidget* gnumeric_go_error_info_list_dialog_create (GSList *errs);
void gnumeric_go_error_info_dialog_show (GtkWindow *parent, void gnumeric_go_error_info_dialog_show (GtkWindow *parent,
GOErrorInfo *error); GOErrorInfo *error);
void gnumeric_go_error_info_list_dialog_show (GtkWindow *parent, void gnumeric_go_error_info_list_dialog_show (GtkWindow *parent,
......
...@@ -571,65 +571,6 @@ gnm_rendered_value_destroy (GnmRenderedValue *rv) ...@@ -571,65 +571,6 @@ gnm_rendered_value_destroy (GnmRenderedValue *rv)
CHUNK_FREE (rendered_value_pool, rv); CHUNK_FREE (rendered_value_pool, rv);
} }
/**
* gnm_rendered_value_recontext: (skip)
* @rv: #GnmRenderedValue
* @context: the new Pango context.
*
* Returns:
**/
GnmRenderedValue *
gnm_rendered_value_recontext (GnmRenderedValue *rv, PangoContext *context)
{
GnmRenderedValue *res;
PangoLayout *layout, *olayout;
if (rv->rotation) {
GnmRenderedRotatedValue *rres =
CHUNK_ALLOC (GnmRenderedRotatedValue, rendered_rotated_value_pool);
res = (GnmRenderedValue *)rres;
*rres = *(GnmRenderedRotatedValue *)rv;
rres->lines = g_memdup (rres->lines,
rres->linecount * sizeof (struct GnmRenderedRotatedValueInfo));
} else {
res = CHUNK_ALLOC (GnmRenderedValue, rendered_value_pool);
*res = *rv;
}
res->layout = layout = pango_layout_new (context);
olayout = rv->layout;
pango_layout_set_text (layout, pango_layout_get_text (olayout), -1);
pango_layout_set_alignment (layout, pango_layout_get_alignment (olayout));
pango_layout_set_attributes (layout, pango_layout_get_attributes (olayout));
pango_layout_set_single_paragraph_mode (layout, pango_layout_get_single_paragraph_mode (olayout));
pango_layout_set_justify (layout, pango_layout_get_justify (olayout));
pango_layout_set_width (layout, pango_layout_get_width (olayout));
pango_layout_set_spacing (layout, pango_layout_get_spacing (olayout));
pango_layout_set_wrap (layout, pango_layout_get_wrap (olayout));
pango_layout_set_indent (layout, pango_layout_get_indent (olayout));
pango_layout_set_auto_dir (layout, pango_layout_get_auto_dir (olayout));
pango_layout_set_ellipsize (layout, pango_layout_get_ellipsize (olayout));
pango_layout_set_font_description (layout, pango_layout_get_font_description (olayout));
/* ignore tabs */
/*
* We really want to keep the line breaks, but currently pango
* does not support that.
*/
if (pango_layout_get_line_count (olayout) == 1) {
if (pango_layout_get_line_count (layout) > 1) {
res->wrap_text = FALSE;
pango_layout_set_width (layout, -1);
}
}
gnm_rendered_value_remeasure (res);
return res;
}
/* Return the value as a single string without format infomation. /* Return the value as a single string without format infomation.
*/ */
char const * char const *
......
...@@ -46,8 +46,6 @@ GnmRenderedValue *gnm_rendered_value_new (GnmCell const *cell, ...@@ -46,8 +46,6 @@ GnmRenderedValue *gnm_rendered_value_new (GnmCell const *cell,
double zoom); double zoom);
void gnm_rendered_value_destroy (GnmRenderedValue *rv); void gnm_rendered_value_destroy (GnmRenderedValue *rv);
GnmRenderedValue *gnm_rendered_value_recontext (GnmRenderedValue *rv,
PangoContext *context);
void gnm_rendered_value_remeasure (GnmRenderedValue *rv); void gnm_rendered_value_remeasure (GnmRenderedValue *rv);
/* Return the value as a single string without format infomation. */ /* Return the value as a single string without format infomation. */
......
...@@ -128,8 +128,7 @@ cb_adjust_areas (gpointer data, G_GNUC_UNUSED gpointer user_data) ...@@ -128,8 +128,7 @@ cb_adjust_areas (gpointer data, G_GNUC_UNUSED gpointer user_data)
* analysis_tools_remove_label: * analysis_tools_remove_label:
* *
*/ */
static void
void
analysis_tools_remove_label (GnmValue *val, analysis_tools_remove_label (GnmValue *val,
gboolean labels, group_by_t group_by) gboolean labels, group_by_t group_by)
{ {
...@@ -208,7 +207,7 @@ analysis_tools_write_label (GnmValue *val, data_analysis_output_t *dao, ...@@ -208,7 +207,7 @@ analysis_tools_write_label (GnmValue *val, data_analysis_output_t *dao,
* *
*/ */
void static void
analysis_tools_write_a_label (GnmValue *val, data_analysis_output_t *dao, analysis_tools_write_a_label (GnmValue *val, data_analysis_output_t *dao,
gboolean labels, group_by_t group_by, gboolean labels, group_by_t group_by,
int x, int y) int x, int y)
......
...@@ -242,14 +242,6 @@ void analysis_tools_write_label_ftest (GnmValue *val, /* depreceated */ ...@@ -242,14 +242,6 @@ void analysis_tools_write_label_ftest (GnmValue *val, /* depreceated */
data_analysis_output_t *dao, data_analysis_output_t *dao,
int x, int y, int x, int y,
gboolean labels, int i); gboolean labels, int i);
void analysis_tools_write_a_label (GnmValue *val,
data_analysis_output_t *dao,
gboolean labels,
group_by_t group_by,
int x, int y);
void analysis_tools_remove_label (GnmValue *val,
gboolean labels,
group_by_t group_by);
gboolean analysis_tool_table (data_analysis_output_t *dao, gboolean analysis_tool_table (data_analysis_output_t *dao,
analysis_tools_data_generic_t *info, analysis_tools_data_generic_t *info,
......
...@@ -2843,25 +2843,6 @@ gnm_expr_entry_editing_canceled (GnmExprEntry *gee) ...@@ -2843,25 +2843,6 @@ gnm_expr_entry_editing_canceled (GnmExprEntry *gee)
/*****************************************************************************/ /*****************************************************************************/
void
gnm_expr_entry_disable_highlight (GnmExprEntry *gee)
{
g_return_if_fail (gee != NULL);
gee_destroy_feedback_range (gee);
gee->feedback_disabled = TRUE;
}
void
gnm_expr_entry_enable_highlight (GnmExprEntry *gee)
{
g_return_if_fail (gee != NULL);
gee->feedback_disabled = FALSE;
gee_update_lexer_items (gee);
gee_scan_for_range (gee);
}
/*****************************************************************************/
void void
gnm_expr_entry_disable_tips (GnmExprEntry *gee) gnm_expr_entry_disable_tips (GnmExprEntry *gee)
{ {
......
...@@ -80,9 +80,6 @@ void gnm_expr_entry_set_update_policy (GnmExprEntry *gee, ...@@ -80,9 +80,6 @@ void gnm_expr_entry_set_update_policy (GnmExprEntry *gee,
GnmUpdateType policy); GnmUpdateType policy);
void gnm_expr_entry_grab_focus (GnmExprEntry *gee, gboolean select_all); void gnm_expr_entry_grab_focus (GnmExprEntry *gee, gboolean select_all);
void gnm_expr_entry_disable_highlight (GnmExprEntry *gee);
void gnm_expr_entry_enable_highlight (GnmExprEntry *gee);
void gnm_expr_entry_close_tips (GnmExprEntry *gee); void gnm_expr_entry_close_tips (GnmExprEntry *gee);
void gnm_expr_entry_enable_tips (GnmExprEntry *gee); void gnm_expr_entry_enable_tips (GnmExprEntry *gee);
void gnm_expr_entry_disable_tips (GnmExprEntry *gee); void gnm_expr_entry_disable_tips (GnmExprEntry *gee);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment