[metacity] Fix some deprecated warnings Again most fixes are copied from mutter.
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] Fix some deprecated warnings Again most fixes are copied from mutter.
- Date: Tue, 3 Jun 2014 17:22:19 +0000 (UTC)
commit 238e83a98cf014c9b1082d21541e63f102d441d6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Jun 3 19:41:40 2014 +0300
Fix some deprecated warnings
Again most fixes are copied from mutter.
src/core/display.c | 16 +++---
src/core/keybindings.c | 8 ++-
src/tools/metacity-mag.c | 46 +++++++++++-----
src/tools/metacity-window-demo.c | 100 ++++++++++++------------------------
src/ui/draw-workspace.c | 17 ++++--
src/ui/tabpopup.c | 16 ++----
src/ui/theme-viewer.c | 105 ++++++++++++++++---------------------
src/ui/theme.c | 2 +-
src/ui/ui.c | 2 +-
src/wm-tester/main.c | 19 +++----
10 files changed, 149 insertions(+), 182 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index d1036b8..64bd72a 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2614,15 +2614,13 @@ static char*
key_event_description (Display *xdisplay,
XEvent *event)
{
- KeySym keysym;
- const char *str;
-
- keysym = XKeycodeToKeysym (xdisplay, event->xkey.keycode, 0);
-
- str = XKeysymToString (keysym);
-
- return g_strdup_printf ("Key '%s' state 0x%x",
- str ? str : "none", event->xkey.state);
+#ifdef HAVE_XKB
+ KeySym keysym = XkbKeycodeToKeysym(xdisplay, event->xkey.keycode, 0, 0);
+ const char *str = XKeysymToString (keysym);
+ return g_strdup_printf ("Key '%s' state 0x%x", str ? str : "none", event->xkey.state);
+#else
+ return "none";
+#endif
}
#endif /* WITH_VERBOSE_MODE */
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index a3f9fed..2e12e6f 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1325,11 +1325,13 @@ meta_display_process_key_event (MetaDisplay *display,
return;
/* window may be NULL */
-
+#ifdef HAVE_XKB
keysym = XKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0);
-
str = XKeysymToString (keysym);
-
+#else
+ str = NULL;
+#endif
+
/* was topic */
meta_topic (META_DEBUG_KEYBINDINGS,
"Processing key %s event, keysym: %s state: 0x%x window: %s\n",
diff --git a/src/tools/metacity-mag.c b/src/tools/metacity-mag.c
index 1fe6394..14b6d4e 100644
--- a/src/tools/metacity-mag.c
+++ b/src/tools/metacity-mag.c
@@ -146,8 +146,11 @@ grab_area_at_mouse (GtkWidget *invisible,
static void
shutdown_grab (void)
{
- gdk_keyboard_ungrab (gtk_get_current_event_time ());
- gdk_pointer_ungrab (gtk_get_current_event_time ());
+ GdkDeviceManager *manager = gdk_display_get_device_manager (gdk_display_get_default ());
+ GdkDevice *device = gdk_device_manager_get_client_pointer (manager);
+
+ gdk_device_ungrab (device, gtk_get_current_event_time ());
+ gdk_device_ungrab (gdk_device_get_associated_device (device), gtk_get_current_event_time ());
gtk_grab_remove (grab_widget);
}
@@ -224,6 +227,10 @@ mouse_press (GtkWidget *invisible,
static void
begin_area_grab (void)
{
+ GdkWindow *window;
+ GdkDeviceManager *manager;
+ GdkDevice *device;
+
if (grab_widget == NULL)
{
grab_widget = gtk_invisible_new ();
@@ -234,23 +241,32 @@ begin_area_grab (void)
gtk_widget_show (grab_widget);
}
- if (gdk_keyboard_grab (gtk_widget_get_window (grab_widget),
- FALSE,
- gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
+ window = gtk_widget_get_window (grab_widget);
+ manager = gdk_display_get_device_manager (gdk_display_get_default ());
+ device = gdk_device_manager_get_client_pointer (manager);
+
+ if (gdk_device_grab (device,
+ window,
+ GDK_OWNERSHIP_NONE,
+ FALSE,
+ GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK,
+ NULL,
+ gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
{
- g_warning ("Failed to grab keyboard to do eyedropper");
+ g_warning ("Failed to grab pointer to do eyedropper");
return;
}
-
- if (gdk_pointer_grab (gtk_widget_get_window (grab_widget),
- FALSE,
- GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK,
- NULL,
- NULL,
- gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
+
+ if (gdk_device_grab (gdk_device_get_associated_device (device),
+ window,
+ GDK_OWNERSHIP_NONE,
+ FALSE,
+ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+ NULL,
+ gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
{
- gdk_keyboard_ungrab (GDK_CURRENT_TIME);
- g_warning ("Failed to grab pointer to do eyedropper");
+ gdk_device_ungrab (device, gtk_get_current_event_time ());
+ g_warning ("Failed to grab keyboard to do eyedropper");
return;
}
diff --git a/src/tools/metacity-window-demo.c b/src/tools/metacity-window-demo.c
index 25d3748..1a00c97 100644
--- a/src/tools/metacity-window-demo.c
+++ b/src/tools/metacity-window-demo.c
@@ -351,7 +351,7 @@ utility_cb (GtkAction *action,
gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (callback_data));
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -384,7 +384,7 @@ toolbar_cb (GtkAction *action,
gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (callback_data));
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -408,7 +408,7 @@ menu_cb (GtkAction *action,
gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (callback_data));
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -429,7 +429,7 @@ override_redirect_cb (GtkAction *action,
window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_title (GTK_WINDOW (window), "Override Redirect");
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -453,7 +453,7 @@ border_only_cb (GtkAction *action,
gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (callback_data));
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -463,29 +463,6 @@ border_only_cb (GtkAction *action,
gtk_widget_show_all (window);
}
-#if 0
-static void
-changing_icon_cb (GtkAction *action,
- gpointer callback_data)
-{
- GtkWidget *window;
- GtkWidget *vbox;
- GtkWidget *label;
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (window), "Changing Icon");
-
- vbox = gtk_vbox_new (FALSE, 0);
-
- gtk_container_add (GTK_CONTAINER (window), vbox);
-
- label = gtk_label_new ("This window has an icon that changes over time");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
- gtk_widget_show_all (window);
-}
-#endif
-
static gboolean
focus_in_event_cb (GtkWidget *window,
GdkEvent *event,
@@ -543,9 +520,9 @@ splashscreen_cb (GtkAction *action,
set_gtk_window_type (GTK_WINDOW (window), "_NET_WM_WINDOW_TYPE_SPLASHSCREEN");
gtk_window_set_title (GTK_WINDOW (window), "Splashscreen");
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), focus_label (window), FALSE, FALSE, 0);
@@ -579,11 +556,11 @@ make_dock (int type)
{
case DOCK_LEFT:
case DOCK_RIGHT:
- box = gtk_vbox_new (FALSE, 0);
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
break;
case DOCK_TOP:
case DOCK_BOTTOM:
- box = gtk_hbox_new (FALSE, 0);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
break;
case DOCK_ALL:
break;
@@ -592,7 +569,7 @@ make_dock (int type)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
set_gtk_window_type (GTK_WINDOW (window), "_NET_WM_WINDOW_TYPE_DOCK");
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), focus_label (window), FALSE, FALSE, 0);
@@ -907,8 +884,7 @@ static GtkWidget *
do_appwindow (void)
{
GtkWidget *window;
- GtkWidget *table;
- GtkWidget *handlebox;
+ GtkWidget *grid;
GtkWidget *statusbar;
GtkWidget *contents;
GtkWidget *sw;
@@ -930,9 +906,12 @@ do_appwindow (void)
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (destroy_cb), NULL);
- table = gtk_table_new (1, 4, FALSE);
-
- gtk_container_add (GTK_CONTAINER (window), table);
+ grid = gtk_grid_new ();
+
+ gtk_widget_set_vexpand (grid, TRUE);
+ gtk_widget_set_hexpand (grid, TRUE);
+
+ gtk_container_add (GTK_CONTAINER (window), grid);
/* Create the menubar
*/
@@ -957,12 +936,12 @@ do_appwindow (void)
gtk_ui_manager_add_ui_from_string (ui_manager, menu_item_string, -1, NULL);
- gtk_table_attach (GTK_TABLE (table),
- gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"),
- /* X direction */ /* Y direction */
- 0, 1, 0, 1,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid),
+ gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"),
+ 0, 0, 1, 1);
+
+ gtk_widget_set_hexpand (gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"),
+ TRUE);
/* Create document
*/
@@ -976,12 +955,10 @@ do_appwindow (void)
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_IN);
- gtk_table_attach (GTK_TABLE (table),
- sw,
- /* X direction */ /* Y direction */
- 0, 1, 2, 3,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), sw, 0, 2, 1, 1);
+
+ gtk_widget_set_hexpand (sw, TRUE);
+ gtk_widget_set_vexpand (sw, TRUE);
gtk_window_set_default_size (GTK_WINDOW (window),
200, 200);
@@ -995,27 +972,18 @@ do_appwindow (void)
/* Create the toolbar
*/
- handlebox = gtk_handle_box_new ();
+ gtk_grid_attach (GTK_GRID (grid),
+ gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar"),
+ 0, 1, 1, 1);
- gtk_container_add (GTK_CONTAINER (handlebox),
- gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar"));
-
- gtk_table_attach (GTK_TABLE (table),
- handlebox,
- /* X direction */ /* Y direction */
- 0, 1, 1, 2,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ gtk_widget_set_hexpand (gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar"),
+ TRUE);
/* Create statusbar */
statusbar = gtk_statusbar_new ();
- gtk_table_attach (GTK_TABLE (table),
- statusbar,
- /* X direction */ /* Y direction */
- 0, 1, 3, 4,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), statusbar, 0, 3, 1, 1);
+ gtk_widget_set_hexpand (statusbar, TRUE);
/* Show text widget info in the statusbar */
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index 6f96747..63e6177 100644
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -166,7 +166,8 @@ wnck_draw_workspace (GtkWidget *widget,
{
int i;
GdkRectangle workspace_rect;
- GtkStateType state;
+ GtkStateFlags state;
+ GtkStyleContext *style;
workspace_rect.x = x;
workspace_rect.y = y;
@@ -174,11 +175,13 @@ wnck_draw_workspace (GtkWidget *widget,
workspace_rect.height = height;
if (is_active)
- state = GTK_STATE_SELECTED;
+ state = GTK_STATE_FLAG_SELECTED;
else if (workspace_background)
- state = GTK_STATE_PRELIGHT;
+ state = GTK_STATE_FLAG_PRELIGHT;
else
- state = GTK_STATE_NORMAL;
+ state = GTK_STATE_FLAG_NORMAL;
+
+ style = gtk_widget_get_style_context (widget);
cairo_save (cr);
@@ -189,7 +192,11 @@ wnck_draw_workspace (GtkWidget *widget,
}
else
{
- gdk_cairo_set_source_color (cr, >k_widget_get_style (widget)->dark[state]);
+ GdkRGBA color;
+
+ meta_gtk_style_get_dark_color (style,state, &color);
+ gdk_cairo_set_source_rgba (cr, &color);
+
cairo_rectangle (cr, x, y, width, height);
cairo_fill (cr);
}
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index 4a96018..8035be2 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -217,7 +217,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
MetaTabPopup *popup;
int i, left, right, top, bottom;
int height;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *vbox;
GtkWidget *align;
GList *tmp;
@@ -271,12 +271,12 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
if (i % width)
height += 1;
- table = gtk_table_new (height, width, FALSE);
- vbox = gtk_vbox_new (FALSE, 0);
+ grid = gtk_grid_new ();
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
- gtk_container_set_border_width (GTK_CONTAINER (table), 1);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 1);
gtk_container_add (GTK_CONTAINER (popup->window),
frame);
gtk_container_add (GTK_CONTAINER (frame),
@@ -287,7 +287,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (align),
- table);
+ grid);
popup->label = gtk_label_new ("");
@@ -349,11 +349,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
te->widget = image;
- gtk_table_attach (GTK_TABLE (table),
- te->widget,
- left, right, top, bottom,
- 0, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), te->widget, left, top, 1, 1);
/* Efficiency rules! */
gtk_label_set_markup (GTK_LABEL (popup->label),
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index db76ec8..47417b2 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -120,15 +120,14 @@ static GtkActionEntry tool_items[] =
static GtkWidget *
normal_contents (void)
{
- GtkWidget *table;
- GtkWidget *handlebox;
+ GtkWidget *grid;
GtkWidget *statusbar;
GtkWidget *contents;
GtkWidget *sw;
GtkActionGroup *action_group;
GtkUIManager *ui_manager;
- table = gtk_table_new (1, 4, FALSE);
+ grid = gtk_grid_new ();
/* Create the menubar
*/
@@ -150,24 +149,18 @@ normal_contents (void)
/* create menu items */
gtk_ui_manager_add_ui_from_string (ui_manager, menu_item_string, -1, NULL);
- gtk_table_attach (GTK_TABLE (table),
- gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"),
- /* X direction */ /* Y direction */
- 0, 1, 0, 1,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid),
+ gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"),
+ 0, 0, 1, 1);
+ gtk_widget_set_hexpand (gtk_ui_manager_get_widget (ui_manager, "/ui/menubar"),
+ TRUE);
- handlebox = gtk_handle_box_new ();
-
- gtk_container_add (GTK_CONTAINER (handlebox),
- gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar"));
-
- gtk_table_attach (GTK_TABLE (table),
- handlebox,
- /* X direction */ /* Y direction */
- 0, 1, 1, 2,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ /* Create the toolbar */
+ gtk_grid_attach (GTK_GRID (grid),
+ gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar"),
+ 0, 1, 1, 1);
+ gtk_widget_set_hexpand (gtk_ui_manager_get_widget (ui_manager, "/ui/toolbar"),
+ TRUE);
/* Create document
*/
@@ -181,13 +174,11 @@ normal_contents (void)
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_IN);
- gtk_table_attach (GTK_TABLE (table),
- sw,
- /* X direction */ /* Y direction */
- 0, 1, 2, 3,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
- 0, 0);
-
+ gtk_grid_attach (GTK_GRID (grid), sw, 0, 2, 1, 1);
+
+ gtk_widget_set_hexpand (sw, TRUE);
+ gtk_widget_set_vexpand (sw, TRUE);
+
contents = gtk_text_view_new ();
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (contents),
PANGO_WRAP_WORD);
@@ -198,18 +189,14 @@ normal_contents (void)
/* Create statusbar */
statusbar = gtk_statusbar_new ();
- gtk_table_attach (GTK_TABLE (table),
- statusbar,
- /* X direction */ /* Y direction */
- 0, 1, 3, 4,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), statusbar, 0, 3, 1, 1);
+ gtk_widget_set_hexpand (statusbar, TRUE);
- gtk_widget_show_all (table);
+ gtk_widget_show_all (grid);
g_object_unref (ui_manager);
- return table;
+ return grid;
}
static void
@@ -231,9 +218,9 @@ dialog_contents (void)
GtkWidget *image;
GtkWidget *button;
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- action_area = gtk_hbutton_box_new ();
+ action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area),
GTK_BUTTONBOX_END);
@@ -256,7 +243,7 @@ dialog_contents (void)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (hbox), image,
FALSE, FALSE, 0);
@@ -276,11 +263,11 @@ dialog_contents (void)
static GtkWidget*
utility_contents (void)
{
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *button;
int i, j;
- table = gtk_table_new (3, 4, FALSE);
+ grid = gtk_grid_new ();
i = 0;
while (i < 3)
@@ -296,12 +283,7 @@ utility_contents (void)
g_free (str);
- gtk_table_attach (GTK_TABLE (table),
- button,
- /* X direction */ /* Y direction */
- i, i+1, j, j+1,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, i, j, 1, 1);
++j;
}
@@ -309,9 +291,9 @@ utility_contents (void)
++i;
}
- gtk_widget_show_all (table);
+ gtk_widget_show_all (grid);
- return table;
+ return grid;
}
static GtkWidget*
@@ -326,7 +308,7 @@ menu_contents (void)
gtk_frame_set_shadow_type (GTK_FRAME (frame),
GTK_SHADOW_OUT);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
i = 0;
while (i < 10)
@@ -363,7 +345,7 @@ border_only_contents (void)
color.alpha = 1.0;
gtk_widget_override_background_color (event_box, 0, &color);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
w = gtk_label_new (_("Border-only window"));
@@ -465,7 +447,7 @@ get_window_flags (MetaFrameType type)
static GtkWidget*
preview_collection (int font_size,
- PangoFontDescription *base_desc)
+ const PangoFontDescription *base_desc)
{
GtkWidget *box;
GtkWidget *sw;
@@ -478,7 +460,7 @@ preview_collection (int font_size,
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- box = gtk_vbox_new (FALSE, 0);
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_spacing (GTK_BOX (box), 20);
gtk_container_set_border_width (GTK_CONTAINER (box), 20);
@@ -702,7 +684,7 @@ previews_of_button_layouts (void)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- box = gtk_vbox_new (FALSE, 0);
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_spacing (GTK_BOX (box), 20);
gtk_container_set_border_width (GTK_CONTAINER (box), 20);
@@ -777,7 +759,8 @@ main (int argc, char **argv)
{
GtkWidget *window;
GtkWidget *collection;
- GtkStyle *style;
+ GtkStyleContext *style;
+ const PangoFontDescription *font_desc;
GError *err;
clock_t start, end;
GtkWidget *notebook;
@@ -852,28 +835,29 @@ main (int argc, char **argv)
G_CALLBACK (gtk_main_quit), NULL);
gtk_widget_realize (window);
- style = gtk_widget_get_style (window);
+ style = gtk_widget_get_style_context (window);
+ font_desc = gtk_style_context_get_font (style, 0);
g_assert (style);
- g_assert (style->font_desc);
+ g_assert (font_desc);
notebook = gtk_notebook_new ();
gtk_container_add (GTK_CONTAINER (window), notebook);
collection = preview_collection (FONT_SIZE_NORMAL,
- style->font_desc);
+ font_desc);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
collection,
gtk_label_new (_("Normal Title Font")));
collection = preview_collection (FONT_SIZE_SMALL,
- style->font_desc);
+ font_desc);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
collection,
gtk_label_new (_("Small Title Font")));
collection = preview_collection (FONT_SIZE_LARGE,
- style->font_desc);
+ font_desc);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
collection,
gtk_label_new (_("Large Title Font")));
@@ -924,7 +908,8 @@ get_flags (GtkWidget *widget)
static int
get_text_height (GtkWidget *widget)
{
- return meta_pango_font_desc_get_text_height (gtk_widget_get_style (widget)->font_desc,
+ GtkStyleContext *style = gtk_widget_get_style_context (widget);
+ return meta_pango_font_desc_get_text_height (gtk_style_context_get_font (style, 0),
gtk_widget_get_pango_context (widget));
}
diff --git a/src/ui/theme.c b/src/ui/theme.c
index b707036..515c049 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -5575,7 +5575,7 @@ meta_gtk_widget_get_font_desc (GtkWidget *widget,
g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
style = gtk_widget_get_style_context (widget);
- font_desc = pango_font_description_copy (gtk_style_context_get_font (style, 0));
+ gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL);
if (override)
pango_font_description_merge (font_desc, override, TRUE);
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 6a6ae45..29607c1 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -715,7 +715,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
if (!font_desc)
{
style = gtk_style_context_new ();
- font_desc = gtk_style_context_get_font (style, 0);
+ gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL);
}
text_height = meta_pango_font_desc_get_text_height (font_desc, context);
diff --git a/src/wm-tester/main.c b/src/wm-tester/main.c
index db0814b..8971f3a 100644
--- a/src/wm-tester/main.c
+++ b/src/wm-tester/main.c
@@ -199,6 +199,7 @@ set_up_icon_windows (void)
GtkWidget *c;
GList *icons;
GdkPixbuf *pix;
+ int size = 0;
w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
c = gtk_button_new_with_label ("Icon window");
@@ -206,28 +207,22 @@ set_up_icon_windows (void)
icons = NULL;
- pix = gtk_widget_render_icon (w,
- GTK_STOCK_SAVE,
- GTK_ICON_SIZE_LARGE_TOOLBAR,
- NULL);
+ gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, NULL, &size);
+ pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "gtk-save", size, 0, NULL);
icons = g_list_append (icons, pix);
if (i % 2)
{
- pix = gtk_widget_render_icon (w,
- GTK_STOCK_SAVE,
- GTK_ICON_SIZE_DIALOG,
- NULL);
+ gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, NULL, &size);
+ pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "gtk-save", size, 0, NULL);
icons = g_list_append (icons, pix);
}
if (i % 3)
{
- pix = gtk_widget_render_icon (w,
- GTK_STOCK_SAVE,
- GTK_ICON_SIZE_MENU,
- NULL);
+ gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &size);
+ pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "gtk-save", size, 0, NULL);
icons = g_list_append (icons, pix);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
