X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-navigation-action-widget.c;h=95c7fdff77f7e43001675c8385ea7be810bb9d2e;hb=aff4186edfaa1036268c97c60432e2d6644e91e5;hp=116ff9c4807c33712fd7094378095e25246718b2;hpb=0d7c338831d7d741f4c0a61e8c3b40f8bdd5f87f;p=evince.git

diff --git a/shell/ev-navigation-action-widget.c b/shell/ev-navigation-action-widget.c
index 116ff9c4..95c7fdff 100644
--- a/shell/ev-navigation-action-widget.c
+++ b/shell/ev-navigation-action-widget.c
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
@@ -52,7 +52,7 @@ ev_navigation_action_widget_init (EvNavigationActionWidget *action_widget)
 	toggle_button = gtk_bin_get_child (GTK_BIN (action_widget));
 	
 	g_signal_connect (toggle_button, "button-press-event", 
-			  ev_navigation_action_widget_button_press_event,
+			  G_CALLBACK (ev_navigation_action_widget_button_press_event),
 		          action_widget);
 	return;
 }
@@ -98,7 +98,7 @@ ev_navigation_action_widget_set_menu(EvNavigationActionWidget *button, GtkWidget
       if (button->menu == GTK_MENU (menu))
 		return;
 	
-      if (button->menu && GTK_WIDGET_VISIBLE (button->menu))
+      if (button->menu && gtk_widget_get_visible (GTK_WIDGET (button->menu)))
 	        gtk_menu_shell_deactivate (GTK_MENU_SHELL (button->menu));
 
       if (button->menu) {
@@ -127,7 +127,9 @@ menu_position_func (GtkMenu           *menu,
 {
 	GtkWidget *widget = GTK_WIDGET (button);
 	GtkRequisition menu_req;
+	GtkAllocation  allocation;
 	GtkTextDirection direction;
+	GdkWindow *gdk_window;
 	GdkRectangle monitor;
 	gint monitor_num;
 	GdkScreen *screen;
@@ -136,26 +138,28 @@ menu_position_func (GtkMenu           *menu,
 	direction = gtk_widget_get_direction (widget);
 	screen = gtk_widget_get_screen (GTK_WIDGET (menu));
 
-	monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+	gdk_window = gtk_widget_get_window (widget);
+	monitor_num = gdk_screen_get_monitor_at_window (screen, gdk_window);
 	if (monitor_num < 0)
 		monitor_num = 0;
 	gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
 
-	gdk_window_get_origin (widget->window, x, y);
-	*x += widget->allocation.x;
-	*y += widget->allocation.y;
+	gdk_window_get_origin (gdk_window, x, y);
+	gtk_widget_get_allocation (widget, &allocation);
+	*x += allocation.x;
+	*y += allocation.y;
 
 	if (direction == GTK_TEXT_DIR_LTR)
-		*x += MAX (widget->allocation.width - menu_req.width, 0);
-	else if (menu_req.width > widget->allocation.width)
-    		*x -= menu_req.width - widget->allocation.width;
+		*x += MAX (allocation.width - menu_req.width, 0);
+	else if (menu_req.width > allocation.width)
+    		*x -= menu_req.width - allocation.width;
 
-	if ((*y + widget->allocation.height + menu_req.height) <= monitor.y + monitor.height)
-    		*y += widget->allocation.height;
+	if ((*y + allocation.height + menu_req.height) <= monitor.y + monitor.height)
+    		*y += allocation.height;
 	else if ((*y - menu_req.height) >= monitor.y)
     		*y -= menu_req.height;
-	else if (monitor.y + monitor.height - (*y + widget->allocation.height) > *y)
-    		*y += widget->allocation.height;
+	else if (monitor.y + monitor.height - (*y + allocation.height) > *y)
+    		*y += allocation.height;
 	else
     		*y -= menu_req.height; 
 
@@ -186,7 +190,7 @@ ev_navigation_action_widget_toggled (GtkToggleToolButton *toggle)
     		return;
 
 	if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button)) &&
-	    !GTK_WIDGET_VISIBLE (button->menu)) {
+	    !gtk_widget_get_visible (GTK_WIDGET (button->menu))) {
 		      /* we get here only when the menu is activated by a key
 		       * press, so that we can select the first menu item */
 		      popup_menu_under_arrow (button, NULL);