+2008-05-05 Michael Natterer <mitch@imendio.com>
+
+ * gtk/gtkcellrenderercombo.h
+ * gtk/gtkcellrendererspin.h
+ * gtk/gtkfilechooserbutton.h: style cleanups for the sake of
+ consistency.
+
+ * gtk/gtkfilechooserdialog.h
+ * gtk/gtkfilechooserwidget.h
+ * gtk/gtkscalebutton.h: reorder instance and class structs to be
+ in canonical order.
+
2008-05-04 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkkeys-quartz.c (maybe_update_keymap): Check if
* Boston, MA 02111-1307, USA.
*/
-
#ifndef __GTK_CELL_RENDERER_COMBO_H__
#define __GTK_CELL_RENDERER_COMBO_H__
#define GTK_IS_CELL_RENDERER_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_COMBO))
#define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
#define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
-
-typedef struct _GtkCellRendererCombo GtkCellRendererCombo;
+
+typedef struct _GtkCellRendererCombo GtkCellRendererCombo;
typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
struct _GtkCellRendererCombo
GtkTreeModel *model;
gint text_column;
gboolean has_entry;
-
+
/*< private >*/
guint focus_out_id;
};
G_END_DECLS
-#endif
+#endif /* __GTK_CELL_RENDERER_COMBO_H__ */
* Boston, MA 02111-1307, USA.
*/
-
#ifndef __GTK_CELL_RENDERER_SPIN_H__
#define __GTK_CELL_RENDERER_SPIN_H__
#define GTK_IS_CELL_RENDERER_SPIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_SPIN))
#define GTK_IS_CELL_RENDERER_SPIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_SPIN))
#define GTK_CELL_RENDERER_SPIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererTextClass))
-
-typedef struct _GtkCellRendererSpin GtkCellRendererSpin;
-typedef struct _GtkCellRendererSpinClass GtkCellRendererSpinClass;
+
+typedef struct _GtkCellRendererSpin GtkCellRendererSpin;
+typedef struct _GtkCellRendererSpinClass GtkCellRendererSpinClass;
typedef struct _GtkCellRendererSpinPrivate GtkCellRendererSpinPrivate;
struct _GtkCellRendererSpin
/* GTK+: gtkfilechooserbutton.h
- *
+ *
* Copyright (c) 2004 James M. Cape <jcape@ignore-your.tv>
*
* This library is free software; you can redistribute it and/or
G_BEGIN_DECLS
+#define GTK_TYPE_FILE_CHOOSER_BUTTON (gtk_file_chooser_button_get_type ())
+#define GTK_FILE_CHOOSER_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButton))
+#define GTK_FILE_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
+#define GTK_IS_FILE_CHOOSER_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER_BUTTON))
+#define GTK_IS_FILE_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON))
+#define GTK_FILE_CHOOSER_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-#define GTK_TYPE_FILE_CHOOSER_BUTTON \
- (gtk_file_chooser_button_get_type ())
-#define GTK_FILE_CHOOSER_BUTTON(object) \
- (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButton))
-#define GTK_FILE_CHOOSER_BUTTON_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-#define GTK_IS_FILE_CHOOSER_BUTTON(object) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_FILE_CHOOSER_BUTTON))
-#define GTK_IS_FILE_CHOOSER_BUTTON_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_BUTTON))
-#define GTK_FILE_CHOOSER_BUTTON_GET_CLASS(object) \
- (G_TYPE_INSTANCE_GET_CLASS ((object), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonClass))
-
-
-typedef struct _GtkFileChooserButton GtkFileChooserButton;
+typedef struct _GtkFileChooserButton GtkFileChooserButton;
typedef struct _GtkFileChooserButtonPrivate GtkFileChooserButtonPrivate;
-typedef struct _GtkFileChooserButtonClass GtkFileChooserButtonClass;
+typedef struct _GtkFileChooserButtonClass GtkFileChooserButtonClass;
struct _GtkFileChooserButton
{
#define GTK_IS_FILE_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_DIALOG))
#define GTK_FILE_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogClass))
-typedef struct _GtkFileChooserDialog GtkFileChooserDialog;
-typedef struct _GtkFileChooserDialogClass GtkFileChooserDialogClass;
-
+typedef struct _GtkFileChooserDialog GtkFileChooserDialog;
typedef struct _GtkFileChooserDialogPrivate GtkFileChooserDialogPrivate;
-
-struct _GtkFileChooserDialogClass
-{
- GtkDialogClass parent_class;
-};
+typedef struct _GtkFileChooserDialogClass GtkFileChooserDialogClass;
struct _GtkFileChooserDialog
{
GtkFileChooserDialogPrivate *priv;
};
+struct _GtkFileChooserDialogClass
+{
+ GtkDialogClass parent_class;
+};
+
GType gtk_file_chooser_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_file_chooser_dialog_new (const gchar *title,
GtkWindow *parent,
#define GTK_IS_FILE_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_WIDGET))
#define GTK_FILE_CHOOSER_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_WIDGET, GtkFileChooserWidgetClass))
-typedef struct _GtkFileChooserWidget GtkFileChooserWidget;
-typedef struct _GtkFileChooserWidgetClass GtkFileChooserWidgetClass;
-
+typedef struct _GtkFileChooserWidget GtkFileChooserWidget;
typedef struct _GtkFileChooserWidgetPrivate GtkFileChooserWidgetPrivate;
-
-struct _GtkFileChooserWidgetClass
-{
- GtkVBoxClass parent_class;
-};
+typedef struct _GtkFileChooserWidgetClass GtkFileChooserWidgetClass;
struct _GtkFileChooserWidget
{
GtkFileChooserWidgetPrivate *priv;
};
+struct _GtkFileChooserWidgetClass
+{
+ GtkVBoxClass parent_class;
+};
+
GType gtk_file_chooser_widget_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_file_chooser_widget_new (GtkFileChooserAction action);
GtkWidget *gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction action,
* Modified by the GTK+ Team and others 2007. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_SCALE_BUTTON_H__
typedef struct _GtkScaleButtonClass GtkScaleButtonClass;
typedef struct _GtkScaleButtonPrivate GtkScaleButtonPrivate;
+struct _GtkScaleButton
+{
+ GtkButton parent;
+
+ GtkWidget *plus_button;
+ GtkWidget *minus_button;
+
+ /*< private >*/
+ GtkScaleButtonPrivate *priv;
+};
+
struct _GtkScaleButtonClass
{
GtkButtonClass parent_class;
/* signals */
- void (* value_changed) (GtkScaleButton *button, gdouble value);
+ void (* value_changed) (GtkScaleButton *button,
+ gdouble value);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved4) (void);
};
-struct _GtkScaleButton
-{
- GtkButton parent;
-
- GtkWidget *plus_button;
- GtkWidget *minus_button;
-
- /*< private >*/
- GtkScaleButtonPrivate *priv;
-};
-
GType gtk_scale_button_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_scale_button_new (GtkIconSize size,
gdouble min,
G_END_DECLS
#endif /* __GTK_SCALE_BUTTON_H__ */
-