* src/glabels.c: (main), (save_session_cb):
- Now include libbonoboui.h, recent.h, and file.h to provide missing
prototypes.
- save_session_cb() now returns gboolean.
- Minor formatting changes.
* src/window.h:
* src/window.c:
- Now include file.h to provide missing prototype.
- gl_window_get_type() now returns GType, not guint. I believe this may
ultimately be cause of the segfault reported in Bug #982287, since
GType is actually a gulong, which may not be compatible on other
architectures (64bit) -- I cannot personally test this at this time.
I was sloppy in several other xxx_get_type() functions which also
returned guint -- see next group of files:
* src/window.c: (gl_window_get_type):
* src/canvas-hacktext.c: (gl_canvas_hacktext_get_type):
* src/canvas-hacktext.h:
* src/hig.c: (gl_hig_alert_get_type), (gl_hig_dialog_get_type),
(gl_hig_category_get_type), (gl_hig_vbox_get_type),
(gl_hig_hbox_get_type):
* src/hig.h:
* src/label-barcode.c: (gl_label_barcode_get_type):
* src/label-barcode.h:
* src/label-box.c: (gl_label_box_get_type):
* src/label-box.h:
* src/label-ellipse.c: (gl_label_ellipse_get_type):
* src/label-ellipse.h:
* src/label-image.c: (gl_label_image_get_type):
* src/label-image.h:
* src/label-line.c: (gl_label_line_get_type):
* src/label-line.h:
* src/label-object.c: (gl_label_object_get_type):
* src/label-object.h:
* src/label-text.c: (gl_label_text_get_type):
* src/label-text.h:
* src/label.c: (gl_label_get_type):
* src/label.h:
* src/merge-properties-dialog.c:
(gl_merge_properties_dialog_get_type):
* src/merge-properties-dialog.h:
* src/merge-text.c: (gl_merge_text_get_type):
* src/merge-text.h:
* src/merge.c: (gl_merge_get_type):
* src/merge.h:
* src/object-editor.c: (gl_object_editor_get_type):
* src/prefs-dialog.c: (gl_prefs_dialog_get_type):
* src/prefs-dialog.h:
* src/prefs-model.c: (gl_prefs_model_get_type):
* src/prefs-model.h:
* src/print-dialog.c: (gl_print_dialog_get_type):
* src/print-dialog.h:
* src/template-designer.c: (gl_template_designer_get_type):
* src/template-designer.h:
* src/ui-property-bar.c: (gl_ui_property_bar_get_type):
* src/ui-property-bar.h:
* src/ui-sidebar.c: (gl_ui_sidebar_get_type):
* src/ui-sidebar.h:
* src/view-barcode.c: (gl_view_barcode_get_type):
* src/view-barcode.h:
* src/view-box.c: (gl_view_box_get_type):
* src/view-box.h:
* src/view-ellipse.c: (gl_view_ellipse_get_type):
* src/view-ellipse.h:
* src/view-highlight.c: (gl_view_highlight_get_type):
* src/view-highlight.h:
* src/view-image.c: (gl_view_image_get_type):
* src/view-image.h:
* src/view-line.c: (gl_view_line_get_type):
* src/view-line.h:
* src/view-object.c: (gl_view_object_get_type):
* src/view-object.h:
* src/view-text.c: (gl_view_text_get_type):
* src/view-text.h:
* src/view.c: (gl_view_get_type):
* src/view.h:
* src/wdgt-chain-button.c: (gl_wdgt_chain_button_get_type):
* src/wdgt-image-select.c: (gl_wdgt_image_select_get_type):
* src/wdgt-image-select.h:
* src/wdgt-media-select.c: (gl_wdgt_media_select_get_type):
* src/wdgt-media-select.h:
* src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_get_type):
* src/wdgt-mini-preview.h:
* src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type):
* src/wdgt-print-copies.h:
* src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type):
* src/wdgt-print-merge.h:
* src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_get_type):
* src/wdgt-rotate-label.h:
- Made sure all xxx_get_type functions returned GType, not guint. This
was the case in hig.[ch], window.[ch], ui-property-bar.[ch],
ui-sidebar.[ch], view.[ch], wdgt-image-select.[ch],
wdgt-media-select.[ch], wdgt-mini-preview.[ch], wdgt-print-copies.[ch],
wdt-print-merge.[ch], and wdgt-rotate-label.[ch]. See separate
window.[ch] details above for more info.
- Reconciled various coding style differences in all xxx_get_type()
functions:
* All prototypes include G_GNUC_CONST.
* All prototypes specify the return value as GType, not GtkType
or guint.
* Info structures are all declared as "static const."
* Generalized the names of type and info variables.
* Miscelaneous formatting.
git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@427
f5e0f49d-192f-0410-a22d-
a8d8700d0965
+2004-07-02 Jim Evins <evins@snaught.com>
+
+ * src/glabels.c: (main), (save_session_cb):
+ - Now include libbonoboui.h, recent.h, and file.h to provide missing
+ prototypes.
+ - save_session_cb() now returns gboolean.
+ - Minor formatting changes.
+
+ * src/window.h:
+ * src/window.c:
+ - Now include file.h to provide missing prototype.
+ - gl_window_get_type() now returns GType, not guint. I believe this may
+ ultimately be cause of the segfault reported in Bug #982287, since
+ GType is actually a gulong, which may not be compatible on other
+ architectures (64bit) -- I cannot personally test this at this time.
+ I was sloppy in several other xxx_get_type() functions which also
+ returned guint -- see next group of files:
+
+ * src/window.c: (gl_window_get_type):
+ * src/canvas-hacktext.c: (gl_canvas_hacktext_get_type):
+ * src/canvas-hacktext.h:
+ * src/hig.c: (gl_hig_alert_get_type), (gl_hig_dialog_get_type),
+ (gl_hig_category_get_type), (gl_hig_vbox_get_type),
+ (gl_hig_hbox_get_type):
+ * src/hig.h:
+ * src/label-barcode.c: (gl_label_barcode_get_type):
+ * src/label-barcode.h:
+ * src/label-box.c: (gl_label_box_get_type):
+ * src/label-box.h:
+ * src/label-ellipse.c: (gl_label_ellipse_get_type):
+ * src/label-ellipse.h:
+ * src/label-image.c: (gl_label_image_get_type):
+ * src/label-image.h:
+ * src/label-line.c: (gl_label_line_get_type):
+ * src/label-line.h:
+ * src/label-object.c: (gl_label_object_get_type):
+ * src/label-object.h:
+ * src/label-text.c: (gl_label_text_get_type):
+ * src/label-text.h:
+ * src/label.c: (gl_label_get_type):
+ * src/label.h:
+ * src/merge-properties-dialog.c:
+ (gl_merge_properties_dialog_get_type):
+ * src/merge-properties-dialog.h:
+ * src/merge-text.c: (gl_merge_text_get_type):
+ * src/merge-text.h:
+ * src/merge.c: (gl_merge_get_type):
+ * src/merge.h:
+ * src/object-editor.c: (gl_object_editor_get_type):
+ * src/prefs-dialog.c: (gl_prefs_dialog_get_type):
+ * src/prefs-dialog.h:
+ * src/prefs-model.c: (gl_prefs_model_get_type):
+ * src/prefs-model.h:
+ * src/print-dialog.c: (gl_print_dialog_get_type):
+ * src/print-dialog.h:
+ * src/template-designer.c: (gl_template_designer_get_type):
+ * src/template-designer.h:
+ * src/ui-property-bar.c: (gl_ui_property_bar_get_type):
+ * src/ui-property-bar.h:
+ * src/ui-sidebar.c: (gl_ui_sidebar_get_type):
+ * src/ui-sidebar.h:
+ * src/view-barcode.c: (gl_view_barcode_get_type):
+ * src/view-barcode.h:
+ * src/view-box.c: (gl_view_box_get_type):
+ * src/view-box.h:
+ * src/view-ellipse.c: (gl_view_ellipse_get_type):
+ * src/view-ellipse.h:
+ * src/view-highlight.c: (gl_view_highlight_get_type):
+ * src/view-highlight.h:
+ * src/view-image.c: (gl_view_image_get_type):
+ * src/view-image.h:
+ * src/view-line.c: (gl_view_line_get_type):
+ * src/view-line.h:
+ * src/view-object.c: (gl_view_object_get_type):
+ * src/view-object.h:
+ * src/view-text.c: (gl_view_text_get_type):
+ * src/view-text.h:
+ * src/view.c: (gl_view_get_type):
+ * src/view.h:
+ * src/wdgt-chain-button.c: (gl_wdgt_chain_button_get_type):
+ * src/wdgt-image-select.c: (gl_wdgt_image_select_get_type):
+ * src/wdgt-image-select.h:
+ * src/wdgt-media-select.c: (gl_wdgt_media_select_get_type):
+ * src/wdgt-media-select.h:
+ * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_get_type):
+ * src/wdgt-mini-preview.h:
+ * src/wdgt-print-copies.c: (gl_wdgt_print_copies_get_type):
+ * src/wdgt-print-copies.h:
+ * src/wdgt-print-merge.c: (gl_wdgt_print_merge_get_type):
+ * src/wdgt-print-merge.h:
+ * src/wdgt-rotate-label.c: (gl_wdgt_rotate_label_get_type):
+ * src/wdgt-rotate-label.h:
+ - Made sure all xxx_get_type functions returned GType, not guint. This
+ was the case in hig.[ch], window.[ch], ui-property-bar.[ch],
+ ui-sidebar.[ch], view.[ch], wdgt-image-select.[ch],
+ wdgt-media-select.[ch], wdgt-mini-preview.[ch], wdgt-print-copies.[ch],
+ wdt-print-merge.[ch], and wdgt-rotate-label.[ch]. See separate
+ window.[ch] details above for more info.
+ - Reconciled various coding style differences in all xxx_get_type()
+ functions:
+ * All prototypes include G_GNUC_CONST.
+ * All prototypes specify the return value as GType, not GtkType
+ or guint.
+ * Info structures are all declared as "static const."
+ * Generalized the names of type and info variables.
+ * Miscelaneous formatting.
+
2004-06-08 Jim Evins <evins@snaught.com>
* src/label.c:
GType
gl_canvas_hacktext_get_type (void)
{
- static GType hacktext_type = 0;
+ static GType type = 0;
- if (!hacktext_type) {
- static const GTypeInfo hacktext_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glCanvasHacktextClass),
NULL,
NULL,
NULL
};
- hacktext_type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM,
- "glCanvasHacktext",
- &hacktext_info, 0);
+ type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM,
+ "glCanvasHacktext",
+ &info, 0);
}
- return hacktext_type;
+ return type;
}
static void
};
-GType gl_canvas_hacktext_get_type (void);
+GType gl_canvas_hacktext_get_type (void) G_GNUC_CONST;
G_END_DECLS
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include <libgnomeui/gnome-window-icon.h>
+#include <libbonoboui.h>
#include "splash.h"
#include "stock.h"
#include "merge-init.h"
+#include "recent.h"
#include <libglabels/paper.h>
#include <libglabels/template.h>
#include "prefs.h"
#include "debug.h"
#include "window.h"
+#include "file.h"
/*========================================================*/
/* Private macros and constants. */
/*========================================================*/
/* Local function prototypes */
/*========================================================*/
-gint save_session_cb (GnomeClient *client,
- gint phase,
- GnomeRestartStyle save_style,
- gint shutdown,
- GnomeInteractStyle interact_style,
- gint fast,
- gpointer client_data);
+gboolean save_session_cb (GnomeClient *client,
+ gint phase,
+ GnomeRestartStyle save_style,
+ gint shutdown,
+ GnomeInteractStyle interact_style,
+ gint fast,
+ gpointer client_data);
-void client_die_cb (GnomeClient *client,
- gpointer client_data);
+void client_die_cb (GnomeClient *client,
+ gpointer client_data);
/****************************************************************************/
/* main program */
}
/* Initialize subsystems */
- gl_paper_init();
+ gl_paper_init ();
gl_prefs_init ();
- gl_template_init();
- gl_merge_init();
- gl_recent_init();
+ gl_template_init ();
+ gl_merge_init ();
+ gl_recent_init ();
- if (bonobo_ui_init ("glabels", VERSION, &argc, argv) == FALSE) {
+ if (!bonobo_ui_init ("glabels", VERSION, &argc, argv)) {
g_error (_("Could not initialize Bonobo!\n"));
}
/*---------------------------------------------------------------------------*/
/* PRIVATE. "Save session" callback. */
/*---------------------------------------------------------------------------*/
-gint save_session_cb (GnomeClient *client,
- gint phase,
- GnomeRestartStyle save_style,
- gint shutdown,
- GnomeInteractStyle interact_style,
- gint fast,
- gpointer client_data)
+gboolean save_session_cb (GnomeClient *client,
+ gint phase,
+ GnomeRestartStyle save_style,
+ gint shutdown,
+ GnomeInteractStyle interact_style,
+ gint fast,
+ gpointer client_data)
{
gchar *argv[128];
gint argc;
/* Boilerplate Alert Object stuff. */
/****************************************************************************/
/****************************************************************************/
-guint
+GType
gl_hig_alert_get_type (void)
{
- static guint hig_alert_type = 0;
+ static GType type = 0;
- if (!hig_alert_type) {
- GTypeInfo hig_alert_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glHigAlertClass),
NULL,
NULL,
sizeof (glHigAlert),
0,
(GInstanceInitFunc) gl_hig_alert_init,
+ NULL
};
- hig_alert_type =
- g_type_register_static (gtk_dialog_get_type (),
- "glHigAlert",
- &hig_alert_info, 0);
+ type = g_type_register_static (GTK_TYPE_DIALOG,
+ "glHigAlert", &info, 0);
}
- return hig_alert_type;
+ return type;
}
static void
/* Boilerplate Dialog Object stuff. */
/****************************************************************************/
/****************************************************************************/
-guint
+GType
gl_hig_dialog_get_type (void)
{
- static guint hig_dialog_type = 0;
+ static GType type = 0;
- if (!hig_dialog_type) {
- GTypeInfo hig_dialog_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glHigDialogClass),
NULL,
NULL,
sizeof (glHigDialog),
0,
(GInstanceInitFunc) gl_hig_dialog_init,
+ NULL
};
- hig_dialog_type =
- g_type_register_static (gtk_dialog_get_type (),
- "glHigDialog",
- &hig_dialog_info, 0);
+ type = g_type_register_static (GTK_TYPE_DIALOG,
+ "glHigDialog", &info, 0);
}
- return hig_dialog_type;
+ return type;
}
static void
/* Boilerplate Category Object stuff. */
/****************************************************************************/
/****************************************************************************/
-guint
+GType
gl_hig_category_get_type (void)
{
- static guint hig_category_type = 0;
+ static GType type = 0;
- if (!hig_category_type) {
- GTypeInfo hig_category_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glHigCategoryClass),
NULL,
NULL,
sizeof (glHigCategory),
0,
(GInstanceInitFunc) gl_hig_category_init,
+ NULL
};
- hig_category_type =
- g_type_register_static (gtk_vbox_get_type (),
- "glHigCategory",
- &hig_category_info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "glHigCategory", &info, 0);
}
- return hig_category_type;
+ return type;
}
static void
/* Boilerplate VBox Object stuff. */
/****************************************************************************/
/****************************************************************************/
-guint
+GType
gl_hig_vbox_get_type (void)
{
- static guint hig_vbox_type = 0;
+ static GType type = 0;
- if (!hig_vbox_type) {
- GTypeInfo hig_vbox_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glHigVBoxClass),
NULL,
NULL,
sizeof (glHigVBox),
0,
(GInstanceInitFunc) gl_hig_vbox_init,
+ NULL
};
- hig_vbox_type =
- g_type_register_static (gtk_vbox_get_type (),
- "glHigVBox",
- &hig_vbox_info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "glHigVBox", &info, 0);
}
- return hig_vbox_type;
+ return type;
}
static void
/* Boilerplate HBox Object stuff. */
/****************************************************************************/
/****************************************************************************/
-guint
+GType
gl_hig_hbox_get_type (void)
{
- static guint hig_hbox_type = 0;
+ static GType type = 0;
- if (!hig_hbox_type) {
- GTypeInfo hig_hbox_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glHigHBoxClass),
NULL,
NULL,
sizeof (glHigHBox),
0,
(GInstanceInitFunc) gl_hig_hbox_init,
+ NULL
};
- hig_hbox_type =
- g_type_register_static (gtk_hbox_get_type (),
- "glHigHBox",
- &hig_hbox_info, 0);
+ type = g_type_register_static (GTK_TYPE_HBOX,
+ "glHigHBox", &info, 0);
}
- return hig_hbox_type;
+ return type;
}
static void
GtkDialogClass parent_class;
};
-guint gl_hig_alert_get_type (void);
+GType gl_hig_alert_get_type (void) G_GNUC_CONST;
GtkWidget *gl_hig_alert_new (GtkWindow *parent,
GtkDialogFlags flags,
GtkDialogClass parent_class;
};
-guint gl_hig_dialog_get_type (void);
+GType gl_hig_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gl_hig_dialog_new (void);
GtkVBoxClass parent_class;
};
-guint gl_hig_category_get_type (void);
+GType gl_hig_category_get_type (void) G_GNUC_CONST;
GtkWidget *gl_hig_category_new (const gchar *header);
GtkVBoxClass parent_class;
};
-guint gl_hig_vbox_get_type (void);
+GType gl_hig_vbox_get_type (void) G_GNUC_CONST;
GtkWidget *gl_hig_vbox_new (glHigVBoxType type);
GtkHBoxClass parent_class;
};
-guint gl_hig_hbox_get_type (void);
+GType gl_hig_hbox_get_type (void) G_GNUC_CONST;
GtkWidget *gl_hig_hbox_new (void);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelBarcodeClass),
NULL,
NULL,
sizeof (glLabelBarcode),
0,
(GInstanceInitFunc) gl_label_barcode_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_LABEL_OBJECT,
};
-GType gl_label_barcode_get_type (void);
+GType gl_label_barcode_get_type (void) G_GNUC_CONST;
GObject *gl_label_barcode_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelBoxClass),
NULL,
NULL,
sizeof (glLabelBox),
0,
(GInstanceInitFunc) gl_label_box_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_LABEL_OBJECT,
glLabelObjectClass parent_class;
};
-GType gl_label_box_get_type (void);
+GType gl_label_box_get_type (void) G_GNUC_CONST;
GObject *gl_label_box_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelEllipseClass),
NULL,
NULL,
sizeof (glLabelEllipse),
0,
(GInstanceInitFunc) gl_label_ellipse_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_LABEL_OBJECT,
glLabelObjectClass parent_class;
};
-GType gl_label_ellipse_get_type (void);
+GType gl_label_ellipse_get_type (void) G_GNUC_CONST;
GObject *gl_label_ellipse_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelImageClass),
NULL,
NULL,
sizeof (glLabelImage),
0,
(GInstanceInitFunc) gl_label_image_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_LABEL_OBJECT,
glLabelObjectClass parent_class;
};
-GType gl_label_image_get_type (void);
+GType gl_label_image_get_type (void) G_GNUC_CONST;
GObject *gl_label_image_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelLineClass),
NULL,
NULL,
sizeof (glLabelLine),
0,
(GInstanceInitFunc) gl_label_line_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_LABEL_OBJECT,
glLabelObjectClass parent_class;
};
-GType gl_label_line_get_type (void);
+GType gl_label_line_get_type (void) G_GNUC_CONST;
GObject *gl_label_line_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelObjectClass),
NULL,
NULL,
sizeof (glLabelObject),
0,
(GInstanceInitFunc) gl_label_object_instance_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT,
gpointer user_data);
};
-GType gl_label_object_get_type (void);
+GType gl_label_object_get_type (void) G_GNUC_CONST;
GObject *gl_label_object_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelTextClass),
NULL,
NULL,
sizeof (glLabelText),
0,
(GInstanceInitFunc) gl_label_text_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_LABEL_OBJECT,
glLabelObjectClass parent_class;
};
-GType gl_label_text_get_type (void);
+GType gl_label_text_get_type (void) G_GNUC_CONST;
GObject *gl_label_text_new (glLabel *label);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glLabelClass),
NULL,
NULL,
sizeof (glLabel),
0,
(GInstanceInitFunc) gl_label_instance_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT,
};
-GType gl_label_get_type (void);
+GType gl_label_get_type (void) G_GNUC_CONST;
GObject *gl_label_new (void);
GType
gl_merge_properties_dialog_get_type (void)
{
- static GType dialog_type = 0;
+ static GType type = 0;
- if (!dialog_type)
+ if (!type)
{
- static const GTypeInfo dialog_info =
+ static const GTypeInfo info =
{
sizeof (glMergePropertiesDialogClass),
NULL, /* base_init */
NULL, /* class_data */
sizeof (glMergePropertiesDialog),
0, /* n_preallocs */
- (GInstanceInitFunc) gl_merge_properties_dialog_init
+ (GInstanceInitFunc) gl_merge_properties_dialog_init,
+ NULL
};
- dialog_type = g_type_register_static (GL_TYPE_HIG_DIALOG,
- "glMergePropertiesDialog",
- &dialog_info,
- 0);
+ type = g_type_register_static (GL_TYPE_HIG_DIALOG,
+ "glMergePropertiesDialog", &info, 0);
}
- return dialog_type;
+ return type;
}
static void
glHigDialogClass parent_class;
};
-GtkType gl_merge_properties_dialog_get_type (void) G_GNUC_CONST;
+GType gl_merge_properties_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gl_merge_properties_dialog_new (glView *view);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glMergeTextClass),
NULL,
NULL,
sizeof (glMergeText),
0,
(GInstanceInitFunc) gl_merge_text_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_MERGE,
};
-GType gl_merge_text_get_type (void);
+GType gl_merge_text_get_type (void) G_GNUC_CONST;
G_END_DECLS
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glMergeClass),
NULL,
NULL,
sizeof (glMerge),
0,
(GInstanceInitFunc) gl_merge_instance_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT,
gchar *gl_merge_description_to_name (gchar *description);
-GType gl_merge_get_type (void);
+GType gl_merge_get_type (void) G_GNUC_CONST;
glMerge *gl_merge_new (gchar *name);
GType
gl_object_editor_get_type (void)
{
- static GType editor_type = 0;
+ static GType type = 0;
- if (!editor_type)
+ if (!type)
{
- static const GTypeInfo editor_info =
+ static const GTypeInfo info =
{
sizeof (glObjectEditorClass),
NULL, /* base_init */
NULL, /* class_data */
sizeof (glObjectEditor),
0, /* n_preallocs */
- (GInstanceInitFunc) gl_object_editor_init
+ (GInstanceInitFunc) gl_object_editor_init,
+ NULL
};
- editor_type = g_type_register_static (GTK_TYPE_VBOX,
- "glObjectEditor",
- &editor_info,
- 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "glObjectEditor", &info, 0);
}
- return editor_type;
+ return type;
}
static void
GType
gl_prefs_dialog_get_type (void)
{
- static GType dialog_type = 0;
+ static GType type = 0;
- if (!dialog_type)
+ if (!type)
{
- static const GTypeInfo dialog_info =
+ static const GTypeInfo info =
{
sizeof (glPrefsDialogClass),
NULL, /* base_init */
NULL, /* class_data */
sizeof (glPrefsDialog),
0, /* n_preallocs */
- (GInstanceInitFunc) gl_prefs_dialog_init
+ (GInstanceInitFunc) gl_prefs_dialog_init,
+ NULL
};
- dialog_type = g_type_register_static (GL_TYPE_HIG_DIALOG,
- "glPrefsDialog",
- &dialog_info,
- 0);
+ type = g_type_register_static (GL_TYPE_HIG_DIALOG,
+ "glPrefsDialog", &info, 0);
}
- return dialog_type;
+ return type;
}
static void
glHigDialogClass parent_class;
};
-GtkType gl_prefs_dialog_get_type (void) G_GNUC_CONST;
+GType gl_prefs_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gl_prefs_dialog_new (GtkWindow *parent);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glPrefsModelClass),
NULL,
NULL,
sizeof (glPrefsModel),
0,
(GInstanceInitFunc) gl_prefs_model_instance_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT,
};
-GType gl_prefs_model_get_type (void);
+GType gl_prefs_model_get_type (void) G_GNUC_CONST;
glPrefsModel *gl_prefs_model_new (void);
GType
gl_print_dialog_get_type (void)
{
- static GType dialog_type = 0;
+ static GType type = 0;
- if (!dialog_type)
+ if (!type)
{
- static const GTypeInfo dialog_info =
+ static const GTypeInfo info =
{
sizeof (glPrintDialogClass),
NULL, /* base_init */
NULL, /* class_data */
sizeof (glPrintDialog),
0, /* n_preallocs */
- (GInstanceInitFunc) gl_print_dialog_init
+ (GInstanceInitFunc) gl_print_dialog_init,
+ NULL
};
- dialog_type = g_type_register_static (GL_TYPE_HIG_DIALOG,
- "glPrintDialog",
- &dialog_info,
- 0);
+ type = g_type_register_static (GL_TYPE_HIG_DIALOG,
+ "glPrintDialog", &info, 0);
}
- return dialog_type;
+ return type;
}
static void
};
-GtkType gl_print_dialog_get_type (void) G_GNUC_CONST;
+GType gl_print_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gl_print_dialog_new (glLabel *label,
BonoboWindow *win);
GType
gl_template_designer_get_type (void)
{
- static GType dialog_type = 0;
+ static GType type = 0;
- if (!dialog_type)
+ if (!type)
{
- static const GTypeInfo dialog_info =
+ static const GTypeInfo info =
{
sizeof (glTemplateDesignerClass),
NULL, /* base_init */
NULL, /* class_data */
sizeof (glTemplateDesigner),
0, /* n_preallocs */
- (GInstanceInitFunc) gl_template_designer_init
+ (GInstanceInitFunc) gl_template_designer_init,
+ NULL
};
- dialog_type = g_type_register_static (GTK_TYPE_WINDOW,
- "glTemplateDesigner",
- &dialog_info,
- 0);
+ type = g_type_register_static (GTK_TYPE_WINDOW,
+ "glTemplateDesigner", &info, 0);
}
- return dialog_type;
+ return type;
}
static void
GtkWindowClass parent_class;
};
-GtkType gl_template_designer_get_type (void) G_GNUC_CONST;
+GType gl_template_designer_get_type (void) G_GNUC_CONST;
GtkWidget *gl_template_designer_new (GtkWindow *parent);
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_ui_property_bar_get_type (void)
{
- static guint property_bar_type = 0;
+ static GType type = 0;
- if (!property_bar_type) {
- GTypeInfo property_bar_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glUIPropertyBarClass),
NULL,
NULL,
sizeof (glUIPropertyBar),
0,
(GInstanceInitFunc) gl_ui_property_bar_instance_init,
+ NULL
};
- property_bar_type =
- g_type_register_static (G_TYPE_OBJECT,
- "glUIPropertyBar",
- &property_bar_info, 0);
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "glUIPropertyBar", &info, 0);
}
- return property_bar_type;
+ return type;
}
static void
GObjectClass parent_class;
};
-guint gl_ui_property_bar_get_type (void);
+GType gl_ui_property_bar_get_type (void) G_GNUC_CONST;
GObject *gl_ui_property_bar_new (BonoboUIComponent *ui_component);
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_ui_sidebar_get_type (void)
{
- static guint sidebar_type = 0;
+ static GType type = 0;
- if (!sidebar_type) {
- GTypeInfo sidebar_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glUISidebarClass),
NULL,
NULL,
sizeof (glUISidebar),
0,
(GInstanceInitFunc) gl_ui_sidebar_instance_init,
+ NULL
};
- sidebar_type =
- g_type_register_static (GTK_TYPE_VBOX,
- "glUISidebar",
- &sidebar_info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "glUISidebar", &info, 0);
}
- return sidebar_type;
+ return type;
}
static void
GtkVBoxClass parent_class;
};
-guint gl_ui_sidebar_get_type (void);
+GType gl_ui_sidebar_get_type (void) G_GNUC_CONST;
GObject *gl_ui_sidebar_new (BonoboUIComponent *ui_component);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewBarcodeClass),
NULL,
NULL,
sizeof (glViewBarcode),
0,
(GInstanceInitFunc) gl_view_barcode_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_VIEW_OBJECT,
};
-extern GType gl_view_barcode_get_type (void);
+GType gl_view_barcode_get_type (void) G_GNUC_CONST;
-extern glViewObject *gl_view_barcode_new (glLabelBarcode *object,
- glView *view);
+glViewObject *gl_view_barcode_new (glLabelBarcode *object,
+ glView *view);
/* cursor for creating barcode objects */
-extern GdkCursor *gl_view_barcode_get_create_cursor (void);
+GdkCursor *gl_view_barcode_get_create_cursor (void);
/* event handler for creating barcode objects */
-extern gint gl_view_barcode_create_event_handler (GnomeCanvas *canvas,
- GdkEvent *event,
- glView *view);
+gint gl_view_barcode_create_event_handler (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
G_END_DECLS
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewBoxClass),
NULL,
NULL,
sizeof (glViewBox),
0,
(GInstanceInitFunc) gl_view_box_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_VIEW_OBJECT,
};
-extern GType gl_view_box_get_type (void);
+GType gl_view_box_get_type (void) G_GNUC_CONST;
-extern glViewObject *gl_view_box_new (glLabelBox *object,
- glView *view);
+glViewObject *gl_view_box_new (glLabelBox *object,
+ glView *view);
/* cursor for creating box objects */
-extern GdkCursor *gl_view_box_get_create_cursor (void);
+GdkCursor *gl_view_box_get_create_cursor (void);
/* event handler for creating box objects */
-extern gint gl_view_box_create_event_handler (GnomeCanvas *canvas,
- GdkEvent *event,
- glView *view);
+gint gl_view_box_create_event_handler (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
G_END_DECLS
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewEllipseClass),
NULL,
NULL,
sizeof (glViewEllipse),
0,
(GInstanceInitFunc) gl_view_ellipse_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_VIEW_OBJECT,
};
-extern GType gl_view_ellipse_get_type (void);
+GType gl_view_ellipse_get_type (void) G_GNUC_CONST;
-extern glViewObject *gl_view_ellipse_new (glLabelEllipse *object,
- glView *view);
+glViewObject *gl_view_ellipse_new (glLabelEllipse *object,
+ glView *view);
/* cursor for creating ellipse objects */
-extern GdkCursor *gl_view_ellipse_get_create_cursor (void);
+GdkCursor *gl_view_ellipse_get_create_cursor (void);
/* event handler for creating ellipse objects */
-extern gint gl_view_ellipse_create_event_handler (GnomeCanvas *canvas,
- GdkEvent *event,
- glView *view);
+gint gl_view_ellipse_create_event_handler (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
G_END_DECLS
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewHighlightClass),
NULL,
NULL,
sizeof (glViewHighlight),
0,
(GInstanceInitFunc) gl_view_highlight_instance_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT,
-GType gl_view_highlight_get_type (void);
+GType gl_view_highlight_get_type (void) G_GNUC_CONST;
GObject *gl_view_highlight_new (glViewObject *view_object,
glViewHighlightStyle style);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewImageClass),
NULL,
NULL,
sizeof (glViewImage),
0,
(GInstanceInitFunc) gl_view_image_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_VIEW_OBJECT,
};
-extern GType gl_view_image_get_type (void);
+GType gl_view_image_get_type (void) G_GNUC_CONST;
-extern glViewObject *gl_view_image_new (glLabelImage *object,
- glView *view);
+glViewObject *gl_view_image_new (glLabelImage *object,
+ glView *view);
/* cursor for creating image objects */
-extern GdkCursor *gl_view_image_get_create_cursor (void);
+GdkCursor *gl_view_image_get_create_cursor (void);
/* event handler for creating image objects */
-extern gint gl_view_image_create_event_handler (GnomeCanvas *canvas,
- GdkEvent *event,
- glView *view);
+gint gl_view_image_create_event_handler (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
G_END_DECLS
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewLineClass),
NULL,
NULL,
sizeof (glViewLine),
0,
(GInstanceInitFunc) gl_view_line_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_VIEW_OBJECT,
};
-extern GType gl_view_line_get_type (void);
+GType gl_view_line_get_type (void) G_GNUC_CONST;
-extern glViewObject *gl_view_line_new (glLabelLine *object,
- glView *view);
+glViewObject *gl_view_line_new (glLabelLine *object,
+ glView *view);
/* cursor for creating line objects */
-extern GdkCursor *gl_view_line_get_create_cursor (void);
+GdkCursor *gl_view_line_get_create_cursor (void);
/* event handler for creating line objects */
-extern gint gl_view_line_create_event_handler (GnomeCanvas *canvas,
- GdkEvent *event,
- glView *view);
+gint gl_view_line_create_event_handler (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
G_END_DECLS
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewObjectClass),
NULL,
NULL,
sizeof (glViewObject),
0,
(GInstanceInitFunc) gl_view_object_instance_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT,
G_BEGIN_DECLS
-GType gl_view_object_get_type (void);
+GType gl_view_object_get_type (void) G_GNUC_CONST;
GObject *gl_view_object_new (void);
static GType type = 0;
if (!type) {
- GTypeInfo info = {
+ static const GTypeInfo info = {
sizeof (glViewTextClass),
NULL,
NULL,
sizeof (glViewText),
0,
(GInstanceInitFunc) gl_view_text_instance_init,
+ NULL
};
type = g_type_register_static (GL_TYPE_VIEW_OBJECT,
};
-extern GType gl_view_text_get_type (void);
+GType gl_view_text_get_type (void) G_GNUC_CONST;
-extern glViewObject *gl_view_text_new (glLabelText *object,
- glView *view);
+glViewObject *gl_view_text_new (glLabelText *object,
+ glView *view);
/* cursor for creating text objects */
-extern GdkCursor *gl_view_text_get_create_cursor (void);
+GdkCursor *gl_view_text_get_create_cursor (void);
/* event handler for creating text objects */
-extern gint gl_view_text_create_event_handler (GnomeCanvas *canvas,
- GdkEvent *event,
- glView *view);
+gint gl_view_text_create_event_handler (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
G_END_DECLS
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_view_get_type (void)
{
- static guint view_type = 0;
+ static GType type = 0;
- if (!view_type) {
- GTypeInfo view_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glViewClass),
NULL,
NULL,
sizeof (glView),
0,
(GInstanceInitFunc) gl_view_init,
+ NULL
};
- view_type =
- g_type_register_static (gtk_vbox_get_type (),
- "glView", &view_info, 0);
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "glView", &info, 0);
}
- return view_type;
+ return type;
}
static void
G_BEGIN_DECLS
-guint gl_view_get_type (void);
+GType gl_view_get_type (void) G_GNUC_CONST;
GtkWidget *gl_view_new (glLabel *label);
GType
gl_wdgt_chain_button_get_type (void)
{
- static GType button_type = 0;
+ static GType type = 0;
- if (! button_type)
+ if (! type)
{
- static const GTypeInfo button_info =
+ static const GTypeInfo info =
{
sizeof (glWdgtChainButtonClass),
NULL, /* base_init */
sizeof (glWdgtChainButton),
0, /* n_preallocs */
(GInstanceInitFunc) gl_wdgt_chain_button_init,
+ NULL
};
- button_type = g_type_register_static (GTK_TYPE_TABLE, "glWdgtChainButton",
- &button_info, 0);
+ type = g_type_register_static (GTK_TYPE_TABLE,
+ "glWdgtChainButton", &info, 0);
}
- return button_type;
+ return type;
}
static void
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_wdgt_image_select_get_type (void)
{
- static guint wdgt_image_select_type = 0;
+ static GType type = 0;
- if (!wdgt_image_select_type) {
- GTypeInfo wdgt_image_select_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWdgtImageSelectClass),
NULL,
NULL,
sizeof (glWdgtImageSelect),
0,
(GInstanceInitFunc) gl_wdgt_image_select_instance_init,
+ NULL
};
- wdgt_image_select_type =
- g_type_register_static (gl_hig_vbox_get_type (),
- "glWdgtImageSelect",
- &wdgt_image_select_info, 0);
+ type = g_type_register_static (GL_TYPE_HIG_VBOX,
+ "glWdgtImageSelect", &info, 0);
}
- return wdgt_image_select_type;
+ return type;
}
static void
gpointer user_data);
};
-guint gl_wdgt_image_select_get_type (void);
+GType gl_wdgt_image_select_get_type (void) G_GNUC_CONST;
GtkWidget *gl_wdgt_image_select_new (glMerge *merge,
glTextNode *text_node);
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_wdgt_media_select_get_type (void)
{
- static guint wdgt_media_select_type = 0;
+ static GType type = 0;
- if (!wdgt_media_select_type) {
- GTypeInfo wdgt_media_select_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWdgtMediaSelectClass),
NULL,
NULL,
sizeof (glWdgtMediaSelect),
0,
(GInstanceInitFunc) gl_wdgt_media_select_instance_init,
+ NULL
};
- wdgt_media_select_type =
- g_type_register_static (gl_hig_vbox_get_type (),
- "glWdgtMediaSelect",
- &wdgt_media_select_info, 0);
+ type = g_type_register_static (GL_TYPE_HIG_VBOX,
+ "glWdgtMediaSelect", &info, 0);
}
- return wdgt_media_select_type;
+ return type;
}
static void
void (*changed) (glWdgtMediaSelect * media_select, gpointer user_data);
};
-guint gl_wdgt_media_select_get_type (void);
+GType gl_wdgt_media_select_get_type (void) G_GNUC_CONST;
GtkWidget *gl_wdgt_media_select_new (void);
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_wdgt_mini_preview_get_type (void)
{
- static guint wdgt_mini_preview_type = 0;
+ static GType type = 0;
- if (!wdgt_mini_preview_type) {
- GTypeInfo wdgt_mini_preview_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWdgtMiniPreviewClass),
NULL,
NULL,
sizeof (glWdgtMiniPreview),
0,
(GInstanceInitFunc) gl_wdgt_mini_preview_instance_init,
+ NULL
};
- wdgt_mini_preview_type =
- g_type_register_static (gtk_hbox_get_type (),
- "glWdgtMiniPreview",
- &wdgt_mini_preview_info, 0);
+ type = g_type_register_static (GTK_TYPE_HBOX,
+ "glWdgtMiniPreview", &info, 0);
}
- return wdgt_mini_preview_type;
+ return type;
}
static void
gpointer user_data);
};
-guint gl_wdgt_mini_preview_get_type (void);
+GType gl_wdgt_mini_preview_get_type (void) G_GNUC_CONST;
GtkWidget *gl_wdgt_mini_preview_new (gint height,
gint width);
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_wdgt_print_copies_get_type (void)
{
- static guint wdgt_print_copies_type = 0;
+ static GType type = 0;
- if (!wdgt_print_copies_type) {
- GTypeInfo wdgt_print_copies_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWdgtPrintCopiesClass),
NULL,
NULL,
sizeof (glWdgtPrintCopies),
0,
(GInstanceInitFunc) gl_wdgt_print_copies_instance_init,
+ NULL
};
- wdgt_print_copies_type =
- g_type_register_static (gl_hig_hbox_get_type (),
- "glWdgtPrintCopies",
- &wdgt_print_copies_info, 0);
+ type = g_type_register_static (GL_TYPE_HIG_HBOX,
+ "glWdgtPrintCopies", &info, 0);
}
- return wdgt_print_copies_type;
+ return type;
}
static void
#include "label.h"
#include "hig.h"
+G_BEGIN_DECLS
+
#define GL_TYPE_WDGT_PRINT_COPIES (gl_wdgt_print_copies_get_type ())
#define GL_WDGT_PRINT_COPIES(obj) \
(GTK_CHECK_CAST((obj), GL_TYPE_WDGT_PRINT_COPIES, glWdgtPrintCopies ))
glHigHBoxClass parent_class;
};
-extern guint gl_wdgt_print_copies_get_type (void);
+GType gl_wdgt_print_copies_get_type (void) G_GNUC_CONST;
+
+GtkWidget *gl_wdgt_print_copies_new (glLabel *label);
-extern GtkWidget *gl_wdgt_print_copies_new (glLabel * label);
+void gl_wdgt_print_copies_get_range (glWdgtPrintCopies *copies,
+ gint *n_sheets,
+ gint *first_label,
+ gint *last_label);
-extern void gl_wdgt_print_copies_get_range (glWdgtPrintCopies * copies,
- gint * n_sheets,
- gint * first_label,
- gint * last_label);
+void gl_wdgt_print_copies_set_range (glWdgtPrintCopies *copies,
+ gint n_sheets,
+ gint first_label,
+ gint last_label);
-extern void gl_wdgt_print_copies_set_range (glWdgtPrintCopies * copies,
- gint n_sheets,
- gint first_label,
- gint last_label);
+G_END_DECLS
#endif
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_wdgt_print_merge_get_type (void)
{
- static guint wdgt_print_merge_type = 0;
+ static GType type = 0;
- if (!wdgt_print_merge_type) {
- GTypeInfo wdgt_print_merge_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWdgtPrintMergeClass),
NULL,
NULL,
sizeof (glWdgtPrintMerge),
0,
(GInstanceInitFunc) gl_wdgt_print_merge_instance_init,
+ NULL
};
- wdgt_print_merge_type =
- g_type_register_static (gl_hig_hbox_get_type (),
- "glWdgtPrintMerge",
- &wdgt_print_merge_info, 0);
+ type = g_type_register_static (GL_TYPE_HIG_HBOX,
+ "glWdgtPrintMerge", &info, 0);
}
- return wdgt_print_merge_type;
+ return type;
}
static void
#include "label.h"
#include "hig.h"
+G_BEGIN_DECLS
+
#define GL_TYPE_WDGT_PRINT_MERGE (gl_wdgt_print_merge_get_type ())
#define GL_WDGT_PRINT_MERGE(obj) \
(GTK_CHECK_CAST((obj), GL_TYPE_WDGT_PRINT_MERGE, glWdgtPrintMerge ))
glHigHBoxClass parent_class;
};
-extern guint gl_wdgt_print_merge_get_type (void);
+GType gl_wdgt_print_merge_get_type (void) G_GNUC_CONST;
+
+GtkWidget *gl_wdgt_print_merge_new (glLabel *label);
-extern GtkWidget *gl_wdgt_print_merge_new (glLabel * label);
+void gl_wdgt_print_merge_get_copies (glWdgtPrintMerge *merge,
+ gint *n_copies,
+ gint *first_label,
+ gboolean *collate_flag);
-extern void gl_wdgt_print_merge_get_copies (glWdgtPrintMerge * merge,
- gint * n_copies,
- gint * first_label,
- gboolean * collate_flag);
+void gl_wdgt_print_merge_set_copies (glWdgtPrintMerge *merge,
+ gint n_copies,
+ gint first_label,
+ gint n_records,
+ gboolean collate_flag);
-extern void gl_wdgt_print_merge_set_copies (glWdgtPrintMerge * merge,
- gint n_copies,
- gint first_label,
- gint n_records,
- gboolean collate_flag);
+G_END_DECLS
#endif
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_wdgt_rotate_label_get_type (void)
{
- static guint wdgt_rotate_label_type = 0;
+ static GType type = 0;
- if (!wdgt_rotate_label_type) {
- GTypeInfo wdgt_rotate_label_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWdgtRotateLabelClass),
NULL,
NULL,
sizeof (glWdgtRotateLabel),
0,
(GInstanceInitFunc) gl_wdgt_rotate_label_instance_init,
-
+ NULL
};
- wdgt_rotate_label_type =
- g_type_register_static (gl_hig_hbox_get_type (),
- "glWdgtRotateLabel",
- &wdgt_rotate_label_info, 0);
+ type = g_type_register_static (GL_TYPE_HIG_HBOX,
+ "glWdgtRotateLabel", &info, 0);
}
- return wdgt_rotate_label_type;
+ return type;
}
static void
#include "hig.h"
#include <libglabels/template.h>
+G_BEGIN_DECLS
+
#define GL_TYPE_WDGT_ROTATE_LABEL (gl_wdgt_rotate_label_get_type ())
#define GL_WDGT_ROTATE_LABEL(obj) \
(GTK_CHECK_CAST((obj), GL_TYPE_WDGT_ROTATE_LABEL, glWdgtRotateLabel ))
gpointer user_data);
};
-extern guint gl_wdgt_rotate_label_get_type (void);
+GType gl_wdgt_rotate_label_get_type (void) G_GNUC_CONST;
+
+GtkWidget *gl_wdgt_rotate_label_new (void);
-extern GtkWidget *gl_wdgt_rotate_label_new (void);
+gboolean gl_wdgt_rotate_label_get_state (glWdgtRotateLabel *wdgt_rotate_label);
-extern gboolean gl_wdgt_rotate_label_get_state (glWdgtRotateLabel * wdgt_rotate_label);
+void gl_wdgt_rotate_label_set_state (glWdgtRotateLabel *wdgt_rotate_label,
+ gboolean state);
-extern void gl_wdgt_rotate_label_set_state (glWdgtRotateLabel * wdgt_rotate_label,
- gboolean state);
+void gl_wdgt_rotate_label_set_template_name (glWdgtRotateLabel *wdgt_rotate_label,
+ gchar *name);
-extern void gl_wdgt_rotate_label_set_template_name (glWdgtRotateLabel * wdgt_rotate_label,
- gchar * name);
+G_END_DECLS
#endif
#include "util.h"
#include "xml-label.h"
#include "prefs.h"
+#include "file.h"
#include "debug.h"
/****************************************************************************/
/* Boilerplate Object stuff. */
/****************************************************************************/
-guint
+GType
gl_window_get_type (void)
{
- static guint window_type = 0;
+ static GType type = 0;
- if (!window_type) {
- GTypeInfo window_info = {
+ if (!type) {
+ static const GTypeInfo info = {
sizeof (glWindowClass),
NULL,
NULL,
sizeof (glWindow),
0,
(GInstanceInitFunc) gl_window_init,
+ NULL
};
- window_type =
- g_type_register_static (bonobo_window_get_type (),
- "glWindow",
- &window_info, 0);
+ type = g_type_register_static (BONOBO_TYPE_WINDOW,
+ "glWindow", &info, 0);
}
- return window_type;
+ return type;
}
static void
BonoboWindowClass parent_class;
};
-guint gl_window_get_type (void);
+GType gl_window_get_type (void) G_GNUC_CONST;
GtkWidget *gl_window_new (void);
projects / glabels / commitdiff