Files
evolution/widgets/table/e-tree-scrolled.c
Kjartan Maraas 4a4b322c39 Tons of cleanups of the following sort: - remove unused vars - remove
2006-01-30  Kjartan Maraas  <kmaraas@gnome.org>

	* e-timezone-dialog/e-timezone-dialog.c: (get_zone_from_point):
	* menus/gal-view-menus.c:
	* misc/e-attachment-bar.c: (calculate_height_width),
	(update_remote_file), (e_attachment_bar_get_attachment),
	(class_init):
	* misc/e-attachment.c: (async_progress_update_cb),
	(download_to_local_path):
	* misc/e-calendar-item.c: (e_calendar_item_get_arg),
	(e_calendar_item_realize), (e_calendar_item_ensure_days_visible):
	* misc/e-calendar.c: (e_calendar_drag_motion),
	(e_calendar_drag_leave), (e_calendar_focus):
	* misc/e-canvas-background.c: (ecb_get_property):
	* misc/e-canvas.c: (e_canvas_class_init), (pick_current_item):
	* misc/e-cell-date-edit.c: (e_cell_date_edit_do_popup),
	(e_cell_date_edit_show_popup):
	* misc/e-cell-percent.c:
	* misc/e-charset-picker.c: (e_charset_picker_bonobo_ui_populate):
	* misc/e-config-page.c: (e_config_page_class_init):
	* misc/e-dateedit.c: (e_date_edit_set_date),
	(e_date_edit_set_date_and_time_of_day),
	(on_date_popup_date_selected):
	* misc/e-dropdown-button.c: (e_dropdown_button_class_init):
	* misc/e-expander.c: (get_expander_bounds), (e_expander_expose),
	(is_in_expander_panel):
	* misc/e-filter-bar.c: (option_changed), (build_items):
	* misc/e-image-chooser.c: (e_image_chooser_init),
	(image_drag_data_received_cb):
	* misc/e-map.c: (e_map_size_allocate), (e_map_button_press),
	(e_map_button_release), (e_map_motion), (e_map_zoom_to_location),
	(e_map_zoom_out), (update_render_point), (repaint_point),
	(zoom_in_smooth):
	* misc/e-multi-config-dialog.c: (impl_response):
	* misc/e-reflow.c: (e_reflow_realize), (e_reflow_event):
	* misc/e-search-bar.c: (clear_search), (search_now_verb_cb),
	(entry_activated_cb), (activate_button_clicked_cb),
	(clear_button_clicked_cb):
	* misc/e-selection-model.c: (e_selection_model_key_press):
	* misc/e-send-options.c: (delay_until_date_changed_cb),
	(e_sendoptions_get_need_general_options):
	* misc/e-unicode.c: (e_stripped_char):
	* table/e-cell-progress.c: (eprog_draw_border), (eprog_draw),
	(eprog_event):
	* table/e-cell-spin-button.c: (ecsb_event), (ecsb_focus),
	(ecsb_unfocus), (ecsb_dispose):
	* table/e-cell-text.c: (ect_draw), (ect_show_tooltip):
	* table/e-cell-toggle.c: (etog_draw), (etog_event):
	* table/e-cell-tree.c: (ect_max_width):
	* table/e-cell-vbox.c:
	* table/e-table-click-to-add.c: (etcta_event):
	* table/e-table-config.c: (create_global_store):
	* table/e-table-field-chooser-dialog.c:
	* table/e-table-field-chooser-item.c: (etfci_find_button),
	(etfci_reflow), (etfci_get_property), (etfci_realize):
	* table/e-table-field-chooser.c:
	(e_table_field_chooser_class_init):
	* table/e-table-group-container.c: (etgc_unrealize):
	* table/e-table-group.c: (e_table_group_new):
	* table/e-table-header-item.c: (e_table_header_item_get_height),
	(ethi_realize), (ethi_event):
	* table/e-table-header-utils.c: (e_table_draw_elided_string),
	(e_table_header_draw_button):
	* table/e-table-item.c: (eti_set_property), (eti_get_property),
	(eti_draw), (eti_event), (eti_cursor_change):
	* table/e-table-scrolled.c: (e_table_scrolled_class_init):
	* table/e-table-search.c:
	* table/e-table-sort-info.c: (e_table_sort_info_save_to_node):
	* table/e-table.c: (table_canvas_reflow_idle),
	(table_canvas_size_allocate), (canvas_vbox_event),
	(click_to_add_event), (do_drag_motion), (e_table_class_init):
	* table/e-tree-scrolled.c: (e_tree_scrolled_class_init):
	* table/e-tree.c: (tree_canvas_reflow_idle),
	(tree_canvas_size_allocate), (e_tree_drag_get_data),
	(do_drag_motion), (e_tree_class_init):
	* text/e-text.c: (e_text_set_property), (e_text_draw),
	(_do_tooltip), (primary_clear_cb), (_get_position),
	(e_text_command): Tons of cleanups of the following sort:
	- remove unused vars
	- remove extraneous semi-colons
	- add some comments where assignments were done without using
	  the results later
	- remove break; statements after return foo;
	- add casts in some places to be more type correct
	- rename variables with name clashes
	- s/if/ifdef in some cases
	- mark some code static
	- remove some unused functions
	- use guint for 1-bit bitfields

svn path=/trunk/; revision=31371
2006-01-30 12:28:21 +00:00

229 lines
6.2 KiB
C

/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* e-tree-scrolled.c
* Copyright 2000, 2001, Ximian, Inc.
*
* Authors:
* Chris Lahey <clahey@ximian.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License, version 2, as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <gtk/gtk.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include "e-util/e-i18n.h"
#include "e-util/e-util.h"
#include "e-tree-scrolled.h"
#define COLUMN_HEADER_HEIGHT 16
#define PARENT_TYPE gtk_scrolled_window_get_type ()
static GtkObjectClass *parent_class;
enum {
PROP_0,
PROP_TREE
};
static void
e_tree_scrolled_init (GtkObject *object)
{
ETreeScrolled *ets;
GtkScrolledWindow *scrolled_window;
ets = E_TREE_SCROLLED (object);
scrolled_window = GTK_SCROLLED_WINDOW (object);
GTK_WIDGET_SET_FLAGS (ets, GTK_CAN_FOCUS);
ets->tree = g_object_new (E_TREE_TYPE, NULL);
gtk_scrolled_window_set_policy (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (scrolled_window, GTK_SHADOW_IN);
}
static void
e_tree_scrolled_real_construct (ETreeScrolled *ets)
{
gtk_container_add(GTK_CONTAINER(ets), GTK_WIDGET(ets->tree));
gtk_widget_show(GTK_WIDGET(ets->tree));
}
ETreeScrolled *e_tree_scrolled_construct (ETreeScrolled *ets,
ETreeModel *etm,
ETableExtras *ete,
const char *spec,
const char *state)
{
g_return_val_if_fail(ets != NULL, NULL);
g_return_val_if_fail(E_IS_TREE_SCROLLED(ets), NULL);
g_return_val_if_fail(etm != NULL, NULL);
g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
g_return_val_if_fail(spec != NULL, NULL);
e_tree_construct(ets->tree, etm, ete, spec, state);
e_tree_scrolled_real_construct(ets);
return ets;
}
GtkWidget *e_tree_scrolled_new (ETreeModel *etm,
ETableExtras *ete,
const char *spec,
const char *state)
{
ETreeScrolled *ets;
g_return_val_if_fail(etm != NULL, NULL);
g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
g_return_val_if_fail(spec != NULL, NULL);
ets = E_TREE_SCROLLED (gtk_widget_new (e_tree_scrolled_get_type (),
"hadjustment", NULL,
"vadjustment", NULL,
NULL));
ets = e_tree_scrolled_construct (ets, etm, ete, spec, state);
return GTK_WIDGET (ets);
}
ETreeScrolled *e_tree_scrolled_construct_from_spec_file (ETreeScrolled *ets,
ETreeModel *etm,
ETableExtras *ete,
const char *spec_fn,
const char *state_fn)
{
g_return_val_if_fail(ets != NULL, NULL);
g_return_val_if_fail(E_IS_TREE_SCROLLED(ets), NULL);
g_return_val_if_fail(etm != NULL, NULL);
g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
g_return_val_if_fail(spec_fn != NULL, NULL);
e_tree_construct_from_spec_file(ets->tree, etm, ete, spec_fn, state_fn);
e_tree_scrolled_real_construct(ets);
return ets;
}
GtkWidget *e_tree_scrolled_new_from_spec_file (ETreeModel *etm,
ETableExtras *ete,
const char *spec_fn,
const char *state_fn)
{
ETreeScrolled *ets;
g_return_val_if_fail(etm != NULL, NULL);
g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
g_return_val_if_fail(spec_fn != NULL, NULL);
ets = E_TREE_SCROLLED (gtk_widget_new (e_tree_scrolled_get_type (),
"hadjustment", NULL,
"vadjustment", NULL,
NULL));
ets = e_tree_scrolled_construct_from_spec_file (ets, etm, ete, spec_fn, state_fn);
return GTK_WIDGET (ets);
}
ETree *
e_tree_scrolled_get_tree (ETreeScrolled *ets)
{
return ets->tree;
}
static void
ets_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
ETreeScrolled *ets = E_TREE_SCROLLED (object);
switch (prop_id){
case PROP_TREE:
g_value_set_object (value, ets->tree);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
/* Grab_focus handler for the scrolled ETree */
static void
ets_grab_focus (GtkWidget *widget)
{
ETreeScrolled *ets;
ets = E_TREE_SCROLLED (widget);
gtk_widget_grab_focus (GTK_WIDGET (ets->tree));
}
/* Focus handler for the scrolled ETree */
static gint
ets_focus (GtkWidget *container, GtkDirectionType direction)
{
ETreeScrolled *ets;
ets = E_TREE_SCROLLED (container);
return gtk_widget_child_focus (GTK_WIDGET (ets->tree), direction);
}
static void
e_tree_scrolled_class_init (ETreeScrolledClass *class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
parent_class = g_type_class_ref (PARENT_TYPE);
object_class->get_property = ets_get_property;
widget_class->grab_focus = ets_grab_focus;
widget_class->focus = ets_focus;
g_object_class_install_property (object_class, PROP_TREE,
g_param_spec_object ("tree",
_( "Tree" ),
_( "Tree" ),
E_TREE_TYPE,
G_PARAM_READABLE));
}
E_MAKE_TYPE(e_tree_scrolled, "ETreeScrolled", ETreeScrolled, e_tree_scrolled_class_init, e_tree_scrolled_init, PARENT_TYPE)