From d7f0eeafe11369f20f001e43570a58a712af83f2 Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Fri, 5 Sep 2014 06:12:23 +0000 Subject: Removed some warnings by using gtk_widget_get_preferred_size() instead of the deprecated gtk_widget_size_request(). git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@399 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a --- ChangeLog | 10 ++++++++++ src/gtkext/graph/node.c | 4 ++-- src/gtkext/graph/nodes/flow.c | 2 +- src/gui/panels/glance.c | 2 +- src/gui/panels/panel.c | 2 +- src/gui/panels/symbols.c | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3277a53..b66fd31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +14-09-05 Cyrille Bagard + + * src/gtkext/graph/node.c: + * src/gtkext/graph/nodes/flow.c: + * src/gui/panels/glance.c: + * src/gui/panels/panel.c: + * src/gui/panels/symbols.c: + Remove some warnings by using gtk_widget_get_preferred_size() instead of + the deprecated gtk_widget_size_request(). + 14-09-04 Cyrille Bagard * src/arch/vmpa.c: diff --git a/src/gtkext/graph/node.c b/src/gtkext/graph/node.c index 92d3b8c..f286457 100644 --- a/src/gtkext/graph/node.c +++ b/src/gtkext/graph/node.c @@ -598,7 +598,7 @@ char *g_graph_node_register_for_dot(const GGraphNode *node, char *cmds, unsigned unsigned int i; /* Boucle de parcours */ char buffer[NODE_DESC_LEN]; /* Tampon pour les commandes */ - gtk_widget_size_request(node->view, &requisition); + gtk_widget_get_preferred_size(node->view, NULL, &requisition); for (i = 0; i < level; i++) cmds = stradd(cmds, DOT_IDENT); @@ -656,7 +656,7 @@ void g_graph_node_place_old(GGraphNode *node, GtkGraphView *view, gint x, gint y { GtkRequisition requisition; /* Taille à l'écran actuelle */ - gtk_widget_size_request(node->view, &requisition); + gtk_widget_get_preferred_size(node->view, NULL, &requisition); x -= requisition.width / 2; y -= requisition.height / 2; diff --git a/src/gtkext/graph/nodes/flow.c b/src/gtkext/graph/nodes/flow.c index 71d6e41..7ebaf78 100644 --- a/src/gtkext/graph/nodes/flow.c +++ b/src/gtkext/graph/nodes/flow.c @@ -242,7 +242,7 @@ GGraphNode *g_flow_node_new(GFlowBlock *block, GtkBufferView *view) result->block = block; result->view = view; - gtk_widget_size_request(GTK_WIDGET(result->view), &requisition); + gtk_widget_get_preferred_size(GTK_WIDGET(result->view), NULL, &requisition); G_GRAPH_NODE(result)->alloc.width = requisition.width; G_GRAPH_NODE(result)->alloc.height = requisition.height; diff --git a/src/gui/panels/glance.c b/src/gui/panels/glance.c index 97d57d1..89acf5c 100644 --- a/src/gui/panels/glance.c +++ b/src/gui/panels/glance.c @@ -397,7 +397,7 @@ static void on_view_scroll_setup(GtkAdjustment *adj, GGlancePanel *panel) on_view_scrolled(adj, panel); - gtk_widget_size_request(GTK_WIDGET(panel->view), &panel->req); + gtk_widget_get_preferred_size(GTK_WIDGET(panel->view), NULL, &panel->req); update_glance_panel_for_view_content(panel, panel->view); diff --git a/src/gui/panels/panel.c b/src/gui/panels/panel.c index 06be865..41d3b0a 100644 --- a/src/gui/panels/panel.c +++ b/src/gui/panels/panel.c @@ -895,7 +895,7 @@ static void get_panel_node_size_request(const panel_node *node, GtkRequisition * GtkRequisition tmp; /* Stockage temporaire */ if (node->simple) - gtk_widget_size_request(node->station, req); + gtk_widget_get_preferred_size(node->station, NULL, req); else { diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c index 4f92f1c..c106881 100644 --- a/src/gui/panels/symbols.c +++ b/src/gui/panels/symbols.c @@ -608,7 +608,7 @@ static void change_symbols_panel_current_binary(GSymbolsPanel *panel, GLoadedBin reorganize_symbols_tree_view(NULL, G_OBJECT(G_EDITOR_ITEM(panel)->widget)); } - gtk_widget_size_request(GTK_WIDGET(panel->treeview), &req); + gtk_widget_get_preferred_size(GTK_WIDGET(panel->treeview), NULL, &req); gtk_widget_set_size_request(GTK_WIDGET(panel->treeview), req.width, req.height); } -- cgit v0.11.2-87-g4458