projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved knowledge of pspp_linreg_cache out of pspp_coeff_init
[pspp]
/
lib
/
gtksheet
/
gsheet-column-iface.c
diff --git
a/lib/gtksheet/gsheet-column-iface.c
b/lib/gtksheet/gsheet-column-iface.c
index f1b915513774fece69f73729fb32d1db88abe1a5..df3c90658f03c92471dcd628845a4a36a64085eb 100644
(file)
--- a/
lib/gtksheet/gsheet-column-iface.c
+++ b/
lib/gtksheet/gsheet-column-iface.c
@@
-25,7
+25,7
@@
#include <gobject/gvaluecollector.h>
#include "gsheet-column-iface.h"
#include "gtkextra-marshal.h"
#include <gobject/gvaluecollector.h>
#include "gsheet-column-iface.h"
#include "gtkextra-marshal.h"
-
+#include "gtkextra-sheet.h"
enum {
COLUMNS_CHANGED,
enum {
COLUMNS_CHANGED,
@@
-73,8
+73,6
@@
g_sheet_column_get_type (void)
}
}
-static GtkSheetButton default_button;
-
static void
g_sheet_column_base_init (gpointer g_class)
{
static void
g_sheet_column_base_init (gpointer g_class)
{
@@
-95,96
+93,86
@@
g_sheet_column_base_init (gpointer g_class)
G_TYPE_INT);
G_TYPE_INT);
- default_button.state = GTK_STATE_NORMAL;
- default_button.label = NULL;
- default_button.label_visible = TRUE;
- default_button.child = NULL;
- default_button.justification = GTK_JUSTIFY_FILL;
-
initialized = TRUE;
}
}
inline void
initialized = TRUE;
}
}
inline void
-g_sheet_column_set_width (GSheetColumn *column,
-
gint col, gint size, const GtkSheet *sheet
)
+g_sheet_column_set_width (GSheetColumn *column,
gint col, gint size,
+
gpointer data
)
{
g_return_if_fail (G_IS_SHEET_COLUMN (column));
if ((G_SHEET_COLUMN_GET_IFACE (column)->set_width) )
{
g_return_if_fail (G_IS_SHEET_COLUMN (column));
if ((G_SHEET_COLUMN_GET_IFACE (column)->set_width) )
- (G_SHEET_COLUMN_GET_IFACE (column)->set_width) (column, col,
- size, sheet);
+ (G_SHEET_COLUMN_GET_IFACE (column)->set_width) (column, col, size, data);
}
inline gint
}
inline gint
-g_sheet_column_get_width (const GSheetColumn *column,
- gint col, const GtkSheet *sheet)
+g_sheet_column_get_width (const GSheetColumn *column, gint col, gpointer data)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_width);
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_width);
- return (G_SHEET_COLUMN_GET_IFACE (column)->get_width) (column, col,
- sheet);
+ return (G_SHEET_COLUMN_GET_IFACE (column)->get_width) (column, col, data);
}
inline gboolean
g_sheet_column_get_visibility(const GSheetColumn *column,
}
inline gboolean
g_sheet_column_get_visibility(const GSheetColumn *column,
- gint col,
const GtkSheet *sheet
)
+ gint col,
gpointer data
)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_visibility);
return (G_SHEET_COLUMN_GET_IFACE (column)->get_visibility) (column,
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_visibility);
return (G_SHEET_COLUMN_GET_IFACE (column)->get_visibility) (column,
- col,
sheet
);
+ col,
data
);
}
inline gboolean
g_sheet_column_get_sensitivity(const GSheetColumn *column,
}
inline gboolean
g_sheet_column_get_sensitivity(const GSheetColumn *column,
- gint col,
const GtkSheet *sheet
)
+ gint col,
gpointer data
)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_sensitivity);
return (G_SHEET_COLUMN_GET_IFACE (column)->get_sensitivity) (column,
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_sensitivity);
return (G_SHEET_COLUMN_GET_IFACE (column)->get_sensitivity) (column,
- col,
sheet
);
+ col,
data
);
}
}
-inline
const
GtkSheetButton *
+inline GtkSheetButton *
g_sheet_column_get_button(const GSheetColumn *column,
g_sheet_column_get_button(const GSheetColumn *column,
- gint col,
const GtkSheet *sheet
)
+ gint col,
gpointer data
)
{
{
-
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE
);
+
GtkSheetButton *button = gtk_sheet_button_new(
);
GSheetColumnIface *iface = G_SHEET_COLUMN_GET_IFACE (column);
GSheetColumnIface *iface = G_SHEET_COLUMN_GET_IFACE (column);
- static GtkSheetButton button ;
- memcpy(&button, &default_button, sizeof (button));
+ g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
if ( iface->get_button_label)
if ( iface->get_button_label)
- button
.label = iface->get_button_label(column, col, sheet
);
+ button
->label = iface->get_button_label(column, col, data
);
- return
&
button;
+ return button;
}
inline GtkJustification
g_sheet_column_get_justification(const GSheetColumn *column,
}
inline GtkJustification
g_sheet_column_get_justification(const GSheetColumn *column,
- gint col,
const GtkSheet *sheet
)
+ gint col,
gpointer data
)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_justification);
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_justification);
- return (G_SHEET_COLUMN_GET_IFACE (column)->get_justification) (column, col,
sheet
);
+ return (G_SHEET_COLUMN_GET_IFACE (column)->get_justification) (column, col,
data
);
}
}
@@
-192,76
+180,76
@@
g_sheet_column_get_justification(const GSheetColumn *column,
inline gint
g_sheet_column_get_left_text_column (const GSheetColumn *column,
inline gint
g_sheet_column_get_left_text_column (const GSheetColumn *column,
- gint col,
const GtkSheet *sheet
)
+ gint col,
gpointer data
)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
if ( ! G_SHEET_COLUMN_GET_IFACE (column)->get_left_text_column)
return col;
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
if ( ! G_SHEET_COLUMN_GET_IFACE (column)->get_left_text_column)
return col;
- return (G_SHEET_COLUMN_GET_IFACE (column)->get_left_text_column) (column, col,
sheet
);
+ return (G_SHEET_COLUMN_GET_IFACE (column)->get_left_text_column) (column, col,
data
);
}
inline gint
g_sheet_column_get_right_text_column (const GSheetColumn *column,
}
inline gint
g_sheet_column_get_right_text_column (const GSheetColumn *column,
- gint col,
const GtkSheet *sheet
)
+ gint col,
gpointer data
)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
if ( ! G_SHEET_COLUMN_GET_IFACE (column)->get_right_text_column)
return col;
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
if ( ! G_SHEET_COLUMN_GET_IFACE (column)->get_right_text_column)
return col;
- return (G_SHEET_COLUMN_GET_IFACE (column)->get_right_text_column) (column, col,
sheet
);
+ return (G_SHEET_COLUMN_GET_IFACE (column)->get_right_text_column) (column, col,
data
);
}
inline void
g_sheet_column_set_left_text_column (const GSheetColumn *column,
}
inline void
g_sheet_column_set_left_text_column (const GSheetColumn *column,
- gint col, gint i,
const GtkSheet *sheet
)
+ gint col, gint i,
gpointer data
)
{
g_return_if_fail (G_IS_SHEET_COLUMN (column));
if ( G_SHEET_COLUMN_GET_IFACE (column)->set_left_text_column)
{
g_return_if_fail (G_IS_SHEET_COLUMN (column));
if ( G_SHEET_COLUMN_GET_IFACE (column)->set_left_text_column)
- (G_SHEET_COLUMN_GET_IFACE (column)->set_left_text_column) (column, col, i,
sheet
);
+ (G_SHEET_COLUMN_GET_IFACE (column)->set_left_text_column) (column, col, i,
data
);
}
inline void
g_sheet_column_set_right_text_column (const GSheetColumn *column,
}
inline void
g_sheet_column_set_right_text_column (const GSheetColumn *column,
- gint col, gint i,
const GtkSheet *sheet
)
+ gint col, gint i,
gpointer data
)
{
g_return_if_fail (G_IS_SHEET_COLUMN (column));
if ( G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column)
{
g_return_if_fail (G_IS_SHEET_COLUMN (column));
if ( G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column)
- (G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column) (column, col, i,
sheet
);
+ (G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column) (column, col, i,
data
);
}
inline gint
}
inline gint
-g_sheet_column_get_column_count(const GSheetColumn *geo,
const GtkSheet *sheet
)
+g_sheet_column_get_column_count(const GSheetColumn *geo,
gpointer data
)
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
g_assert ( G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count);
{
g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
g_assert ( G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count);
- return (G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count) (geo,
sheet
);
+ return (G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count) (geo,
data
);
}
inline gint
}
inline gint
-g_sheet_column_start_pixel(const GSheetColumn *geo, gint col,
const GtkSheet *sheet
)
+g_sheet_column_start_pixel(const GSheetColumn *geo, gint col,
gpointer data
)
{
{
- g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
- g_return_val_if_fail (col <
- g_sheet_column_get_column_count(geo, sheet),-1);
-
gint i;
gint start_pixel = 0;
gint i;
gint start_pixel = 0;
+ g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
+ g_return_val_if_fail (col <
+ g_sheet_column_get_column_count(geo, data),-1);
+
for ( i = 0 ; i < col ; ++i )
{
for ( i = 0 ; i < col ; ++i )
{
- if ( g_sheet_column_get_visibility(geo, i,
sheet
))
- start_pixel += g_sheet_column_get_width(geo, i,
sheet
);
+ if ( g_sheet_column_get_visibility(geo, i,
data
))
+ start_pixel += g_sheet_column_get_width(geo, i,
data
);
}
return start_pixel;
}
return start_pixel;
@@
-271,7
+259,7
@@
g_sheet_column_start_pixel(const GSheetColumn *geo, gint col, const GtkSheet *sh
inline void
inline void
-g_sheet_column_columns_
delet
ed(GSheetColumn *geo,
+g_sheet_column_columns_
chang
ed(GSheetColumn *geo,
gint first, gint n_columns)
{
g_return_if_fail (G_IS_SHEET_COLUMN (geo));
gint first, gint n_columns)
{
g_return_if_fail (G_IS_SHEET_COLUMN (geo));
@@
-279,3
+267,7
@@
g_sheet_column_columns_deleted(GSheetColumn *geo,
g_signal_emit (geo, sheet_column_signals[COLUMNS_CHANGED], 0,
first, n_columns);
}
g_signal_emit (geo, sheet_column_signals[COLUMNS_CHANGED], 0,
first, n_columns);
}
+
+
+
+