projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced GTK_STATE_NORMAL with PSPPIRE_SHEET_NORMAL where appropriate
[pspp-builds.git]
/
lib
/
gtk-contrib
/
psppire-sheet.c
diff --git
a/lib/gtk-contrib/psppire-sheet.c
b/lib/gtk-contrib/psppire-sheet.c
index bd27a9b4daffabd7073df5bbc38c293021027e7d..46719927e0cff14260efddc39d15d8542712b2c7 100644
(file)
--- a/
lib/gtk-contrib/psppire-sheet.c
+++ b/
lib/gtk-contrib/psppire-sheet.c
@@
-1403,13
+1403,9
@@
psppire_sheet_set_model (PsppireSheet *sheet, PsppireSheetModel *model)
void
psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type)
{
void
psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type)
{
- gint state;
-
g_return_if_fail (sheet != NULL);
g_return_if_fail (PSPPIRE_IS_SHEET (sheet));
g_return_if_fail (sheet != NULL);
g_return_if_fail (PSPPIRE_IS_SHEET (sheet));
- state = sheet->select_status;
-
if (sheet->select_status == PSPPIRE_SHEET_NORMAL)
psppire_sheet_hide_entry_widget (sheet);
if (sheet->select_status == PSPPIRE_SHEET_NORMAL)
psppire_sheet_hide_entry_widget (sheet);
@@
-1417,11
+1413,8
@@
psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type)
create_sheet_entry (sheet);
create_sheet_entry (sheet);
- if (state == PSPPIRE_SHEET_NORMAL)
- {
- psppire_sheet_show_entry_widget (sheet);
- }
-
+ if (sheet->select_status == PSPPIRE_SHEET_NORMAL)
+ psppire_sheet_show_entry_widget (sheet);
}
void
}
void
@@
-2309,7
+2302,7
@@
draw_sheet_region (PsppireSheet *sheet, GdkRegion *region)
psppire_sheet_cell_draw (sheet, i, j);
}
psppire_sheet_cell_draw (sheet, i, j);
}
- if (sheet->select_status ==
GTK_STATE
_NORMAL &&
+ if (sheet->select_status ==
PSPPIRE_SHEET
_NORMAL &&
sheet->active_cell.row >= drawing_range.row0 &&
sheet->active_cell.row <= drawing_range.rowi &&
sheet->active_cell.col >= drawing_range.col0 &&
sheet->active_cell.row >= drawing_range.row0 &&
sheet->active_cell.row <= drawing_range.rowi &&
sheet->active_cell.col >= drawing_range.col0 &&
@@
-2421,7
+2414,6
@@
psppire_sheet_cell_get_text (const PsppireSheet *sheet, gint row, gint col)
static GtkStateType
psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col)
{
static GtkStateType
psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col)
{
- gint state;
PsppireSheetRange *range;
g_return_val_if_fail (sheet != NULL, 0);
PsppireSheetRange *range;
g_return_val_if_fail (sheet != NULL, 0);
@@
-2429,10
+2421,9
@@
psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col)
if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis)) return 0;
if (col < 0 || row < 0) return 0;
if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis)) return 0;
if (col < 0 || row < 0) return 0;
- state = sheet->select_status;
range = &sheet->range;
range = &sheet->range;
- switch (s
tate
)
+ switch (s
heet->select_status
)
{
case PSPPIRE_SHEET_NORMAL:
return GTK_STATE_NORMAL;
{
case PSPPIRE_SHEET_NORMAL:
return GTK_STATE_NORMAL;
@@
-2587,7
+2578,7
@@
entry_load_text (PsppireSheet *sheet)
PsppireSheetCellAttr attributes;
if (!GTK_WIDGET_VISIBLE (sheet->entry_widget)) return;
PsppireSheetCellAttr attributes;
if (!GTK_WIDGET_VISIBLE (sheet->entry_widget)) return;
- if (sheet->select_status !=
GTK_STATE
_NORMAL) return;
+ if (sheet->select_status !=
PSPPIRE_SHEET
_NORMAL) return;
row = sheet->active_cell.row;
col = sheet->active_cell.col;
row = sheet->active_cell.row;
col = sheet->active_cell.col;
@@
-2780,8
+2771,6
@@
static void
psppire_sheet_real_select_range (PsppireSheet *sheet,
const PsppireSheetRange *range)
{
psppire_sheet_real_select_range (PsppireSheet *sheet,
const PsppireSheetRange *range)
{
- gint state;
-
g_return_if_fail (sheet != NULL);
if (range == NULL) range = &sheet->range;
g_return_if_fail (sheet != NULL);
if (range == NULL) range = &sheet->range;
@@
-2791,8
+2780,6
@@
psppire_sheet_real_select_range (PsppireSheet *sheet,
if (range->row0 < 0 || range->rowi < 0) return;
if (range->col0 < 0 || range->coli < 0) return;
if (range->row0 < 0 || range->rowi < 0) return;
if (range->col0 < 0 || range->coli < 0) return;
- state = sheet->select_status;
-
psppire_sheet_update_primary_selection (sheet);
g_signal_emit (sheet, sheet_signals[SELECT_RANGE], 0, &sheet->range);
psppire_sheet_update_primary_selection (sheet);
g_signal_emit (sheet, sheet_signals[SELECT_RANGE], 0, &sheet->range);
@@
-2837,7
+2824,7
@@
psppire_sheet_unselect_range (PsppireSheet *sheet)
return;
psppire_sheet_real_unselect_range (sheet, NULL);
return;
psppire_sheet_real_unselect_range (sheet, NULL);
- sheet->select_status =
GTK_STATE
_NORMAL;
+ sheet->select_status =
PSPPIRE_SHEET
_NORMAL;
}
}
@@
-2895,7
+2882,6
@@
psppire_sheet_expose (GtkWidget *widget, GdkEventExpose *event)
{
draw_sheet_region (sheet, event->region);
{
draw_sheet_region (sheet, event->region);
-
if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
{
#if 0
if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
{
#if 0
@@
-2917,7
+2903,6
@@
psppire_sheet_expose (GtkWidget *widget, GdkEventExpose *event)
TRUE,
area.x + 1, area.y + 1,
area.width, area.height);
TRUE,
area.x + 1, area.y + 1,
area.width, area.height);
-
}
#if 0
}
#if 0
@@
-3134,7
+3119,7
@@
psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column)
if (forbid_move)
{
if (forbid_move)
{
- if (sheet->select_status ==
GTK_STATE
_NORMAL)
+ if (sheet->select_status ==
PSPPIRE_SHEET
_NORMAL)
return FALSE;
row = sheet->active_cell.row;
return FALSE;
row = sheet->active_cell.row;
@@
-3250,7
+3235,7
@@
psppire_sheet_button_release (GtkWidget *widget,
sheet->range = sheet->drag_range;
sheet->drag_range = old_range;
sheet->range = sheet->drag_range;
sheet->drag_range = old_range;
- if (sheet->select_status ==
GTK_STATE
_NORMAL)
+ if (sheet->select_status ==
PSPPIRE_SHEET
_NORMAL)
sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
g_signal_emit (sheet, sheet_signals[RESIZE_RANGE], 0,
sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
g_signal_emit (sheet, sheet_signals[RESIZE_RANGE], 0,