[libgda] Replaced some deprecated functions
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Replaced some deprecated functions
- Date: Sun, 1 Apr 2012 20:51:55 +0000 (UTC)
commit fb1a2834bc4e29c43de371c9b0db772fed8db1ca
Author: Vivien Malerba <malerba gnome-db org>
Date: Sun Apr 1 22:51:14 2012 +0200
Replaced some deprecated functions
gdk_window_get_pointer()
gtk_widget_size_request()
gdk_pointer_grab()
gdk_pointer_ungrab()
gdk_keyboard_grab()
libgda-ui/gdaui-cloud.c | 8 +++++---
libgda-ui/gdaui-raw-grid.c | 31 ++++++++++++++++++-------------
2 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/libgda-ui/gdaui-cloud.c b/libgda-ui/gdaui-cloud.c
index df0b57e..743c1f0 100644
--- a/libgda-ui/gdaui-cloud.c
+++ b/libgda-ui/gdaui-cloud.c
@@ -729,8 +729,12 @@ static gboolean
visibility_notify_event (GtkWidget *text_view, G_GNUC_UNUSED GdkEventVisibility *event, GdauiCloud *cloud)
{
gint wx, wy, bx, by;
+ GdkDeviceManager *manager;
+ GdkDevice *pointer;
- gdk_window_get_pointer (gtk_widget_get_window (text_view), &wx, &wy, NULL);
+ manager = gdk_display_get_device_manager (gtk_widget_get_display (text_view));
+ pointer = gdk_device_manager_get_client_pointer (manager);
+ gdk_window_get_device_position (gtk_widget_get_window (text_view), pointer, &wx, &wy, NULL);
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
GTK_TEXT_WINDOW_WIDGET,
@@ -754,8 +758,6 @@ motion_notify_event (GtkWidget *text_view, GdkEventMotion *event, GdauiCloud *cl
event->x, event->y, &x, &y);
set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y, cloud);
-
- gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
return FALSE;
}
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 5cc0b4a..f6db05c 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -1691,7 +1691,7 @@ filter_position_func (GtkWidget *widget,
gdk_window_get_origin (window, &tree_x, &tree_y);
tree_width = gdk_window_get_width (window);
tree_height = gdk_window_get_height (window);
- gtk_widget_size_request (search_dialog, &requisition);
+ gtk_widget_get_preferred_size (search_dialog, NULL, &requisition);
if (tree_x + tree_width > gdk_screen_get_width (screen))
x = gdk_screen_get_width (screen) - requisition.width;
@@ -1711,22 +1711,27 @@ filter_position_func (GtkWidget *widget,
}
static gboolean
-popup_grab_on_window (GdkWindow *window,
- guint32 activate_time)
+popup_grab_on_window (GtkWidget *widget, guint32 activate_time)
{
- if (gdk_pointer_grab (window, TRUE,
+ GdkDeviceManager *manager;
+ GdkDevice *pointer;
+ GdkWindow *window;
+ window = gtk_widget_get_window (widget);
+ manager = gdk_display_get_device_manager (gtk_widget_get_display (widget));
+ pointer = gdk_device_manager_get_client_pointer (manager);
+ if (gdk_device_grab (pointer, window, GDK_OWNERSHIP_WINDOW, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
- NULL, NULL,
- activate_time) == 0) {
-
- if (gdk_keyboard_grab (window, TRUE, activate_time) == 0)
+ NULL, activate_time) == GDK_GRAB_SUCCESS) {
+ GdkDevice *keyb;
+ keyb = gdk_device_get_associated_device (pointer);
+ if (gdk_device_grab (keyb, window, GDK_OWNERSHIP_WINDOW, TRUE,
+ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, NULL, activate_time) == 0)
return TRUE;
else {
- gdk_pointer_ungrab (activate_time);
+ gdk_device_ungrab (pointer, activate_time);
return FALSE;
}
}
-
return FALSE;
}
@@ -1786,8 +1791,8 @@ action_filter_cb (G_GNUC_UNUSED GtkAction *action, GdauiRawGrid *grid)
gtk_widget_show (grid->priv->filter_window);
gtk_grab_add (grid->priv->filter_window);
filter_position_func (GTK_WIDGET (grid), grid->priv->filter_window, NULL);
- popup_grab_on_window (gtk_widget_get_window (grid->priv->filter_window),
- gtk_get_current_event_time ());
+ popup_grab_on_window (grid->priv->filter_window,
+ gtk_get_current_event_time ());
}
/*
@@ -3028,7 +3033,7 @@ proxy_sample_changed_cb (G_GNUC_UNUSED GdaDataProxy *proxy, G_GNUC_UNUSED gint s
G_GNUC_UNUSED gint sample_end, GdauiRawGrid *grid)
{
/* bring back the vertical scrollbar to the top */
- gtk_adjustment_set_value (gtk_tree_view_get_vadjustment (GTK_TREE_VIEW (grid)), 0.);
+ gtk_adjustment_set_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (grid)), 0.);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]