Commit e9aa51c1 authored by Jody Goldberg's avatar Jody Goldberg

build fixes for recent Gtk+ deprecations

svn path=/trunk/; revision=16644
parent c19970b1
......@@ -54,29 +54,7 @@ excel_gb_application_class_init (GBRunObjectClass *klass)
WORKSHEETS, GBRUN_PROPERTY_READABLE);
}
GtkType
excel_gb_application_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBApplication),
sizeof (ExcelGBApplicationClass),
(GtkClassInitFunc) excel_gb_application_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (GBRUN_TYPE_OBJECT, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBApplication, excel_gb_application, GBRUN_TYPE_OBJECT)
ExcelGBApplication *
excel_gb_application_new (Workbook *wb)
......
......@@ -11,7 +11,7 @@
#include <gbrun/libgbrun.h>
#define EXCEL_TYPE_GB_APPLICATION (excel_gb_application_get_type ())
#define EXCEL_GB_APPLICATION(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_APPLICATION, ExcelGBApplication))
#define EXCEL_GB_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_APPLICATION, ExcelGBApplication))
#define EXCEL_GB_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_APPLICATION, ExcelGBApplicationClass))
#define EXCEL_IS_GB_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_APPLICATION))
#define EXCEL_IS_GB_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_APPLICATION))
......@@ -26,7 +26,7 @@ typedef struct {
GBRunObjectClass klass;
} ExcelGBApplicationClass;
GtkType excel_gb_application_get_type (void);
GType excel_gb_application_get_type (void);
ExcelGBApplication *excel_gb_application_new (Workbook *wb);
void excel_gb_application_register_types (void);
......
......@@ -24,30 +24,7 @@ excel_gb_context_init (ExcelGBContext *ec)
{
}
GtkType
excel_gb_context_get_type (void)
{
static GtkType eval_type = 0;
if (!eval_type) {
static const GtkTypeInfo eval_info = {
"ExcelGBContext",
sizeof (ExcelGBContext),
sizeof (ExcelGBContextClass),
(GtkClassInitFunc) excel_gb_context_class_init,
(GtkObjectInitFunc) excel_gb_context_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
eval_type = gtk_type_unique (GBRUN_TYPE_EVAL_CONTEXT,
&eval_info);
}
return eval_type;
}
G_DEFINE_TYPE (ExcelGBContext, excel_gb_context, GBRUN_TYPE_EVAL_CONTEXT)
GBEvalContext *
excel_gb_context_new_control (char const *module_name,
......
......@@ -15,7 +15,7 @@
#include "workbook-control.h"
#define EXCEL_TYPE_GB_CONTEXT (excel_gb_context_get_type ())
#define EXCEL_GB_CONTEXT(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_CONTEXT, ExcelGBContext))
#define EXCEL_GB_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_CONTEXT, ExcelGBContext))
#define EXCEL_GB_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_CONTEXT, ExcelGBContextClass))
#define EXCEL_IS_GB_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_CONTEXT))
#define EXCEL_IS_GB_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_CONTEXT))
......@@ -30,7 +30,7 @@ typedef struct {
GBRunEvalContextClass klass;
} ExcelGBContextClass;
GtkType excel_gb_context_get_type (void);
GType excel_gb_context_get_type (void);
GBEvalContext *excel_gb_context_new (char const *module_name,
GBRunSecurityFlag flags);
......
......@@ -279,29 +279,7 @@ excel_gb_interior_class_init (GBRunObjectClass *klass)
*/
}
GtkType
excel_gb_interior_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBInterior),
sizeof (ExcelGBInteriorClass),
(GtkClassInitFunc) excel_gb_interior_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (GBRUN_TYPE_OBJECT, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBIterior, excel_gb_interior, GBRUN_TYPE_OBJECT)
ExcelGBInterior *
excel_gb_interior_new (Sheet *sheet, GnmRange range)
......
......@@ -11,7 +11,7 @@
#include <gbrun/libgbrun.h>
#define EXCEL_TYPE_GB_INTERIOR (excel_gb_interior_get_type ())
#define EXCEL_GB_INTERIOR(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_INTERIOR, ExcelGBInterior))
#define EXCEL_GB_INTERIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_INTERIOR, ExcelGBInterior))
#define EXCEL_GB_INTERIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_INTERIOR, ExcelGBInteriorClass))
#define EXCEL_IS_GB_INTERIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_INTERIOR))
#define EXCEL_IS_GB_INTERIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_INTERIOR))
......@@ -27,7 +27,7 @@ typedef struct {
GBRunObjectClass klass;
} ExcelGBInteriorClass;
GtkType excel_gb_interior_get_type (void);
GType excel_gb_interior_get_type (void);
ExcelGBInterior *excel_gb_interior_new (Sheet *sheet, GnmRange range);
#endif /* EXCEL_GB_INTERIOR_H */
......@@ -201,29 +201,7 @@ excel_gb_range_class_init (GBRunObjectClass *klass)
*/
}
GtkType
excel_gb_range_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBRange),
sizeof (ExcelGBRangeClass),
(GtkClassInitFunc) excel_gb_range_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (GBRUN_TYPE_OBJECT, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBRange, excel_gb_range, GBRUN_TYPE_OBJECT)
ExcelGBRange *
excel_gb_range_new (GBRunEvalContext *ec,
......
......@@ -11,7 +11,7 @@
#include <gbrun/libgbrun.h>
#define EXCEL_TYPE_GB_RANGE (excel_gb_range_get_type ())
#define EXCEL_GB_RANGE(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_RANGE, ExcelGBRange))
#define EXCEL_GB_RANGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_RANGE, ExcelGBRange))
#define EXCEL_GB_RANGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_RANGE, ExcelGBRangeClass))
#define EXCEL_IS_GB_RANGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_RANGE))
#define EXCEL_IS_GB_RANGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_RANGE))
......@@ -27,7 +27,7 @@ typedef struct {
GBRunObjectClass klass;
} ExcelGBRangeClass;
GtkType excel_gb_range_get_type (void);
GType excel_gb_range_get_type (void);
ExcelGBRange *excel_gb_range_new (GBRunEvalContext *ec,
Sheet *sheet,
......
......@@ -51,29 +51,7 @@ excel_gb_selection_class_init (GBRunObjectClass *klass)
excel_gb_selection_interior);
}
GtkType
excel_gb_selection_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBSelection),
sizeof (ExcelGBSelectionClass),
(GtkClassInitFunc) excel_gb_selection_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (GBRUN_TYPE_OBJECT, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBSelection, excel_gb_selection, GBRUN_TYPE_OBJECT)
ExcelGBSelection *
excel_gb_selection_new (Sheet *sheet)
......
......@@ -11,7 +11,7 @@
#include <gbrun/libgbrun.h>
#define EXCEL_TYPE_GB_SELECTION (excel_gb_selection_get_type ())
#define EXCEL_GB_SELECTION(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_SELECTION, ExcelGBSelection))
#define EXCEL_GB_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_SELECTION, ExcelGBSelection))
#define EXCEL_GB_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_SELECTION, ExcelGBSelectionClass))
#define EXCEL_IS_GB_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_SELECTION))
#define EXCEL_IS_GB_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_SELECTION))
......@@ -26,7 +26,7 @@ typedef struct {
GBRunObjectClass klass;
} ExcelGBSelectionClass;
GtkType excel_gb_selection_get_type (void);
GType excel_gb_selection_get_type (void);
ExcelGBSelection *excel_gb_selection_new (Sheet *sheet);
#endif /* EXCEL_GB_SELECTION_H */
......@@ -73,29 +73,7 @@ excel_gb_worksheet_function_class_init (GBRunObjectClass *klass)
gb_class->deref = excel_gb_worksheet_function_deref;
}
GtkType
excel_gb_worksheet_function_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBWorksheetFunction),
sizeof (ExcelGBWorksheetFunctionClass),
(GtkClassInitFunc) excel_gb_worksheet_function_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (GBRUN_TYPE_OBJECT, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBWorksheetFunction, excel_gb_worksheet_function, GBRUN_TYPE_OBJECT)
ExcelGBWorksheetFunction *
excel_gb_worksheet_function_new (Sheet *sheet)
......
......@@ -11,7 +11,7 @@
#include <gbrun/libgbrun.h>
#define EXCEL_TYPE_GB_WORKSHEET_FUNCTION (excel_gb_worksheet_function_get_type ())
#define EXCEL_GB_WORKSHEET_FUNCTION(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_WORKSHEET_FUNCTION, ExcelGBWorksheetFunction))
#define EXCEL_GB_WORKSHEET_FUNCTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_WORKSHEET_FUNCTION, ExcelGBWorksheetFunction))
#define EXCEL_GB_WORKSHEET_FUNCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_WORKSHEET_FUNCTION, ExcelGBWorksheetFunctionClass))
#define EXCEL_IS_GB_WORKSHEET_FUNCTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_WORKSHEET_FUNCTION))
#define EXCEL_IS_GB_WORKSHEET_FUNCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_WORKSHEET_FUNCTION))
......@@ -26,7 +26,7 @@ typedef struct {
GBRunObjectClass klass;
} ExcelGBWorksheetFunctionClass;
GtkType excel_gb_worksheet_function_get_type (void);
GType excel_gb_worksheet_function_get_type (void);
ExcelGBWorksheetFunction *excel_gb_worksheet_function_new (Sheet *sheet);
#endif /* EXCEL_GB_WORKSHEET_FUNCTION_H */
......@@ -192,29 +192,7 @@ excel_gb_worksheet_class_init (GBRunObjectClass *klass)
gb_type_string, NAME);
}
GtkType
excel_gb_worksheet_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBWorksheet),
sizeof (ExcelGBWorksheetClass),
(GtkClassInitFunc) excel_gb_worksheet_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (GBRUN_TYPE_OBJECT, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBWorksheet, excel_gb_worksheet, GBRUN_TYPE_OBJECT)
ExcelGBWorksheet *
excel_gb_worksheet_new (Sheet *sheet)
......
......@@ -11,7 +11,7 @@
#include <gbrun/libgbrun.h>
#define EXCEL_TYPE_GB_WORKSHEET (excel_gb_worksheet_get_type ())
#define EXCEL_GB_WORKSHEET(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_WORKSHEET, ExcelGBWorksheet))
#define EXCEL_GB_WORKSHEET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_WORKSHEET, ExcelGBWorksheet))
#define EXCEL_GB_WORKSHEET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_WORKSHEET, ExcelGBWorksheetClass))
#define EXCEL_IS_GB_WORKSHEET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_WORKSHEET))
#define EXCEL_IS_GB_WORKSHEET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_WORKSHEET))
......@@ -26,7 +26,7 @@ typedef struct {
GBRunObjectClass klass;
} ExcelGBWorksheetClass;
GtkType excel_gb_worksheet_get_type (void);
GType excel_gb_worksheet_get_type (void);
ExcelGBWorksheet *excel_gb_worksheet_new (Sheet *sheet);
#endif /* EXCEL_GB_WORKSHEET_H */
......@@ -101,30 +101,7 @@ excel_gb_worksheets_class_init (GBRunObjectClass *klass)
excel_gb_worksheets_add);
}
GtkType
excel_gb_worksheets_get_type (void)
{
static GtkType object_type = 0;
if (!object_type) {
static const GtkTypeInfo object_info = {
ITEM_NAME,
sizeof (ExcelGBWorksheets),
sizeof (ExcelGBWorksheetsClass),
(GtkClassInitFunc) excel_gb_worksheets_class_init,
(GtkObjectInitFunc) NULL,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
object_type = gtk_type_unique (
GBRUN_TYPE_COLLECTION, &object_info);
g_type_class_peek (object_type);
}
return object_type;
}
G_DEFINE_TYPE (ExcelGBWorksheets, excel_gb_worksheets, GBRUN_TYPE_COLLECTION)
ExcelGBWorksheets *
excel_gb_worksheets_new (Workbook *wb)
......
......@@ -12,7 +12,7 @@
#include <gbrun/gbrun-collection.h>
#define EXCEL_TYPE_GB_WORKSHEETS (excel_gb_worksheets_get_type ())
#define EXCEL_GB_WORKSHEETS(obj) (GTK_CHECK_CAST ((obj), EXCEL_TYPE_GB_WORKSHEETS, ExcelGBWorksheets))
#define EXCEL_GB_WORKSHEETS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCEL_TYPE_GB_WORKSHEETS, ExcelGBWorksheets))
#define EXCEL_GB_WORKSHEETS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCEL_TYPE_GB_WORKSHEETS, ExcelGBWorksheetsClass))
#define EXCEL_IS_GB_WORKSHEETS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCEL_TYPE_GB_WORKSHEETS))
#define EXCEL_IS_GB_WORKSHEETS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXCEL_TYPE_GB_WORKSHEETS))
......@@ -27,7 +27,7 @@ typedef struct {
GBRunCollectionClass klass;
} ExcelGBWorksheetsClass;
GtkType excel_gb_worksheets_get_type (void);
GType excel_gb_worksheets_get_type (void);
ExcelGBWorksheets *excel_gb_worksheets_new (Workbook *wb);
#endif /* EXCEL_GB_WORKSHEETS_H */
......@@ -92,28 +92,7 @@ gb_ole_stream_init (GBOleStream *ls)
{
}
GtkType
gb_ole_stream_get_type (void)
{
static GtkType lex_type = 0;
if (!lex_type) {
static const GtkTypeInfo lex_info = {
"GBOleStream",
sizeof (GBOleStream),
sizeof (GBOleStreamClass),
(GtkClassInitFunc) gb_ole_stream_class_init,
(GtkObjectInitFunc) gb_ole_stream_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
lex_type = gtk_type_unique (GB_TYPE_LEXER_STREAM, &lex_info);
}
return lex_type;
}
G_DEFINE_TYPE (GBOleStream, gb_ole_stream, GB_TYPE_LEXER_STREAM)
GBLexerStream *
gb_ole_stream_new (MsOleVba *vba)
......
......@@ -15,7 +15,7 @@
#include "gb/gb-lex.h"
#define GB_TYPE_OLE_STREAM (gb_ole_stream_get_type ())
#define GB_OLE_STREAM(obj) (GTK_CHECK_CAST ((obj), GB_TYPE_OLE_STREAM, GBOleStream))
#define GB_OLE_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GB_TYPE_OLE_STREAM, GBOleStream))
#define GB_OLE_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GB_TYPE_OLE_STREAM, GBOleOleClass))
#define GB_IS_OLE_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GB_TYPE_OLE_STREAM))
#define GB_IS_OLE_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GB_TYPE_OLE_STREAM))
......@@ -33,7 +33,7 @@ struct _GBOleStreamClass {
GBLexerStreamClass klass;
};
GtkType gb_ole_stream_get_type (void);
GType gb_ole_stream_get_type (void);
GBLexerStream *gb_ole_stream_new (MsOleVba *vba);
GBLexerStream *gb_project_stream (gpointer *jody_broke_the_ctx, MsOle *f);
......
......@@ -83,7 +83,7 @@ dialog_tool_preset_to_range (GenericToolState *state)
*
**/
void
dialog_tool_init_outputs (GenericToolState *state, GtkSignalFunc sensitivity_cb)
dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb)
{
GtkWidget *dao_box;
......
......@@ -242,8 +242,8 @@ cb_tool_cancel_clicked (G_GNUC_UNUSED GtkWidget *button,
**/
void
dialog_tool_init_buttons (GenericToolState *state,
GtkSignalFunc ok_function,
GtkSignalFunc close_function)
GCallback ok_function,
GCallback close_function)
{
state->ok_button = glade_xml_get_widget (state->gui, "okbutton");
g_signal_connect (G_OBJECT (state->ok_button),
......@@ -300,9 +300,9 @@ dialog_tool_init (GenericToolState *state,
char const *dialog_name,
char const *error_str,
char const *key,
GtkSignalFunc ok_function,
GtkSignalFunc close_function,
GtkSignalFunc sensitivity_cb,
GCallback ok_function,
GCallback close_function,
GCallback sensitivity_cb,
GnmExprEntryFlags flags)
{
GtkTable *table;
......
......@@ -60,9 +60,9 @@ gboolean dialog_tool_init (GenericToolState *state,
char const *dialog_name,
char const *error_str,
char const *key,
GtkSignalFunc ok_function,
GtkSignalFunc close_function,
GtkSignalFunc sensitivity_cb,
GCallback ok_function,
GCallback close_function,
GCallback sensitivity_cb,
GnmExprEntryFlags flags);
#endif
......@@ -26,11 +26,11 @@
G_BEGIN_DECLS
#define GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY (gnumeric_cell_renderer_expr_entry_get_type ())
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY(obj) (GTK_CHECK_CAST ((obj), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY, GnumericCellRendererExprEntry))
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY, GnumericCellRendererExprEntryClass))
#define GNUMERIC_IS_CELL_RENDERER_EXPR_ENTRY(obj) (GTK_CHECK_TYPE ((obj), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY))
#define GNUMERIC_IS_CELL_RENDERER_EXPR_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY))
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY, GnumericCellRendererExprEntryClass))
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY, GnumericCellRendererExprEntry))
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY, GnumericCellRendererExprEntryClass))
#define GNUMERIC_IS_CELL_RENDERER_EXPR_ENTRY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY))
#define GNUMERIC_IS_CELL_RENDERER_EXPR_ENTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY))
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_GET_CLASS(o) (GTK_CHECK_GET_CLASS ((o), GNUMERIC_TYPE_CELL_RENDERER_EXPR_ENTRY, GnumericCellRendererExprEntryClass))
typedef struct _GnumericCellRendererExprEntry GnumericCellRendererExprEntry;
typedef struct _GnumericCellRendererExprEntryClass GnumericCellRendererExprEntryClass;
......
......@@ -23,12 +23,12 @@
G_BEGIN_DECLS
#define GNUMERIC_TYPE_CELL_RENDERER_TEXT (gnumeric_cell_renderer_text_get_type ())
#define GNUMERIC_CELL_RENDERER_TEXT(obj) (GTK_CHECK_CAST ((obj), GNUMERIC_TYPE_CELL_RENDERER_TEXT, GnumericCellRendererText))
#define GNUMERIC_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNUMERIC_TYPE_CELL_RENDERER_TEXT, GnumericCellRendererTextClass))
#define GNUMERIC_IS_CELL_RENDERER_TEXT(obj) (GTK_CHECK_TYPE ((obj), GNUMERIC_TYPE_CELL_RENDERER_TEXT))
#define GNUMERIC_IS_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNUMERIC_TYPE_CELL_RENDERER_TEXT))
#define GNUMERIC_CELL_RENDERER_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNUMERIC_TYPE_CELL_RENDERER_TEXT, GnumericCellRendererTextClass))
#define GNUMERIC_TYPE_CELL_RENDERER_TEXT (gnumeric_cell_renderer_text_get_type ())
#define GNUMERIC_CELL_RENDERER_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNUMERIC_TYPE_CELL_RENDERER_TEXT, GnumericCellRendererText))
#define GNUMERIC_CELL_RENDERER_TEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNUMERIC_TYPE_CELL_RENDERER_TEXT, GnumericCellRendererTextClass))
#define GNUMERIC_IS_CELL_RENDERER_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNUMERIC_TYPE_CELL_RENDERER_TEXT))
#define GNUMERIC_IS_CELL_RENDERER_TEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNUMERIC_TYPE_CELL_RENDERER_TEXT))
#define GNUMERIC_CELL_RENDERER_TEXT_GET_CLASS(o) (GTK_CHECK_GET_CLASS ((o), GNUMERIC_TYPE_CELL_RENDERER_TEXT, GnumericCellRendererTextClass))
typedef struct _GnumericCellRendererText GnumericCellRendererText;
typedef struct _GnumericCellRendererTextClass GnumericCellRendererTextClass;
......
......@@ -28,11 +28,11 @@
G_BEGIN_DECLS
#define GNUMERIC_TYPE_CELL_RENDERER_TOGGLE (gnumeric_cell_renderer_toggle_get_type ())
#define GNUMERIC_CELL_RENDERER_TOGGLE(obj) (GTK_CHECK_CAST ((obj), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE, GnumericCellRendererToggle))
#define GNUMERIC_CELL_RENDERER_TOGGLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE, GnumericCellRendererToggleClass))
#define GNUMERIC_IS_CELL_RENDERER_TOGGLE(obj) (GTK_CHECK_TYPE ((obj), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE))
#define GNUMERIC_IS_CELL_RENDERER_TOGGLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE))
#define GNUMERIC_CELL_RENDERER_TOGGLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE, GnumericCellRendererToggleClass))
#define GNUMERIC_CELL_RENDERER_TOGGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE, GnumericCellRendererToggle))
#define GNUMERIC_CELL_RENDERER_TOGGLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE, GnumericCellRendererToggleClass))
#define GNUMERIC_IS_CELL_RENDERER_TOGGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE))
#define GNUMERIC_IS_CELL_RENDERER_TOGGLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE))
#define GNUMERIC_CELL_RENDERER_TOGGLE_GET_CLASS(o)i (GTK_CHECK_GET_CLASS ((o), GNUMERIC_TYPE_CELL_RENDERER_TOGGLE, GnumericCellRendererToggleClass))
typedef struct _GnumericCellRendererToggle GnumericCellRendererToggle;
typedef struct _GnumericCellRendererToggleClass GnumericCellRendererToggleClass;
......
......@@ -217,7 +217,7 @@ lazy_list_tree_model_init (GtkTreeModelIface *iface)
iface->iter_parent = lazy_list_iter_parent;
}
GtkType
GType
gnumeric_lazy_list_get_type (void)
{
static GType lazy_list_type = 0;
......
......@@ -197,7 +197,7 @@ fs_fill_font_name_list (FontSelector *fs)
g_signal_connect (
G_OBJECT (gtk_tree_view_get_selection (fs->font_name_list)), "changed",
GTK_SIGNAL_FUNC (font_selected), fs);
G_CALLBACK (font_selected), fs);
}
static char const *styles[] = {
......@@ -260,7 +260,7 @@ fs_fill_font_style_list (FontSelector *fs)
}
g_signal_connect (
G_OBJECT (gtk_tree_view_get_selection (fs->font_style_list)), "changed",
GTK_SIGNAL_FUNC (style_selected), fs);
G_CALLBACK (style_selected), fs);
}
static void
......@@ -349,11 +349,11 @@ fs_fill_font_size_list (FontSelector *fs)
}
g_signal_connect (
G_OBJECT (gtk_tree_view_get_selection (fs->font_size_list)), "changed",
GTK_SIGNAL_FUNC (size_selected), fs);
G_CALLBACK (size_selected), fs);
g_signal_connect (
G_OBJECT (fs->font_size_entry), "changed",
GTK_SIGNAL_FUNC (size_changed), fs);
G_CALLBACK (size_changed), fs);
}
static void
......@@ -413,7 +413,7 @@ fs_init (FontSelector *fs)
g_signal_connect (G_OBJECT (fs->font_preview_canvas),
"size-allocate",
GTK_SIGNAL_FUNC (canvas_size_changed), fs);
G_CALLBACK (canvas_size_changed), fs);
fs_fill_font_name_list (fs);
fs_fill_font_style_list (fs);
......
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