isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced deprecated symbols in metacity-window-demo.c

Browse Source 
-Replaced calls to gtk_toolbar_insert_stock with gtk_toolbar_insert
-Created appropriate GtkToolButton items
This commit is contained in:
Luis Torres 2009-06-19 00:36:23 +02:00 committed by Thomas Thurman
parent 1a92fa788d
commit 066c870271
1 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/tools/metacity-window-demo.c
View File

@ -826,6 +826,7 @@ do_appwindow (void)
GtkAccelGroup *accel_group; GtkAccelGroup *accel_group;
GtkItemFactory *item_factory; GtkItemFactory *item_factory;
/* Create the toplevel window /* Create the toplevel window
*/ */
@ -905,45 +906,62 @@ do_appwindow (void)
*/ */
toolbar = gtk_toolbar_new (); toolbar = gtk_toolbar_new ();
gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), GtkToolItem *newButton = gtk_tool_button_new_from_stock(GTK_STOCK_NEW);
GTK_STOCK_NEW, gtk_tool_item_set_tooltip_text(newButton,
"Open another one of these windows", "Open another one of these windows");
NULL, g_signal_connect(G_OBJECT(newButton),
"clicked",
G_CALLBACK(do_appwindow), G_CALLBACK(do_appwindow),
window, /* user data for callback */ window);
-1); /* -1 means "append" */ gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
newButton,
-1); /*-1 means append to end of toolbar*/
gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
GTK_STOCK_OPEN, GtkToolItem *lockButton = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN);
"This is a demo button that locks up the demo", gtk_tool_item_set_tooltip_text(lockButton,
NULL, "This is a demo button that locks up the demo");
g_signal_connect(G_OBJECT(lockButton),
"clicked",
G_CALLBACK(sleep_cb), G_CALLBACK(sleep_cb),
window, /* user data for callback */ window);
-1); /* -1 means "append" */ gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
lockButton,
-1); /*-1 means append to end of toolbar*/
gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
GTK_STOCK_OPEN, GtkToolItem *decoButton = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN);
"This is a demo button that toggles window decorations", gtk_tool_item_set_tooltip_text(decoButton,
NULL, "This is a demo button that toggles window decorations");
g_signal_connect(G_OBJECT(decoButton),
"clicked",
G_CALLBACK(toggle_decorated_cb), G_CALLBACK(toggle_decorated_cb),
window, /* user data for callback */ window);
-1); /* -1 means "append" */ gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
decoButton,
-1); /*-1 means append to end of toolbar*/
gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), GtkToolItem *lockRatioButton = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN);
GTK_STOCK_OPEN, gtk_tool_item_set_tooltip_text(lockRatioButton,
"This is a demo button that locks the aspect ratio using a hint", "This is a demo button that locks the aspect ratio using a hint");
NULL, g_signal_connect(G_OBJECT(lockRatioButton),
"clicked",
G_CALLBACK(toggle_aspect_ratio), G_CALLBACK(toggle_aspect_ratio),
contents, /* user data for callback */ window);
-1); /* -1 means "append" */ gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
lockRatioButton,
-1); /*-1 means append to end of toolbar*/
gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), GtkToolItem *quitButton = gtk_tool_button_new_from_stock(GTK_STOCK_QUIT);
GTK_STOCK_QUIT, gtk_tool_item_set_tooltip_text(quitButton,
"This is a demo button with a 'quit' icon", "This is a demo button with a 'quit' icon");
NULL, g_signal_connect(G_OBJECT(quitButton),
"clicked",
G_CALLBACK(clicked_toolbar_cb), G_CALLBACK(clicked_toolbar_cb),
window, /* user data for callback */ window);
-1); /* -1 means "append" */ gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
quitButton,
-1); /*-1 means append to end of toolbar*/
handlebox = gtk_handle_box_new (); handlebox = gtk_handle_box_new ();