diff options
| author | Michal Ratajsky <[email protected]> | 2014-07-18 17:55:53 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-10-09 16:53:00 +0200 |
| commit | 0c558fac14266f8c18cfb8bc1d4669ed35868c2f (patch) | |
| tree | fb7479547b7c1032b13a1adc0f33e9c71861251a /mate-volume-control/src/gvc-combo-box.h | |
| parent | 25445eb4cb2d7b49bc435113056587f83b742104 (diff) | |
| download | mate-media-0c558fac14266f8c18cfb8bc1d4669ed35868c2f.tar.bz2 mate-media-0c558fac14266f8c18cfb8bc1d4669ed35868c2f.tar.xz | |
More porting work along with fixes and cleanups
Diffstat (limited to 'mate-volume-control/src/gvc-combo-box.h')
| -rw-r--r-- | mate-volume-control/src/gvc-combo-box.h | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/mate-volume-control/src/gvc-combo-box.h b/mate-volume-control/src/gvc-combo-box.h index ee18ff8..4cd8511 100644 --- a/mate-volume-control/src/gvc-combo-box.h +++ b/mate-volume-control/src/gvc-combo-box.h @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2014 Michal Ratajsky <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +22,9 @@ #ifndef __GVC_COMBO_BOX_H #define __GVC_COMBO_BOX_H +#include <glib.h> #include <glib-object.h> +#include <gtk/gtk.h> G_BEGIN_DECLS @@ -32,43 +35,46 @@ G_BEGIN_DECLS #define GVC_IS_COMBO_BOX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_COMBO_BOX)) #define GVC_COMBO_BOX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_COMBO_BOX, GvcComboBoxClass)) -typedef struct GvcComboBoxPrivate GvcComboBoxPrivate; +typedef struct _GvcComboBox GvcComboBox; +typedef struct _GvcComboBoxClass GvcComboBoxClass; +typedef struct _GvcComboBoxPrivate GvcComboBoxPrivate; -typedef struct +struct _GvcComboBox { #if GTK_CHECK_VERSION (3, 0, 0) - GtkBox parent; + GtkBox parent; #else - GtkHBox parent; + GtkHBox parent; #endif - GvcComboBoxPrivate *priv; -} GvcComboBox; + GvcComboBoxPrivate *priv; +}; -typedef struct +struct _GvcComboBoxClass { #if GTK_CHECK_VERSION (3, 0, 0) GtkBoxClass parent_class; #else GtkHBoxClass parent_class; #endif - void (* changed) (GvcComboBox *combobox, const char *name); + void (* changed) (GvcComboBox *combobox, + const gchar *name); void (* button_clicked) (GvcComboBox *combobox); -} GvcComboBoxClass; +}; -GType gvc_combo_box_get_type (void); +GType gvc_combo_box_get_type (void) G_GNUC_CONST; -GtkWidget * gvc_combo_box_new (const char *label); +GtkWidget * gvc_combo_box_new (const gchar *label); -void gvc_combo_box_set_size_group (GvcComboBox *combo_box, +void gvc_combo_box_set_size_group (GvcComboBox *combobox, GtkSizeGroup *group, gboolean symmetric); -void gvc_combo_box_set_profiles (GvcComboBox *combo_box, +void gvc_combo_box_set_profiles (GvcComboBox *combobox, const GList *profiles); -void gvc_combo_box_set_ports (GvcComboBox *combo_box, +void gvc_combo_box_set_ports (GvcComboBox *combobox, const GList *ports); -void gvc_combo_box_set_active (GvcComboBox *combo_box, - const char *id); +void gvc_combo_box_set_active (GvcComboBox *combobox, + const gchar *id); G_END_DECLS |