From b04c37a7641b474ca066627da27d42e6134c4e17 Mon Sep 17 00:00:00 2001 From: infirit Date: Mon, 14 Sep 2015 19:07:06 +0200 Subject: Remove deprecated GTK+ symbols and use accessor functions Direct struct access has been deprecated, so use the appropriate replacements to build with GSEAL enabled. --- src/tools/marco-window-demo.c | 344 ++++++++++++++++++++++-------------------- 1 file changed, 178 insertions(+), 166 deletions(-) (limited to 'src/tools') diff --git a/src/tools/marco-window-demo.c b/src/tools/marco-window-demo.c index 1585b385..edff5f71 100644 --- a/src/tools/marco-window-demo.c +++ b/src/tools/marco-window-demo.c @@ -74,19 +74,22 @@ static void on_realize_set_struts (GtkWindow *window, gpointer data) { + GtkWidget *widget; int left; int right; int top; int bottom; - g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); + widget = GTK_WIDGET (window); + + g_return_if_fail (gtk_widget_get_realized (widget)); left = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-left")); right = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-right")); top = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-top")); bottom = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-bottom")); - set_gdk_window_struts (gtk_widget_get_window (GTK_WIDGET (window)), + set_gdk_window_struts (gtk_widget_get_window (widget), left, right, top, bottom); } @@ -97,6 +100,10 @@ set_gtk_window_struts (GtkWidget *window, int top, int bottom) { + GtkWidget *widget; + + widget = GTK_WIDGET (window); + g_object_set_data (G_OBJECT (window), "meta-strut-left", GINT_TO_POINTER (left)); g_object_set_data (G_OBJECT (window), "meta-strut-right", @@ -115,8 +122,8 @@ set_gtk_window_struts (GtkWidget *window, G_CALLBACK (on_realize_set_struts), NULL); - if (gtk_widget_get_realized (GTK_WIDGET (window))) - set_gdk_window_struts (gtk_widget_get_window (GTK_WIDGET (window)), + if (gtk_widget_get_realized (widget)) + set_gdk_window_struts (gtk_widget_get_window (widget), left, right, top, bottom); } @@ -157,6 +164,10 @@ static void set_gtk_window_type (GtkWindow *window, const char *type) { + GtkWidget *widget; + + widget = GTK_WIDGET (window); + g_object_set_data (G_OBJECT (window), "meta-window-type", (char*) type); g_signal_handlers_disconnect_by_func (G_OBJECT (window), @@ -168,8 +179,8 @@ set_gtk_window_type (GtkWindow *window, G_CALLBACK (on_realize_set_type), NULL); - if (gtk_widget_get_realized (GTK_WIDGET (window))) - set_gdk_window_type (gtk_widget_get_window (GTK_WIDGET (window)), + if (gtk_widget_get_realized (widget)) + set_gdk_window_type (gtk_widget_get_window (widget), type); } @@ -183,14 +194,22 @@ static void on_realize_set_border_only (GtkWindow *window, gpointer data) { - g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); + GtkWidget *widget; + + widget = GTK_WIDGET (window); - set_gdk_window_border_only (gtk_widget_get_window (GTK_WIDGET (window))); + g_return_if_fail (gtk_widget_get_realized (widget)); + + set_gdk_window_border_only (gtk_widget_get_window (widget)); } static void set_gtk_window_border_only (GtkWindow *window) { +GtkWidget *widget; + + widget = GTK_WIDGET (window); + g_signal_handlers_disconnect_by_func (G_OBJECT (window), on_realize_set_border_only, NULL); @@ -200,8 +219,8 @@ set_gtk_window_border_only (GtkWindow *window) G_CALLBACK (on_realize_set_border_only), NULL); - if (gtk_widget_get_realized (GTK_WIDGET (window))) - set_gdk_window_border_only (gtk_widget_get_window (GTK_WIDGET (window))); + if (gtk_widget_get_realized (widget)) + set_gdk_window_border_only (gtk_widget_get_window (widget)); } int @@ -307,9 +326,8 @@ dialog_cb (GSimpleAction *action, gpointer callback_data) #else static void -dialog_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +dialog_cb (GtkAction *action, + gpointer callback_data) #endif { make_dialog (GTK_WIDGET (callback_data), 1); @@ -322,9 +340,8 @@ modal_dialog_cb (GSimpleAction *action, gpointer callback_data) #else static void -modal_dialog_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +modal_dialog_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *dialog; @@ -349,9 +366,8 @@ no_parent_dialog_cb (GSimpleAction *action, gpointer callback_data) #else static void -no_parent_dialog_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +no_parent_dialog_cb (GtkAction *action, + gpointer callback_data) #endif { make_dialog (NULL, 1); @@ -364,9 +380,8 @@ utility_cb (GSimpleAction *action, gpointer callback_data) #else static void -utility_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +utility_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -405,9 +420,8 @@ toolbar_cb (GSimpleAction *action, gpointer callback_data) #else static void -toolbar_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +toolbar_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -437,9 +451,8 @@ menu_cb (GSimpleAction *action, gpointer callback_data) #else static void -menu_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +menu_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -469,9 +482,8 @@ override_redirect_cb (GSimpleAction *action, gpointer callback_data) #else static void -override_redirect_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +override_redirect_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -498,9 +510,8 @@ border_only_cb (GSimpleAction *action, gpointer callback_data) #else static void -border_only_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +border_only_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -575,9 +586,8 @@ splashscreen_cb (GSimpleAction *action, gpointer callback_data) #else static void -splashscreen_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +splashscreen_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -691,15 +701,14 @@ dock_cb (GSimpleAction *action, gpointer callback_data) #else static void -dock_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +dock_cb (GtkAction *action, + gpointer callback_data) #endif { -#if GTK_CHECK_VERSION (3, 0, 0) guint callback_action; const gchar *name; +#if GTK_CHECK_VERSION (3, 0, 0) g_object_get (G_OBJECT (action), "name", &name, NULL); if (!g_strcmp0 (name, "top-dock")) @@ -714,6 +723,21 @@ dock_cb (gpointer callback_data, callback_action = DOCK_ALL; else return; +#else + name = gtk_action_get_name (action); + + if (!g_strcmp0 (name, "Top dock")) + callback_action = DOCK_TOP; + else if (!g_strcmp0 (name, "Bottom dock")) + callback_action = DOCK_BOTTOM; + else if (!g_strcmp0 (name, "Left dock")) + callback_action = DOCK_LEFT; + else if (!g_strcmp0 (name, "Right dock")) + callback_action = DOCK_RIGHT; + else if (!g_strcmp0 (name, "All docks")) + callback_action = DOCK_ALL; + else + return; #endif if (callback_action == DOCK_ALL) { @@ -735,9 +759,8 @@ desktop_cb (GSimpleAction *action, gpointer callback_data) #else static void -desktop_cb (gpointer callback_data, - guint callback_action, - GtkWidget *widget) +desktop_cb (GtkAction *action, + gpointer callback_data) #endif { GtkWidget *window; @@ -777,30 +800,6 @@ desktop_cb (gpointer callback_data, gtk_widget_show_all (window); } -#if !GTK_CHECK_VERSION(3, 0, 0) -static GtkItemFactoryEntry menu_items[] = -{ - { "/_Windows", NULL, NULL, 0, "" }, - { "/Windows/tearoff", NULL, NULL, 0, "" }, - { "/Windows/_Dialog", "d", dialog_cb, 0, NULL }, - { "/Windows/_Modal dialog", NULL, modal_dialog_cb, 0, NULL }, - { "/Windows/_Parentless dialog", NULL, no_parent_dialog_cb, 0, NULL }, - { "/Windows/_Utility", "u", utility_cb, 0, NULL }, - { "/Windows/_Splashscreen", "s", splashscreen_cb, 0, NULL }, - { "/Windows/_Top dock", NULL, dock_cb, DOCK_TOP, NULL }, - { "/Windows/_Bottom dock", NULL, dock_cb, DOCK_BOTTOM, NULL }, - { "/Windows/_Left dock", NULL, dock_cb, DOCK_LEFT, NULL }, - { "/Windows/_Right dock", NULL, dock_cb, DOCK_RIGHT, NULL }, - { "/Windows/_All docks", NULL, dock_cb, DOCK_ALL, NULL }, - { "/Windows/Des_ktop", NULL, desktop_cb, 0, NULL }, - { "/Windows/Me_nu", NULL, menu_cb, 0, NULL }, - { "/Windows/Tool_bar", NULL, toolbar_cb, 0, NULL }, - { "/Windows/Override Redirect", NULL, override_redirect_cb, 0, NULL }, - { "/Windows/Border Only", NULL, border_only_cb, 0, NULL } -}; - -#endif - #if GTK_CHECK_VERSION (3, 0, 0) static void sleep_cb (GSimpleAction *action, @@ -808,7 +807,7 @@ sleep_cb (GSimpleAction *action, gpointer data) #else static void -sleep_cb (GtkWidget *button, +sleep_cb (GtkAction *action, gpointer data) #endif { @@ -822,12 +821,13 @@ toggle_aspect_ratio (GSimpleAction *action, gpointer data) #else static void -toggle_aspect_ratio (GtkWidget *button, +toggle_aspect_ratio (GtkAction *action, gpointer data) #endif { GtkWidget *window; GdkGeometry geom; + GtkWidget *widget = GTK_WIDGET (data); if (aspect_on) { @@ -842,11 +842,7 @@ toggle_aspect_ratio (GtkWidget *button, aspect_on = !aspect_on; -#if GTK_CHECK_VERSION(3, 0, 0) - window = gtk_widget_get_ancestor (GTK_WIDGET(data), GTK_TYPE_WINDOW); -#else - window = gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW); -#endif + window = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW); if (window) gtk_window_set_geometry_hints (GTK_WINDOW (window), GTK_WIDGET (data), @@ -867,11 +863,7 @@ toggle_decorated_cb (GtkWidget *button, #endif { GtkWidget *window; -#if GTK_CHECK_VERSION (3, 0, 0) window = gtk_widget_get_ancestor (data, GTK_TYPE_WINDOW); -#else - window = gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW); -#endif if (window) gtk_window_set_decorated (GTK_WINDOW (window), !gtk_window_get_decorated (GTK_WINDOW (window))); @@ -1088,6 +1080,90 @@ create_toolbar (void) return toolbar; } +#else +static const gchar *menu_item_string = + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n"; + +static const GtkActionEntry menu_items[] = +{ + { "Windows", NULL, "_Windows", NULL, + NULL, NULL }, + { "Dialog", NULL, "_Dialog", "d", + NULL, G_CALLBACK (dialog_cb) }, + { "Modal dialog", NULL, "_Modal dialog", NULL, + NULL, G_CALLBACK (modal_dialog_cb) }, + { "Parentless dialog", NULL, "_Parentless dialog", NULL, + NULL, G_CALLBACK (no_parent_dialog_cb) }, + { "Utility", NULL, "_Utility", "u", + NULL, G_CALLBACK (utility_cb) }, + { "Splashscreen", NULL, "_Splashscreen", "s", + NULL, G_CALLBACK (splashscreen_cb) }, + { "Top dock", NULL, "_Top dock", NULL, + NULL, G_CALLBACK (dock_cb) }, + { "Bottom dock", NULL, "_Bottom dock", NULL, + NULL, G_CALLBACK (dock_cb) }, + { "Left dock", NULL, "_Left dock", NULL, + NULL, G_CALLBACK (dock_cb) }, + { "Right dock", NULL, "_Right dock", NULL, + NULL, G_CALLBACK (dock_cb) }, + { "All docks", NULL, "_All docks", NULL, + NULL, G_CALLBACK (dock_cb) }, + { "Desktop", NULL, "Des_ktop", NULL, + NULL, G_CALLBACK (desktop_cb) }, + { "Menu", NULL, "Me_nu", NULL, + NULL, G_CALLBACK (menu_cb) }, + { "Toolbar", NULL, "Tool_bar", NULL, + NULL, G_CALLBACK (toolbar_cb) }, + { "Override Redirect", NULL, "Override Redirect", NULL, + NULL, G_CALLBACK (override_redirect_cb) }, + { "Border Only", NULL, "Border Only", NULL, + NULL, G_CALLBACK (border_only_cb) } +}; + +static const GtkActionEntry tool_items[] = +{ + { "New", GTK_STOCK_NEW, NULL, NULL, + "Open another one of these windows", G_CALLBACK (do_appwindow) }, + { "Lock", GTK_STOCK_OPEN, NULL, NULL, + "This is a demo button that" + " locks up the demo", G_CALLBACK (sleep_cb) }, + { "Decorations", GTK_STOCK_OPEN, NULL, NULL, + "This is a demo button that " + "toggles window decorations", G_CALLBACK (toggle_decorated_cb) }, + { "Quit", GTK_STOCK_QUIT, NULL, NULL, + "This is a demo button with " + " a 'quit' icon", G_CALLBACK (clicked_toolbar_cb) }, + { "Ratio", GTK_STOCK_OPEN, NULL, NULL, + "This is a demo button that locks the aspect ratio " + "using a hint", G_CALLBACK (toggle_aspect_ratio) } +}; #endif #if GTK_CHECK_VERSION (3, 0, 0) @@ -1103,27 +1179,20 @@ do_appwindow (void) GtkWidget *window; #if GTK_CHECK_VERSION (3, 0, 0) GtkWidget *grid; + GtkWidget *toolbar; + GSimpleActionGroup *action_group; + GtkBuilder *builder; #else GtkWidget *table; -#endif - GtkWidget *toolbar; -#if !GTK_CHECK_VERSION (3, 0, 0) GtkWidget *handlebox; + GtkActionGroup *action_group; + GtkUIManager *ui_manager; #endif GtkWidget *statusbar; GtkWidget *contents; GtkWidget *sw; GtkTextBuffer *buffer; - #if GTK_CHECK_VERSION(3, 0, 0) - GSimpleActionGroup *action_group; - GtkBuilder *builder; - #else - GtkAccelGroup *accel_group; - GtkItemFactory *item_factory; - #endif - - /* Create the toplevel window */ @@ -1179,27 +1248,27 @@ do_appwindow (void) /* Create the menubar */ - accel_group = gtk_accel_group_new (); - gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); - g_object_unref (accel_group); + contents = gtk_text_view_new (); + + action_group = gtk_action_group_new ("mainmenu"); + gtk_action_group_add_actions (action_group, + menu_items, + G_N_ELEMENTS (menu_items), + window); + gtk_action_group_add_actions (action_group, + tool_items, + G_N_ELEMENTS (tool_items), + window); - item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "
", accel_group); + ui_manager = gtk_ui_manager_new (); - /* Set up item factory to go away with the window */ - g_object_ref (item_factory); - g_object_ref_sink (item_factory); - g_object_unref (item_factory); - g_object_set_data_full (G_OBJECT (window), - "
", - item_factory, - (GDestroyNotify) g_object_unref); + gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); /* create menu items */ - gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items), - menu_items, window); + gtk_ui_manager_add_ui_from_string (ui_manager, menu_item_string, -1, NULL); gtk_table_attach (GTK_TABLE (table), - gtk_item_factory_get_widget (item_factory, "
"), + gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"), /* X direction */ /* Y direction */ 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, 0, @@ -1237,7 +1306,6 @@ do_appwindow (void) gtk_window_set_default_size (GTK_WINDOW (window), 200, 200); - contents = gtk_text_view_new (); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (contents), PANGO_WRAP_WORD); @@ -1247,68 +1315,11 @@ do_appwindow (void) #if !GTK_CHECK_VERSION (3, 0, 0) /* Create the toolbar */ - toolbar = gtk_toolbar_new (); - - GtkToolItem *newButton = gtk_tool_button_new_from_stock(GTK_STOCK_NEW); - gtk_tool_item_set_tooltip_text(newButton, - "Open another one of these windows"); - g_signal_connect(G_OBJECT(newButton), - "clicked", - G_CALLBACK(do_appwindow), - window); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), - newButton, - -1); /*-1 means append to end of toolbar*/ - - - GtkToolItem *lockButton = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN); - gtk_tool_item_set_tooltip_text(lockButton, - "This is a demo button that locks up the demo"); - g_signal_connect(G_OBJECT(lockButton), - "clicked", - G_CALLBACK(sleep_cb), - window); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), - lockButton, - -1); /*-1 means append to end of toolbar*/ - - - GtkToolItem *decoButton = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN); - gtk_tool_item_set_tooltip_text(decoButton, - "This is a demo button that toggles window decorations"); - g_signal_connect(G_OBJECT(decoButton), - "clicked", - G_CALLBACK(toggle_decorated_cb), - window); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), - decoButton, - -1); /*-1 means append to end of toolbar*/ - - GtkToolItem *lockRatioButton = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN); - gtk_tool_item_set_tooltip_text(lockRatioButton, - "This is a demo button that locks the aspect ratio using a hint"); - g_signal_connect(G_OBJECT(lockRatioButton), - "clicked", - G_CALLBACK(toggle_aspect_ratio), - window); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), - lockRatioButton, - -1); /*-1 means append to end of toolbar*/ - - GtkToolItem *quitButton = gtk_tool_button_new_from_stock(GTK_STOCK_QUIT); - gtk_tool_item_set_tooltip_text(quitButton, - "This is a demo button with a 'quit' icon"); - g_signal_connect(G_OBJECT(quitButton), - "clicked", - G_CALLBACK(clicked_toolbar_cb), - window); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), - quitButton, - -1); /*-1 means append to end of toolbar*/ handlebox = gtk_handle_box_new (); - gtk_container_add (GTK_CONTAINER (handlebox), toolbar); + gtk_container_add (GTK_CONTAINER (handlebox), + gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar")); gtk_table_attach (GTK_TABLE (table), handlebox, @@ -1362,6 +1373,7 @@ do_appwindow (void) g_object_unref (action_group); g_object_unref (builder); #else + g_object_unref (ui_manager); return window; #endif } -- cgit v1.2.1