[glade3/offscreen] Fixed compitation for gtk+-3.0
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3/offscreen] Fixed compitation for gtk+-3.0
- Date: Sun, 19 Sep 2010 20:24:28 +0000 (UTC)
commit 53797de6b53a1565bdd69e6c26bb34d28fcb0416
Author: Juan Pablo Ugarte <jp synctv com>
Date: Sun Sep 19 17:24:04 2010 -0300
Fixed compitation for gtk+-3.0
gladeui/glade-base-editor.c | 2 +-
gladeui/glade-design-layout.c | 59 +++++++++++++++--------------
gladeui/glade-editor-property.c | 8 +---
gladeui/glade-editor.c | 5 +--
gladeui/glade-inspector.c | 4 +-
gladeui/glade-named-icon-chooser-dialog.c | 2 -
gladeui/glade-project.c | 2 -
gladeui/glade-utils.c | 10 ++--
plugins/gtk+/glade-accels.c | 2 -
plugins/gtk+/glade-attributes.c | 2 -
plugins/gtk+/glade-column-types.c | 4 +-
plugins/gtk+/glade-model-data.c | 4 +-
plugins/gtk+/glade-text-button.c | 4 +-
src/glade-window.c | 3 +-
14 files changed, 48 insertions(+), 63 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index f47acb7..3352116 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -893,7 +893,7 @@ glade_base_editor_treeview_key_press_event (GtkWidget *widget,
GdkEventKey *event,
GladeBaseEditor *e)
{
- if (event->keyval == GDK_Delete)
+ if (event->keyval == GDK_KEY_Delete)
glade_base_editor_delete_child (e);
return FALSE;
diff --git a/gladeui/glade-design-layout.c b/gladeui/glade-design-layout.c
index 53e163d..d32b6ed 100644
--- a/gladeui/glade-design-layout.c
+++ b/gladeui/glade-design-layout.c
@@ -190,7 +190,7 @@ glade_design_layout_leave_notify_event (GtkWidget *widget, GdkEventCrossing *ev)
priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
if (priv->activity == ACTIVITY_NONE)
- gdk_window_set_cursor (widget->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
return FALSE;
}
@@ -345,7 +345,7 @@ glade_design_layout_motion_notify_event (GtkWidget *widget, GdkEventMotion *ev)
priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
- gdk_window_get_pointer (widget->window, &x, &y, NULL);
+ gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL);
child_glade_widget = glade_widget_get_from_gobject (child);
gtk_widget_get_allocation (child, &allocation);
@@ -396,18 +396,18 @@ glade_design_layout_motion_notify_event (GtkWidget *widget, GdkEventMotion *ev)
region = glade_design_layout_get_pointer_region (GLADE_DESIGN_LAYOUT (widget), x, y);
if (region == REGION_EAST)
- gdk_window_set_cursor (widget->window, priv->cursor_resize_right);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_right);
else if (region == REGION_SOUTH)
- gdk_window_set_cursor (widget->window, priv->cursor_resize_bottom);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_bottom);
else if (region == REGION_SOUTH_EAST ||
region == REGION_WEST_OF_SOUTH_EAST ||
region == REGION_NORTH_OF_SOUTH_EAST)
- gdk_window_set_cursor (widget->window, priv->cursor_resize_bottom_right);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_bottom_right);
else if (region == REGION_OUTSIDE)
- gdk_window_set_cursor (widget->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
}
return FALSE;
@@ -427,7 +427,7 @@ glade_design_layout_button_press_event (GtkWidget *widget, GdkEventButton *ev)
priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
- gdk_window_get_pointer (widget->window, &x, &y, NULL);
+ gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL);
region = glade_design_layout_get_pointer_region (GLADE_DESIGN_LAYOUT (widget), x, y);
if (((GdkEventButton *) ev)->button == 1)
@@ -439,27 +439,27 @@ glade_design_layout_button_press_event (GtkWidget *widget, GdkEventButton *ev)
if (region == REGION_EAST)
{
priv->activity = ACTIVITY_RESIZE_WIDTH;
- gdk_window_set_cursor (widget->window, priv->cursor_resize_right);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_right);
}
if (region == REGION_SOUTH)
{
priv->activity = ACTIVITY_RESIZE_HEIGHT;
- gdk_window_set_cursor (widget->window, priv->cursor_resize_bottom);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_bottom);
}
if (region == REGION_SOUTH_EAST)
{
priv->activity = ACTIVITY_RESIZE_WIDTH_AND_HEIGHT;
- gdk_window_set_cursor (widget->window, priv->cursor_resize_bottom_right);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_bottom_right);
}
if (region == REGION_WEST_OF_SOUTH_EAST)
{
priv->activity = ACTIVITY_RESIZE_WIDTH_AND_HEIGHT;
- gdk_window_set_cursor (widget->window, priv->cursor_resize_bottom_right);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_bottom_right);
}
if (region == REGION_NORTH_OF_SOUTH_EAST)
{
priv->activity = ACTIVITY_RESIZE_WIDTH_AND_HEIGHT;
- gdk_window_set_cursor (widget->window, priv->cursor_resize_bottom_right);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_resize_bottom_right);
}
}
@@ -478,7 +478,7 @@ glade_design_layout_button_release_event (GtkWidget *widget, GdkEventButton *ev)
priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
priv->activity = ACTIVITY_NONE;
- gdk_window_set_cursor (widget->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
return FALSE;
}
@@ -569,7 +569,7 @@ glade_design_layout_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
child_allocation.width = child_width - 2 * border_width;
child_allocation.height = child_height - 2 * border_width;
- gdk_window_resize (child->window, child_allocation.width, child_allocation.height);
+ gdk_window_resize (gtk_widget_get_window (child), child_allocation.width, child_allocation.height);
gtk_widget_size_allocate (child, &child_allocation);
}
@@ -605,19 +605,20 @@ pick_offscreen_child (GdkWindow *offscreen_window,
double widget_y,
GladeDesignLayout *layout)
{
- GtkAllocation child_area;
- double x, y;
-
if (layout->child && gtk_widget_get_visible (layout->child))
{
+ GtkAllocation child_area;
+ double x, y;
+
x = widget_x;
y = widget_y;
-g_message ("pick_offscreen_child");
- child_area = layout->child->allocation;
+ g_message ("pick_offscreen_child");
+ gtk_widget_get_allocation (layout->child, &child_area);
+
if (x >= 0 && x < child_area.width &&
y >= 0 && y < child_area.height)
- return layout->child->window;
+ return gtk_widget_get_window (layout->child);
}
return NULL;
@@ -646,16 +647,16 @@ child_realize (GtkWidget *widget, GtkWidget *parent)
gdk_window_set_user_data (new_window, parent);
- g_signal_connect (parent->window, "pick-embedded-child",
+ g_signal_connect (gtk_widget_get_window (parent), "pick-embedded-child",
G_CALLBACK (pick_offscreen_child), GLADE_DESIGN_LAYOUT (parent));
- gdk_offscreen_window_set_embedder (widget->window, parent->window);
- g_signal_connect (widget->window, "to-embedder",
+ gdk_offscreen_window_set_embedder (gtk_widget_get_window (widget), gtk_widget_get_window (parent));
+ g_signal_connect (gtk_widget_get_window (widget), "to-embedder",
G_CALLBACK (offscreen_window_to_parent), NULL);
- g_signal_connect (widget->window, "from-embedder",
+ g_signal_connect (gtk_widget_get_window (widget), "from-embedder",
G_CALLBACK (offscreen_window_from_parent), NULL);
- gtk_style_set_background (widget->style, new_window, GTK_STATE_NORMAL);
+ gtk_style_set_background (gtk_widget_get_style (widget), new_window, GTK_STATE_NORMAL);
gdk_window_show (new_window);
}
@@ -757,7 +758,7 @@ glade_design_layout_expose_event (GtkWidget *widget, GdkEventExpose *ev)
{
GladeDesignLayout *layout = GLADE_DESIGN_LAYOUT (widget);
- if (ev->window == widget->window)
+ if (ev->window == gtk_widget_get_window (widget))
{
GtkStyle *style;
GtkAllocation allocation;
@@ -788,7 +789,7 @@ glade_design_layout_expose_event (GtkWidget *widget, GdkEventExpose *ev)
if (child && gtk_widget_get_visible (child))
{
- GdkPixmap *child_pixmap = gdk_offscreen_window_get_pixmap (child->window);
+ GdkPixmap *child_pixmap = gdk_offscreen_window_get_pixmap (gtk_widget_get_window (child));
gdk_drawable_get_size (GDK_DRAWABLE (child_pixmap), &w, &h);
@@ -811,7 +812,7 @@ glade_design_layout_expose_event (GtkWidget *widget, GdkEventExpose *ev)
cairo_destroy (cr);
return TRUE;
}
- else if (ev->window == layout->child->window)
+ else if (ev->window == gtk_widget_get_window (layout->child))
{
g_message ("ev->window == layout->child->window");
}
@@ -908,7 +909,7 @@ static gboolean
glade_design_layout_damage (GtkWidget *widget, GdkEventExpose *event)
{
- gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+ gdk_window_invalidate_rect (gtk_widget_get_window (widget), NULL, FALSE);
return TRUE;
}
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index d79d462..37b0b4b 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -1108,7 +1108,6 @@ glade_eprop_flags_show_dialog (GtkWidget *button,
NULL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
/* HIG spacings */
@@ -1705,7 +1704,6 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
@@ -1952,7 +1950,6 @@ glade_editor_property_show_resource_dialog (GladeProject *project, GtkWidget *pa
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
@@ -2769,8 +2766,7 @@ glade_editor_property_show_object_dialog (GladeProject *project,
-1);
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
-
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
/* HIG settings */
@@ -2912,7 +2908,6 @@ glade_eprop_object_show_dialog (GtkWidget *dialog_button,
}
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
/* HIG settings */
@@ -3217,7 +3212,6 @@ glade_eprop_objects_show_dialog (GtkWidget *dialog_button,
g_free (title);
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c
index 21935e7..d525ee6 100644
--- a/gladeui/glade-editor.c
+++ b/gladeui/glade-editor.c
@@ -826,8 +826,7 @@ glade_editor_query_dialog (GladeEditor *editor, GladeWidget *widget)
title = g_strdup_printf (_("Create a %s"), widget->adaptor->name);
dialog = gtk_dialog_new_with_buttons (title, NULL,
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT |
- GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
@@ -1202,8 +1201,6 @@ glade_editor_reset_dialog (GladeEditor *editor)
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
diff --git a/gladeui/glade-inspector.c b/gladeui/glade-inspector.c
index 64fbb8e..9fd6495 100644
--- a/gladeui/glade-inspector.c
+++ b/gladeui/glade-inspector.c
@@ -318,7 +318,7 @@ search_entry_key_press_event_cb (GtkEntry *entry,
GladeInspectorPrivate *priv = inspector->priv;
const gchar *str;
- if (event->keyval == GDK_Tab)
+ if (event->keyval == GDK_KEY_Tab)
{
if (event->state & GDK_CONTROL_MASK)
{
@@ -332,7 +332,7 @@ search_entry_key_press_event_cb (GtkEntry *entry,
return TRUE;
}
- if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)
+ if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)
{
GladeWidget *widget;
GList *list;
diff --git a/gladeui/glade-named-icon-chooser-dialog.c b/gladeui/glade-named-icon-chooser-dialog.c
index 0c33aba..d347950 100644
--- a/gladeui/glade-named-icon-chooser-dialog.c
+++ b/gladeui/glade-named-icon-chooser-dialog.c
@@ -1365,8 +1365,6 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Named Icon Chooser"));
gtk_window_set_default_size (GTK_WINDOW (dialog), 610, 480);
-
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index dd7d162..8527b56 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -4182,8 +4182,6 @@ glade_project_build_prefs_dialog (GladeProject *project)
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
/* HIG spacings */
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); /* 2 * 5 + 2 = 12 */
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index 705f404..ad3388d 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -2172,12 +2172,12 @@ glade_utils_hijack_key_press (GtkWindow *win,
focus_widget = gtk_window_get_focus (win);
if (focus_widget &&
- (event->keyval == GDK_Delete || /* Filter Delete from accelerator keys */
+ (event->keyval == GDK_KEY_Delete || /* Filter Delete from accelerator keys */
((event->state & GDK_CONTROL_MASK) && /* CNTL keys... */
- ((event->keyval == GDK_c || event->keyval == GDK_C) || /* CNTL-C (copy) */
- (event->keyval == GDK_x || event->keyval == GDK_X) || /* CNTL-X (cut) */
- (event->keyval == GDK_v || event->keyval == GDK_V) || /* CNTL-V (paste) */
- (event->keyval == GDK_n || event->keyval == GDK_N))))) /* CNTL-N (new project) */
+ ((event->keyval == GDK_KEY_c || event->keyval == GDK_KEY_C) || /* CNTL-C (copy) */
+ (event->keyval == GDK_KEY_x || event->keyval == GDK_KEY_X) || /* CNTL-X (cut) */
+ (event->keyval == GDK_KEY_v || event->keyval == GDK_KEY_V) || /* CNTL-V (paste) */
+ (event->keyval == GDK_KEY_n || event->keyval == GDK_KEY_N))))) /* CNTL-N (new project) */
{
return gtk_widget_event (focus_widget,
(GdkEvent *)event);
diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c
index 44bcc75..3b52962 100644
--- a/plugins/gtk+/glade-accels.c
+++ b/plugins/gtk+/glade-accels.c
@@ -539,8 +539,6 @@ glade_eprop_accel_show_dialog (GtkWidget *dialog_button,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
diff --git a/plugins/gtk+/glade-attributes.c b/plugins/gtk+/glade-attributes.c
index 0d945a5..836b2ef 100755
--- a/plugins/gtk+/glade-attributes.c
+++ b/plugins/gtk+/glade-attributes.c
@@ -1031,8 +1031,6 @@ glade_eprop_attrs_show_dialog (GtkWidget *dialog_button,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
diff --git a/plugins/gtk+/glade-column-types.c b/plugins/gtk+/glade-column-types.c
index 8b3b72b..f0b5d15 100644
--- a/plugins/gtk+/glade-column-types.c
+++ b/plugins/gtk+/glade-column-types.c
@@ -358,7 +358,7 @@ eprop_treeview_key_press (GtkWidget *treeview,
GValue value = { 0, };
gchar *column_name;
- if (event->keyval == GDK_Delete &&
+ if (event->keyval == GDK_KEY_Delete &&
gtk_tree_selection_get_selected (eprop_types->selection, NULL, &iter))
{
gtk_tree_model_get (GTK_TREE_MODEL (eprop_types->store), &iter,
@@ -398,7 +398,7 @@ eprop_treeview_key_press (GtkWidget *treeview,
}
- return (event->keyval == GDK_Delete);
+ return (event->keyval == GDK_KEY_Delete);
}
static gboolean
diff --git a/plugins/gtk+/glade-model-data.c b/plugins/gtk+/glade-model-data.c
index f17ff2e..2b3351b 100644
--- a/plugins/gtk+/glade-model-data.c
+++ b/plugins/gtk+/glade-model-data.c
@@ -480,13 +480,13 @@ eprop_treeview_key_press (GtkWidget *treeview,
GdkEventKey *event,
GladeEditorProperty *eprop)
{
- if (event->keyval == GDK_Delete)
+ if (event->keyval == GDK_KEY_Delete)
{
glade_eprop_model_data_delete_selected (eprop);
return TRUE;
}
else if ((event->state & GDK_CONTROL_MASK) != 0 &&
- (event->keyval == GDK_n || event->keyval == GDK_N))
+ (event->keyval == GDK_KEY_n || event->keyval == GDK_KEY_N))
{
glade_eprop_model_data_add_row (eprop);
return TRUE;
diff --git a/plugins/gtk+/glade-text-button.c b/plugins/gtk+/glade-text-button.c
index 9f77a15..0961c05 100644
--- a/plugins/gtk+/glade-text-button.c
+++ b/plugins/gtk+/glade-text-button.c
@@ -104,7 +104,7 @@ glade_text_button_key_press_event (GtkEntry *entry,
GdkEventKey *key_event,
GladeTextButton *button)
{
- if (key_event->keyval == GDK_Escape)
+ if (key_event->keyval == GDK_KEY_Escape)
{
g_object_get (entry,
"editing-canceled", TRUE,
@@ -116,7 +116,7 @@ glade_text_button_key_press_event (GtkEntry *entry,
}
/* override focus */
- if (key_event->keyval == GDK_Up || key_event->keyval == GDK_Down)
+ if (key_event->keyval == GDK_KEY_Up || key_event->keyval == GDK_KEY_Down)
{
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (button));
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (button));
diff --git a/src/glade-window.c b/src/glade-window.c
index f88c55e..97e1645 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2177,8 +2177,9 @@ menu_item_selected_cb (GtkWidget *item, GladeWindow *window)
g_free (tooltip);
}
+/* FIXME: GtkItem does not exist anymore? */
static void
-menu_item_deselected_cb (GtkItem *item, GladeWindow *window)
+menu_item_deselected_cb (gpointer item, GladeWindow *window)
{
gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar),
window->priv->statusbar_menu_context_id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]