diff options
| author | jstebbins <[email protected]> | 2011-03-22 00:57:01 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-03-22 00:57:01 +0000 |
| commit | 8db28e9250ffaee1b6b8c1d7e60aeee9b9466dba (patch) | |
| tree | 26e02b232b16aca834417fd1259e43843dc9c334 | |
| parent | ec038a5c5fa7adf12aea215465c0434a816e57b3 (diff) | |
LinGui: remove use of deprecated GTK_WIDGET_TYPE and GTK_OBJECT_TYPE macros
replace with G_OBJECT_TYPE
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3860 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | gtk/src/callbacks.c | 2 | ||||
| -rw-r--r-- | gtk/src/ghbcompositor.c | 2 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 2 | ||||
| -rw-r--r-- | gtk/src/settings.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index a2854dcad..8009b3610 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -205,7 +205,7 @@ ghb_check_dependency( if (widget != NULL) { - type = GTK_WIDGET_TYPE(widget); + type = G_OBJECT_TYPE(widget); if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY) if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return; name = ghb_get_setting_key(widget); diff --git a/gtk/src/ghbcompositor.c b/gtk/src/ghbcompositor.c index d1517340c..8bc455b9e 100644 --- a/gtk/src/ghbcompositor.c +++ b/gtk/src/ghbcompositor.c @@ -291,7 +291,7 @@ showtype(const gchar *msg, GtkWidget *widget) GType type; gchar *str; - type = GTK_WIDGET_TYPE(widget); + type = G_OBJECT_TYPE(widget); if (type == GTK_TYPE_DRAWING_AREA) str = "drawing area"; else if (type == GTK_TYPE_ALIGNMENT) diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index b4ff3e8d2..941d8272c 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -1644,7 +1644,7 @@ init_combo_box(GtkBuilder *builder, const gchar *name) G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_STRING); gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store)); - if (GTK_WIDGET_TYPE(combo) == GTK_TYPE_COMBO_BOX) + if (G_OBJECT_TYPE(combo) == GTK_TYPE_COMBO_BOX) { gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo)); cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new()); diff --git a/gtk/src/settings.c b/gtk/src/settings.c index afe41803c..46e2de941 100644 --- a/gtk/src/settings.c +++ b/gtk/src/settings.c @@ -210,7 +210,7 @@ ghb_widget_value(GtkWidget *widget) return NULL; } - type = GTK_WIDGET_TYPE(widget); + type = G_OBJECT_TYPE(widget); name = ghb_get_setting_key(widget); g_debug("ghb_widget_value widget (%s)\n", name); if (type == GTK_TYPE_ENTRY) @@ -494,7 +494,7 @@ update_widget(GtkWidget *widget, const GValue *value) str = ghb_value_string(value); ival = ghb_value_int(value); dval = ghb_value_double(value); - type = GTK_OBJECT_TYPE(widget); + type = G_OBJECT_TYPE(widget); if (type == GTK_TYPE_ENTRY) { g_debug("entry"); |