Attachment #231015 for bug #317839

Lines 315-321 Link Here

(-)evince-2.28.2.old/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c (+4 lines)
315	}	315	}
316	else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)	316	else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
317	{	317	{
		318	#if GTK_CHECK_VERSION (2, 19, 7)
		319	if (gtk_widget_has_focus (widget))
		320	#else
318	if (GTK_WIDGET_HAS_FOCUS (widget))	321	if (GTK_WIDGET_HAS_FOCUS (widget))
		322	#endif
319	state = GTK_STATE_SELECTED;	323	state = GTK_STATE_SELECTED;
320	else	324	else
321	state = GTK_STATE_ACTIVE;	325	state = GTK_STATE_ACTIVE;

Lines 872-878 Link Here

(-)evince-2.28.2.old/cut-n-paste/toolbar-editor/egg-editable-toolbar.c (+8 lines)
872		872
873	priv->visibility_id = gtk_ui_manager_new_merge_id (priv->manager);	873	priv->visibility_id = gtk_ui_manager_new_merge_id (priv->manager);
874		874
		875	#if GTK_CHECK_VERSION (2, 19, 7)
		876	showing = gtk_widget_get_visible (etoolbar);
		877	#else
875	showing = GTK_WIDGET_VISIBLE (etoolbar);	878	showing = GTK_WIDGET_VISIBLE (etoolbar);
		879	#endif
876		880
877	n_toolbars = egg_toolbars_model_n_toolbars (priv->model);	881	n_toolbars = egg_toolbars_model_n_toolbars (priv->model);
878	for (i = 0; i < n_toolbars; i++)	882	for (i = 0; i < n_toolbars; i++)
Lines 954-960 Link Here
954	gtk_action_set_visible (GTK_ACTION (action), (egg_toolbars_model_get_flags (priv->model, i)	958	gtk_action_set_visible (GTK_ACTION (action), (egg_toolbars_model_get_flags (priv->model, i)
955	& EGG_TB_MODEL_NOT_REMOVABLE) == 0);	959	& EGG_TB_MODEL_NOT_REMOVABLE) == 0);
956	gtk_action_set_sensitive (GTK_ACTION (action), showing);	960	gtk_action_set_sensitive (GTK_ACTION (action), showing);
		961	#if GTK_CHECK_VERSION (2, 19, 7)
		962	gtk_toggle_action_set_active (action, gtk_widget_get_visible
		963	#else
957	gtk_toggle_action_set_active (action, GTK_WIDGET_VISIBLE	964	gtk_toggle_action_set_active (action, GTK_WIDGET_VISIBLE
		965	#endif
958	(get_dock_nth (etoolbar, i)));	966	(get_dock_nth (etoolbar, i)));
959		967
960	for (list = priv->visibility_paths; list != NULL; list = g_list_next (list))	968	for (list = priv->visibility_paths; list != NULL; list = g_list_next (list))

Lines 362-368 Link Here

(-)evince-2.28.2.old/libmisc/ev-page-action.c (+4 lines)
362		362
363	proxy = EV_PAGE_ACTION_WIDGET (proxies->data);	363	proxy = EV_PAGE_ACTION_WIDGET (proxies->data);
364		364
		365	#if GTK_CHECK_VERSION (2, 19, 7)
		366	if (gtk_widget_get_mapped (GTK_WIDGET (proxy)))
		367	#else
365	if (GTK_WIDGET_MAPPED (GTK_WIDGET (proxy)))	368	if (GTK_WIDGET_MAPPED (GTK_WIDGET (proxy)))
		369	#endif
366	gtk_widget_grab_focus (proxy->entry);	370	gtk_widget_grab_focus (proxy->entry);
367	}	371	}
368	}	372	}

Lines 253-259 Link Here

(-)evince-2.28.2.old/libview/ev-annotation-window.c (+12 lines)
253	if (!widget->window)	253	if (!widget->window)
254	return;	254	return;
255		255
		256	#if GTK_CHECK_VERSION (2, 19, 7)
		257	if (gtk_widget_is_sensitive (widget)) {
		258	#else
256	if (GTK_WIDGET_IS_SENSITIVE (widget)) {	259	if (GTK_WIDGET_IS_SENSITIVE (widget)) {
		260	#endif
257	GdkDisplay *display = gtk_widget_get_display (widget);	261	GdkDisplay *display = gtk_widget_get_display (widget);
258	GdkCursor *cursor;	262	GdkCursor *cursor;
259		263
Lines 631-637 Link Here
631	{	635	{
632	g_return_if_fail (EV_IS_ANNOTATION_WINDOW (window));	636	g_return_if_fail (EV_IS_ANNOTATION_WINDOW (window));
633		637
		638	#if GTK_CHECK_VERSION (2, 19, 7)
		639	if (!gtk_widget_has_focus (window->text_view)) {
		640	#else
634	if (!GTK_WIDGET_HAS_FOCUS (window->text_view)) {	641	if (!GTK_WIDGET_HAS_FOCUS (window->text_view)) {
		642	#endif
635	gtk_widget_grab_focus (GTK_WIDGET (window));	643	gtk_widget_grab_focus (GTK_WIDGET (window));
636	send_focus_change (window->text_view, TRUE);	644	send_focus_change (window->text_view, TRUE);
637	}	645	}
Lines 642-648 Link Here
642	{	650	{
643	g_return_if_fail (EV_IS_ANNOTATION_WINDOW (window));	651	g_return_if_fail (EV_IS_ANNOTATION_WINDOW (window));
644		652
		653	#if GTK_CHECK_VERSION (2, 19, 7)
		654	if (gtk_widget_has_focus (window->text_view)) {
		655	#else
645	if (GTK_WIDGET_HAS_FOCUS (window->text_view)) {	656	if (GTK_WIDGET_HAS_FOCUS (window->text_view)) {
		657	#endif
646	send_focus_change (window->text_view, FALSE);	658	send_focus_change (window->text_view, FALSE);
647	}	659	}
648		660

Lines 608-614 Link Here

(-)evince-2.28.2.old/libview/ev-pixbuf-cache.c (+4 lines)
608	static void	608	static void
609	get_selection_colors (GtkWidget widget, GdkColor text, GdkColor *base)	609	get_selection_colors (GtkWidget widget, GdkColor text, GdkColor *base)
610	{	610	{
		611	#if GTK_CHECK_VERSION (2, 19, 7)
		612	if (gtk_widget_has_focus (widget)) {
		613	#else
611	if (GTK_WIDGET_HAS_FOCUS (widget)) {	614	if (GTK_WIDGET_HAS_FOCUS (widget)) {
		615	#endif
612	*text = &widget->style->text [GTK_STATE_SELECTED];	616	*text = &widget->style->text [GTK_STATE_SELECTED];
613	*base = &widget->style->base [GTK_STATE_SELECTED];	617	*base = &widget->style->base [GTK_STATE_SELECTED];
614	} else {	618	} else {

Lines 2142-2148 Link Here

(-)evince-2.28.2.old/libview/ev-view.c (+24 lines)
2142	ev_view_window_child_move (view, child, dest_x, dest_y);	2142	ev_view_window_child_move (view, child, dest_x, dest_y);
2143	}	2143	}
2144		2144
		2145	#if GTK_CHECK_VERSION (2, 19, 7)
		2146	if (child->visible && !gtk_widget_get_visible (window))
		2147	#else
2145	if (child->visible && !GTK_WIDGET_VISIBLE (window))	2148	if (child->visible && !GTK_WIDGET_VISIBLE (window))
		2149	#endif
2146	gtk_widget_show (window);	2150	gtk_widget_show (window);
2147	}	2151	}
2148		2152
Lines 2799-2805 Link Here
2799		2803
2800	gtk_paint_layout (GTK_WIDGET (view)->style,	2804	gtk_paint_layout (GTK_WIDGET (view)->style,
2801	view->layout.bin_window,	2805	view->layout.bin_window,
		2806	#if GTK_CHECK_VERSION (2, 19, 7)
		2807	gtk_widget_get_state (view),
		2808	#else
2802	GTK_WIDGET_STATE (view),	2809	GTK_WIDGET_STATE (view),
		2810	#endif
2803	FALSE,	2811	FALSE,
2804	page_area,	2812	page_area,
2805	GTK_WIDGET (view),	2813	GTK_WIDGET (view),
Lines 3056-3062 Link Here
3056	if (!view->document)	3064	if (!view->document)
3057	return FALSE;	3065	return FALSE;
3058		3066
		3067	#if GTK_CHECK_VERSION (2, 19, 7)
		3068	if (!gtk_widget_has_focus (widget)) {
		3069	#else
3059	if (!GTK_WIDGET_HAS_FOCUS (widget)) {	3070	if (!GTK_WIDGET_HAS_FOCUS (widget)) {
		3071	#endif
3060	gtk_widget_grab_focus (widget);	3072	gtk_widget_grab_focus (widget);
3061	}	3073	}
3062		3074
Lines 3781-3787 Link Here
3781	if (!view->document)	3793	if (!view->document)
3782	return FALSE;	3794	return FALSE;
3783		3795
		3796	#if GTK_CHECK_VERSION (2, 19, 7)
		3797	if (!gtk_widget_has_focus (widget)) {
		3798	#else
3784	if (!GTK_WIDGET_HAS_FOCUS (widget)) {	3799	if (!GTK_WIDGET_HAS_FOCUS (widget)) {
		3800	#endif
3785	/* Forward key events to current focused window child */	3801	/* Forward key events to current focused window child */
3786	if (view->window_child_focus) {	3802	if (view->window_child_focus) {
3787	GdkEventKey *new_event;	3803	GdkEventKey *new_event;
Lines 4686-4692 Link Here
4686	gint x, y;	4702	gint x, y;
4687	GList children, l;	4703	GList children, l;
4688		4704
		4705	#if GTK_CHECK_VERSION (2, 19, 7)
		4706	if (! gtk_widget_get_realized (view))
		4707	#else
4689	if (! GTK_WIDGET_REALIZED (view))	4708	if (! GTK_WIDGET_REALIZED (view))
		4709	#endif
4690	return;	4710	return;
4691		4711
4692	if (view->hadjustment) {	4712	if (view->hadjustment) {
Lines 5076-5082 Link Here
5076	}	5096	}
5077	}	5097	}
5078		5098
		5099	#if GTK_CHECK_VERSION (2, 19, 7)
		5100	if (gtk_widget_get_realized (view)) {
		5101	#else
5079	if (GTK_WIDGET_REALIZED (view)) {	5102	if (GTK_WIDGET_REALIZED (view)) {
		5103	#endif
5080	if (view->presentation)	5104	if (view->presentation)
5081	gdk_window_set_background (view->layout.bin_window,	5105	gdk_window_set_background (view->layout.bin_window,
5082	&GTK_WIDGET (view)->style->black);	5106	&GTK_WIDGET (view)->style->black);

Lines 641-647 Link Here

(-)evince-2.28.2.old/shell/ev-application.c (+8 lines)
641	application);	641	application);
642	#endif	642	#endif
643		643
		644	#if GTK_CHECK_VERSION (2, 19, 7)
		645	if (!gtk_widget_get_realized (new_window))
		646	#else
644	if (!GTK_WIDGET_REALIZED (new_window))	647	if (!GTK_WIDGET_REALIZED (new_window))
		648	#endif
645	gtk_widget_realize (new_window);	649	gtk_widget_realize (new_window);
646		650
647	#ifdef GDK_WINDOWING_X11	651	#ifdef GDK_WINDOWING_X11
Lines 776-782 Link Here
776	application);	780	application);
777	#endif	781	#endif
778		782
		783	#if GTK_CHECK_VERSION (2, 19, 7)
		784	if (!gtk_widget_get_realized (GTK_WIDGET (new_window)))
		785	#else
779	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window)))	786	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window)))
		787	#endif
780	gtk_widget_realize (GTK_WIDGET (new_window));	788	gtk_widget_realize (GTK_WIDGET (new_window));
781		789
782	#ifdef GDK_WINDOWING_X11	790	#ifdef GDK_WINDOWING_X11

Lines 98-104 Link Here

(-)evince-2.28.2.old/shell/ev-navigation-action-widget.c (+8 lines)
98	if (button->menu == GTK_MENU (menu))	98	if (button->menu == GTK_MENU (menu))
99	return;	99	return;
100		100
		101	#if GTK_CHECK_VERSION (2, 19, 7)
		102	if (button->menu && gtk_widget_get_visible (button->menu))
		103	#else
101	if (button->menu && GTK_WIDGET_VISIBLE (button->menu))	104	if (button->menu && GTK_WIDGET_VISIBLE (button->menu))
		105	#endif
102	gtk_menu_shell_deactivate (GTK_MENU_SHELL (button->menu));	106	gtk_menu_shell_deactivate (GTK_MENU_SHELL (button->menu));
103		107
104	if (button->menu) {	108	if (button->menu) {
Lines 186-192 Link Here
186	return;	190	return;
187		191
188	if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)) &&	192	if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)) &&
		193	#if GTK_CHECK_VERSION (2, 19, 7)
		194	!gtk_widget_get_visible (button->menu)) {
		195	#else
189	!GTK_WIDGET_VISIBLE (button->menu)) {	196	!GTK_WIDGET_VISIBLE (button->menu)) {
		197	#endif
190	/* we get here only when the menu is activated by a key	198	/* we get here only when the menu is activated by a key
191	* press, so that we can select the first menu item */	199	* press, so that we can select the first menu item */
192	popup_menu_under_arrow (button, NULL);	200	popup_menu_under_arrow (button, NULL);

Lines 272-278 Link Here

(-)evince-2.28.2.old/shell/ev-sidebar-attachments.c (+4 lines)
272	GdkEventButton *event,	272	GdkEventButton *event,
273	GtkWidget *icon_view)	273	GtkWidget *icon_view)
274	{	274	{
		275	#if GTK_CHECK_VERSION (2, 19, 7)
		276	if (!gtk_widget_has_focus (icon_view)) {
		277	#else
275	if (!GTK_WIDGET_HAS_FOCUS (icon_view)) {	278	if (!GTK_WIDGET_HAS_FOCUS (icon_view)) {
		279	#endif
276	gtk_widget_grab_focus (icon_view);	280	gtk_widget_grab_focus (icon_view);
277	}	281	}
278		282

Lines 207-213 Link Here

(-)evince-2.28.2.old/shell/ev-sidebar.c (+4 lines)
207	GtkWidget *widget;	207	GtkWidget *widget;
208		208
209	g_return_if_fail (GTK_IS_BUTTON (user_data));	209	g_return_if_fail (GTK_IS_BUTTON (user_data));
		210	#if GTK_CHECK_VERSION (2, 19, 7)
		211	g_return_if_fail (!gtk_widget_get_has_window (user_data));
		212	#else
210	g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));	213	g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
		214	#endif
211		215
212	widget = GTK_WIDGET (user_data);	216	widget = GTK_WIDGET (user_data);
213		217

Lines 548-554 Link Here

(-)evince-2.28.2.old/shell/ev-sidebar-links.c (+4 lines)
548	GtkTreeIter iter;	548	GtkTreeIter iter;
549		549
550	/* Widget is not currently visible */	550	/* Widget is not currently visible */
		551	#if GTK_CHECK_VERSION (2, 19, 7)
		552	if (!gtk_widget_get_mapped (sidebar_links))
		553	#else
551	if (!GTK_WIDGET_MAPPED (sidebar_links))	554	if (!GTK_WIDGET_MAPPED (sidebar_links))
		555	#endif
552	return;	556	return;
553		557
554	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view));	558	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view));

Lines 361-374 Link Here

(-)evince-2.28.2.old/shell/ev-sidebar-thumbnails.c (+12 lines)
361	gint wy2;	361	gint wy2;
362		362
363	/* Widget is not currently visible */	363	/* Widget is not currently visible */
		364	#if GTK_CHECK_VERSION (2, 19, 7)
		365	if (!gtk_widget_get_mapped (sidebar_thumbnails))
		366	#else
364	if (!GTK_WIDGET_MAPPED (sidebar_thumbnails))	367	if (!GTK_WIDGET_MAPPED (sidebar_thumbnails))
		368	#endif
365	return;	369	return;
366		370
367	if (priv->vadjustment->page_size == 0)	371	if (priv->vadjustment->page_size == 0)
368	return;	372	return;
369		373
370	if (priv->tree_view) {	374	if (priv->tree_view) {
		375	#if GTK_CHECK_VERSION (2, 19, 7)
		376	if (! gtk_widget_get_realized (priv->tree_view))
		377	#else
371	if (! GTK_WIDGET_REALIZED (priv->tree_view))	378	if (! GTK_WIDGET_REALIZED (priv->tree_view))
		379	#endif
372	return;	380	return;
373		381
374	gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),	382	gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
Lines 384-390 Link Here
384	1, wy2 -1, &path2,	392	1, wy2 -1, &path2,
385	NULL, NULL, NULL);	393	NULL, NULL, NULL);
386	} else if (priv->icon_view) {	394	} else if (priv->icon_view) {
		395	#if GTK_CHECK_VERSION (2, 19, 7)
		396	if (! gtk_widget_get_realized (priv->icon_view))
		397	#else
387	if (! GTK_WIDGET_REALIZED (priv->icon_view))	398	if (! GTK_WIDGET_REALIZED (priv->icon_view))
		399	#endif
388	return;	400	return;
389	if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))	401	if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
390	return;	402	return;

Lines 4295-4304 Link Here

(-)evince-2.28.2.old/shell/ev-window.c (+20 lines)
4295		4295
4296	if (!ev_view_get_presentation (view)) {	4296	if (!ev_view_get_presentation (view)) {
4297	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),	4297	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
		4298	#if GTK_CHECK_VERSION (2, 19, 7)
		4299	gtk_widget_get_visible (ev_sidebar));
		4300	#else
4298	GTK_WIDGET_VISIBLE (ev_sidebar));	4301	GTK_WIDGET_VISIBLE (ev_sidebar));
		4302	#endif
4299		4303
4300	ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",	4304	ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility",
		4305	#if GTK_CHECK_VERSION (2, 19, 7)
		4306	gtk_widget_get_visible (ev_sidebar));
		4307	#else
4301	GTK_WIDGET_VISIBLE (ev_sidebar));	4308	GTK_WIDGET_VISIBLE (ev_sidebar));
		4309	#endif
4302	}	4310	}
4303	}	4311	}
4304		4312
Lines 4567-4573 Link Here
4567	{	4575	{
4568	gboolean visible;	4576	gboolean visible;
4569		4577
		4578	#if GTK_CHECK_VERSION (2, 19, 7)
		4579	visible = gtk_widget_get_visible (find_bar);
		4580	#else
4570	visible = GTK_WIDGET_VISIBLE (find_bar);	4581	visible = GTK_WIDGET_VISIBLE (find_bar);
		4582	#endif
4571		4583
4572	if (ev_window->priv->document &&	4584	if (ev_window->priv->document &&
4573	EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {	4585	EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
Lines 4884-4890 Link Here
4884	*/	4896	*/
4885	if (priv->view) {	4897	if (priv->view) {
4886	g_object_ref (priv->view);	4898	g_object_ref (priv->view);
		4899	#if GTK_CHECK_VERSION (2, 19, 7)
		4900	if (gtk_widget_is_sensitive (priv->view))
		4901	#else
4887	if (GTK_WIDGET_IS_SENSITIVE (priv->view))	4902	if (GTK_WIDGET_IS_SENSITIVE (priv->view))
		4903	#endif
4888	handled = gtk_widget_event (priv->view, (GdkEvent*) event);	4904	handled = gtk_widget_event (priv->view, (GdkEvent*) event);
4889	g_object_unref (priv->view);	4905	g_object_unref (priv->view);
4890	}	4906	}
Lines 4895-4901 Link Here
4895	if (priv->menubar_accel_keyval != 0 &&	4911	if (priv->menubar_accel_keyval != 0 &&
4896	event->keyval == priv->menubar_accel_keyval &&	4912	event->keyval == priv->menubar_accel_keyval &&
4897	modifier == priv->menubar_accel_modifier) {	4913	modifier == priv->menubar_accel_modifier) {
		4914	#if GTK_CHECK_VERSION (2, 19, 7)
		4915	if (!gtk_widget_get_visible (priv->menubar)) {
		4916	#else
4898	if (!GTK_WIDGET_VISIBLE (priv->menubar)) {	4917	if (!GTK_WIDGET_VISIBLE (priv->menubar)) {
		4918	#endif
4899	g_signal_connect (priv->menubar, "deactivate",	4919	g_signal_connect (priv->menubar, "deactivate",
4900	G_CALLBACK (menubar_deactivate_cb),	4920	G_CALLBACK (menubar_deactivate_cb),
4901	ev_window);	4921	ev_window);

Return to bug 317839