[libgda/gtk3] Removed GTK version checks
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/gtk3] Removed GTK version checks
- Date: Tue, 15 Jun 2010 19:07:22 +0000 (UTC)
commit e30cbff3a6a56235f088cc6b0c9d9f24b6602160
Author: Vivien Malerba <malerba gnome-db org>
Date: Tue Jun 15 21:03:14 2010 +0200
Removed GTK version checks
the GTK_CHECK_VERSION() were necessary to ensure
it worked correctly with versions as old as 2.12 and
are not necessary anymore with GTK-3
control-center/cc-gray-bar.c | 43 +-
control-center/dsn-properties-dialog.c | 6 +-
control-center/gdaui-login-dialog.c | 7 +-
libgda-ui/data-entries/gdaui-entry-bin.c | 9 +-
libgda-ui/data-entries/gdaui-entry-common-time.c | 21 +-
libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c | 20 -
libgda-ui/data-entries/plugins/gdaui-entry-pict.c | 8 +-
libgda-ui/demos/basic_form.c | 4 -
libgda-ui/demos/cloud.c | 4 -
libgda-ui/demos/combo.c | 4 -
libgda-ui/demos/data_model_dir.c | 4 -
libgda-ui/demos/ddl_queries.c | 20 +-
libgda-ui/demos/form.c | 4 -
libgda-ui/demos/form_data_layout.c | 4 -
libgda-ui/demos/form_pict.c | 4 -
libgda-ui/demos/form_rw.c | 4 -
libgda-ui/demos/grid.c | 4 -
libgda-ui/demos/grid_data_layout.c | 4 -
libgda-ui/demos/grid_pict.c | 4 -
libgda-ui/demos/grid_rw.c | 4 -
libgda-ui/demos/linked_grid_form.c | 4 -
libgda-ui/demos/linked_model_param.c | 4 -
libgda-ui/demos/login.c | 4 -
libgda-ui/demos/provider_sel.c | 5 -
libgda-ui/demos/tree.c | 8 -
libgda-ui/gdaui-basic-form.c | 10 -
libgda-ui/gdaui-cloud.c | 10 +-
libgda-ui/gdaui-data-filter.c | 10 +-
libgda-ui/gdaui-login.c | 4 -
libgda-ui/gdaui-raw-form.c | 28 +-
libgda-ui/gdaui-raw-grid.c | 37 +-
libgda-ui/gdaui-server-operation.c | 4 -
libgda-ui/internal/popup-container.c | 15 +-
libgda-ui/internal/utility.c | 6 +-
tools/browser/auth-dialog.c | 11 +-
tools/browser/browser-spinner.c | 909 +-------------------
tools/browser/browser-spinner.h | 74 +--
tools/browser/canvas-example.c | 8 -
tools/browser/canvas/browser-canvas-column.c | 6 +-
tools/browser/canvas/browser-canvas-db-relations.c | 9 +-
tools/browser/canvas/browser-canvas-table.c | 6 +-
tools/browser/canvas/browser-canvas.c | 33 +-
tools/browser/common/gdaui-entry-import.c | 6 +-
tools/browser/common/objects-cloud.c | 10 +-
tools/browser/connection-binding-properties.c | 7 +-
.../browser/data-manager/data-favorite-selector.c | 13 -
tools/browser/data-manager/data-widget.c | 4 -
tools/browser/login-dialog.c | 10 +-
tools/browser/query-exec/query-console.c | 7 -
tools/browser/query-exec/query-editor.c | 6 +-
tools/browser/query-exec/query-favorite-selector.c | 15 +-
tools/browser/schema-browser/favorite-selector.c | 11 +-
tools/browser/schema-browser/table-columns.c | 10 +-
tools/browser/schema-browser/table-info.c | 7 +-
tools/browser/support.c | 15 +-
55 files changed, 49 insertions(+), 1459 deletions(-)
---
diff --git a/control-center/cc-gray-bar.c b/control-center/cc-gray-bar.c
index a373977..46f77f7 100644
--- a/control-center/cc-gray-bar.c
+++ b/control-center/cc-gray-bar.c
@@ -1,6 +1,6 @@
/* GNOME DB library
*
- * Copyright (C) 1999 - 2009 The GNOME Foundation.
+ * Copyright (C) 1999 - 2010 The GNOME Foundation.
*
* AUTHORS:
* Rodrigo Moya <rodrigo gnome-db org>
@@ -75,27 +75,16 @@ cc_gray_bar_realize (GtkWidget *widget)
{
gint border_width;
-#if GTK_CHECK_VERSION (2,19,5)
gtk_widget_set_realized (widget, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-#endif
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
GdkWindowAttr attributes;
gint attributes_mask;
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation alloc;
gtk_widget_get_allocation (widget, &alloc);
attributes.x = alloc.x + border_width;
attributes.y = alloc.y + border_width;
attributes.width = alloc.width - 2*border_width;
attributes.height = alloc.height - 2*border_width;
-#else
- attributes.x = widget->allocation.x + border_width;
- attributes.y = widget->allocation.y + border_width;
- attributes.width = widget->allocation.width - 2*border_width;
- attributes.height = widget->allocation.height - 2*border_width;
-#endif
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
@@ -112,11 +101,7 @@ cc_gray_bar_realize (GtkWidget *widget)
GdkWindow *win;
win = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_window (widget, win);
-#else
- widget->window = win;
-#endif
gdk_window_set_user_data (win, widget);
GtkStyle *style;
@@ -158,11 +143,7 @@ cc_gray_bar_allocate (GtkWidget *widget, GtkAllocation *allocation)
guint bw;
GdkWindow *win;
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_allocation (widget, allocation);
-#else
- widget->allocation = *allocation;
-#endif
bin = GTK_BIN (widget);
@@ -172,11 +153,7 @@ cc_gray_bar_allocate (GtkWidget *widget, GtkAllocation *allocation)
child_allocation.width = MAX (allocation->width - bw * 2, 0);
child_allocation.height = MAX (allocation->height - bw * 2, 0);
-#if GTK_CHECK_VERSION(2,18,0)
win = gtk_widget_get_window (widget);
-#else
- win = widget->window;
-#endif
if (win) {
gdk_window_move_resize (win,
allocation->x + bw,
@@ -215,11 +192,7 @@ cc_gray_bar_paint (GtkWidget *widget, GdkRectangle *area)
{
gboolean paintable;
-#if GTK_CHECK_VERSION(2,18,0)
paintable = gtk_widget_get_app_paintable (widget);
-#else
- paintable = GTK_WIDGET_APP_PAINTABLE (widget);
-#endif
if (!paintable) {
GtkStyle *style;
GdkWindow *win;
@@ -227,15 +200,9 @@ cc_gray_bar_paint (GtkWidget *widget, GdkRectangle *area)
GtkStateType state;
style = gtk_widget_get_style (widget);
-#if GTK_CHECK_VERSION(2,18,0)
state = gtk_widget_get_state (widget);
win = gtk_widget_get_window (widget);
gtk_widget_get_allocation (widget, &alloc);
-#else
- state = widget->state;
- win = widget->window;
- alloc = widget->allocation;
-#endif
gtk_paint_flat_box (style, win,
state, GTK_SHADOW_NONE,
area, widget, "gnomedbgraybar",
@@ -255,11 +222,7 @@ cc_gray_bar_expose (GtkWidget *widget, GdkEventExpose *event)
if (event->count > 0)
return FALSE;
-#if GTK_CHECK_VERSION(2,18,0)
drawable = gtk_widget_is_drawable (widget);
-#else
- drawable = GTK_WIDGET_DRAWABLE (widget);
-#endif
if (drawable) {
cc_gray_bar_paint (widget, &event->area);
@@ -311,11 +274,7 @@ cc_gray_bar_class_init (CcGrayBarClass *klass)
static void
cc_gray_bar_init (CcGrayBar *bar, CcGrayBarClass *klass)
{
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_has_window (GTK_WIDGET (bar), TRUE);
-#else
- GTK_WIDGET_UNSET_FLAGS (bar, GTK_NO_WINDOW);
-#endif
bar->priv = g_new0 (CcGrayBarPrivate, 1);
diff --git a/control-center/dsn-properties-dialog.c b/control-center/dsn-properties-dialog.c
index 0cdec75..3ac355c 100644
--- a/control-center/dsn-properties-dialog.c
+++ b/control-center/dsn-properties-dialog.c
@@ -1,5 +1,5 @@
/* GNOME-DB Components
- * Copyright (C) 2000 - 2009 The GNOME Foundation.
+ * Copyright (C) 2000 - 2010 The GNOME Foundation.
*
* AUTHORS:
* Rodrigo Moya <rodrigo gnome-db org>
@@ -161,11 +161,7 @@ dsn_properties_dialog (GtkWindow *parent, const gchar *dsn)
g_free (str);
GtkWidget *dcontents;
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
- dcontents = GTK_DIALOG (dialog)->vbox;
-#endif
gtk_container_set_border_width (GTK_CONTAINER (dcontents), 5);
gtk_box_pack_start (GTK_BOX (dcontents), label, FALSE, FALSE, 0);
gtk_widget_show (label);
diff --git a/control-center/gdaui-login-dialog.c b/control-center/gdaui-login-dialog.c
index 7f7dcfa..81a0665 100644
--- a/control-center/gdaui-login-dialog.c
+++ b/control-center/gdaui-login-dialog.c
@@ -1,5 +1,5 @@
/* GNOME DB library
- * Copyright (C) 1999 - 2009 The GNOME Foundation.
+ * Copyright (C) 1999 - 2010 The GNOME Foundation.
*
* AUTHORS:
* Rodrigo Moya <rodrigo gnome-db org>
@@ -103,12 +103,7 @@ gdaui_login_dialog_init (GdauiLoginDialog *dialog, GdauiLoginDialogClass *klass)
g_return_if_fail (GDAUI_IS_LOGIN_DIALOG (dialog));
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
- dcontents = GTK_DIALOG (dialog)->vbox;
-#endif
-
dialog->priv = g_new0 (GdauiLoginDialogPrivate, 1);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
diff --git a/libgda-ui/data-entries/gdaui-entry-bin.c b/libgda-ui/data-entries/gdaui-entry-bin.c
index 4aba67c..4fe473f 100644
--- a/libgda-ui/data-entries/gdaui-entry-bin.c
+++ b/libgda-ui/data-entries/gdaui-entry-bin.c
@@ -1,6 +1,6 @@
/* gdaui-entry-bin.c
*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -332,19 +332,12 @@ popup_position (PopupContainer *container, gint *out_x, gint *out_y)
gtk_widget_size_request (poswidget, &req);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_origin (gtk_widget_get_window (poswidget), &x, &y);
GtkAllocation alloc;
gtk_widget_get_allocation (poswidget, &alloc);
x += alloc.x;
y += alloc.y;
y += alloc.height;
-#else
- gdk_window_get_origin (poswidget->window, &x, &y);
- x += poswidget->allocation.x;
- y += poswidget->allocation.y;
- y += poswidget->allocation.height;
-#endif
if (x < 0)
x = 0;
diff --git a/libgda-ui/data-entries/gdaui-entry-common-time.c b/libgda-ui/data-entries/gdaui-entry-common-time.c
index a8e4e81..18d94fc 100644
--- a/libgda-ui/data-entries/gdaui-entry-common-time.c
+++ b/libgda-ui/data-entries/gdaui-entry-common-time.c
@@ -1,6 +1,6 @@
/* gdaui-entry-common-time.c
*
- * Copyright (C) 2003 - 2007 Vivien Malerba
+ * Copyright (C) 2003 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -892,13 +892,8 @@ date_calendar_choose_cb (GtkWidget *button, GdauiEntryCommonTime *mgtim)
/* popup window */
/* Temporarily grab pointer and keyboard, copied from GnomeDateEdit */
-#if GTK_CHECK_VERSION(2,18,0)
if (!popup_grab_on_window (gtk_widget_get_window (button), gtk_get_current_event_time ()))
return;
-#else
- if (!popup_grab_on_window (button->window, gtk_get_current_event_time ()))
- return;
-#endif
position_popup (mgtim);
gtk_grab_add (mgtim->priv->window);
@@ -940,13 +935,8 @@ date_calendar_choose_cb (GtkWidget *button, GdauiEntryCommonTime *mgtim)
gtk_window_move (GTK_WINDOW (mgtim->priv->window), root_x, root_y);
gtk_widget_grab_focus (mgtim->priv->date);
-#if GTK_CHECK_VERSION(2,18,0)
popup_grab_on_window (gtk_widget_get_window (mgtim->priv->window),
gtk_get_current_event_time ());
-#else
- popup_grab_on_window (mgtim->priv->window->window,
- gtk_get_current_event_time ());
-#endif
}
static gboolean
@@ -976,7 +966,6 @@ position_popup (GdauiEntryCommonTime *mgtim)
gtk_widget_size_request (mgtim->priv->window, &req);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_origin (gtk_widget_get_window (mgtim->priv->date_button), &x, &y);
GtkAllocation alloc;
gtk_widget_get_allocation (mgtim->priv->date_button, &alloc);
@@ -984,14 +973,6 @@ position_popup (GdauiEntryCommonTime *mgtim)
y += alloc.y;
bwidth = alloc.width;
bheight = alloc.height;
-#else
- gdk_window_get_origin (mgtim->priv->date_button->window, &x, &y);
-
- x += mgtim->priv->date_button->allocation.x;
- y += mgtim->priv->date_button->allocation.y;
- bwidth = mgtim->priv->date_button->allocation.width;
- bheight = mgtim->priv->date_button->allocation.height;
-#endif
x += bwidth - req.width;
y += bheight;
diff --git a/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
index 2bd9f69..cbdbbc6 100644
--- a/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
@@ -223,25 +223,14 @@ toggle_button_on_toggled (GtkToggleButton *toggle_button,
gint x, y, width, height;
-#if GTK_CHECK_VERSION(2,18,0)
gdkwin = gtk_widget_get_window (GTK_WIDGET(cgrid));
-#else
- gdkwin = GDK_WINDOW (GTK_WIDGET(cgrid)->window);
-#endif
gdk_window_get_origin (gdkwin, &x, &y);
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation alloc;
gtk_widget_get_allocation (GTK_WIDGET (cgrid), &alloc);
x += alloc.x;
width = alloc.width;
height = alloc.height;
-#else
- x += GTK_WIDGET (cgrid)->allocation.x;
-/* y += cgrid->priv->entry->allocation.y; */
- width = GTK_WIDGET (cgrid)->allocation.width;
- height = GTK_WIDGET (cgrid)->allocation.height;
-#endif
/* x += width - requisition.width; */
y += height;
@@ -251,22 +240,13 @@ toggle_button_on_toggled (GtkToggleButton *toggle_button,
gtk_grab_add (window_popup);
gtk_window_move (GTK_WINDOW(window_popup), x, y);
gtk_widget_set_size_request (window_popup,
-#if GTK_CHECK_VERSION(2,18,0)
alloc.width,
-#else
- GTK_WIDGET(cgrid)->allocation.width,
-#endif
((y + cgrid->priv->grid_height) > gdk_screen_height ()) ? gdk_screen_height () - y : cgrid->priv->grid_height);
gtk_widget_show (window_popup);
gtk_widget_grab_focus (cgrid->priv->tree_view);
-#if GTK_CHECK_VERSION(2,18,0)
popup_grab_on_window (gtk_widget_get_window (window_popup),
gtk_get_current_event_time ());
-#else
- popup_grab_on_window (window_popup->window,
- gtk_get_current_event_time ());
-#endif
}
}
diff --git a/libgda-ui/data-entries/plugins/gdaui-entry-pict.c b/libgda-ui/data-entries/plugins/gdaui-entry-pict.c
index 08d7801..4084304 100644
--- a/libgda-ui/data-entries/plugins/gdaui-entry-pict.c
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-pict.c
@@ -1,6 +1,6 @@
/* gdaui-entry-pict.c
*
- * Copyright (C) 2006 - 2009 Vivien Malerba
+ * Copyright (C) 2006 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -378,16 +378,10 @@ display_image (GdauiEntryPict *mgpict, const GValue *value, const gchar *error_s
PictAllocation alloc;
GError *error = NULL;
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation walloc;
gtk_widget_get_allocation (mgpict->priv->sw, &walloc);
alloc.width = walloc.width;
alloc.height = walloc.height;
-#else
- alloc.width = mgpict->priv->sw->allocation.width;
- alloc.height = mgpict->priv->sw->allocation.height;
-#endif
-
alloc.width = MAX (alloc.width, 10);
alloc.height = MAX (alloc.height, 10);
diff --git a/libgda-ui/demos/basic_form.c b/libgda-ui/demos/basic_form.c
index eae99cd..92e76b5 100644
--- a/libgda-ui/demos/basic_form.c
+++ b/libgda-ui/demos/basic_form.c
@@ -30,12 +30,8 @@ do_basic_form (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("This example shows 2 GdauiBasicForm widgets operating on the\n"
diff --git a/libgda-ui/demos/cloud.c b/libgda-ui/demos/cloud.c
index f3cd3ba..c054a9a 100644
--- a/libgda-ui/demos/cloud.c
+++ b/libgda-ui/demos/cloud.c
@@ -86,12 +86,8 @@ do_cloud (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiCloud widget displays customers,\n"
diff --git a/libgda-ui/demos/combo.c b/libgda-ui/demos/combo.c
index 5b40ec0..596541d 100644
--- a/libgda-ui/demos/combo.c
+++ b/libgda-ui/demos/combo.c
@@ -99,12 +99,8 @@ do_combo (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiCombo widget displays customers");
diff --git a/libgda-ui/demos/data_model_dir.c b/libgda-ui/demos/data_model_dir.c
index 8aba369..2b0c150 100644
--- a/libgda-ui/demos/data_model_dir.c
+++ b/libgda-ui/demos/data_model_dir.c
@@ -61,12 +61,8 @@ do_data_model_dir (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiForm widget displays data from a GdaDataModelDir "
diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
index 90788c8..91b92c1 100644
--- a/libgda-ui/demos/ddl_queries.c
+++ b/libgda-ui/demos/ddl_queries.c
@@ -74,12 +74,8 @@ do_ddl_queries (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
table = gtk_table_new (3, 2, FALSE);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
table, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), table, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
label = gtk_label_new ("<b>Tested provider and operation:</b>");
@@ -417,12 +413,8 @@ show_named_parameters (GtkButton *button, DemoData *data)
label = gtk_label_new ("<b>Named parameters:</b>\n");
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION(2,18,0)
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
- label, FALSE, FALSE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), label, FALSE, FALSE, 0);
-#endif
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
+ label, FALSE, FALSE, 0);
gtk_widget_show (label);
/* text area */
@@ -448,12 +440,8 @@ show_named_parameters (GtkButton *button, DemoData *data)
gtk_container_add (GTK_CONTAINER (sw), view);
gtk_widget_show_all (sw);
-#if GTK_CHECK_VERSION(2,18,0)
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
- sw, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
-#endif
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
+ sw, TRUE, TRUE, 0);
gtk_widget_set_size_request (dlg, 530, 350);
gtk_dialog_run (GTK_DIALOG (dlg));
diff --git a/libgda-ui/demos/form.c b/libgda-ui/demos/form.c
index 6d63e7f..15532dd 100644
--- a/libgda-ui/demos/form.c
+++ b/libgda-ui/demos/form.c
@@ -33,12 +33,8 @@ do_form (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiForm widget displays data from the 'products' table.\n\n"
diff --git a/libgda-ui/demos/form_data_layout.c b/libgda-ui/demos/form_data_layout.c
index 032fe0b..d4995a2 100644
--- a/libgda-ui/demos/form_data_layout.c
+++ b/libgda-ui/demos/form_data_layout.c
@@ -35,12 +35,8 @@ do_form_data_layout (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiForm widget displays information about customers,\n"
diff --git a/libgda-ui/demos/form_pict.c b/libgda-ui/demos/form_pict.c
index e4cc1f2..64462a2 100644
--- a/libgda-ui/demos/form_pict.c
+++ b/libgda-ui/demos/form_pict.c
@@ -37,12 +37,8 @@ do_form_pict (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiForm widget displays data from the 'pictures' table.\n\n"
diff --git a/libgda-ui/demos/form_rw.c b/libgda-ui/demos/form_rw.c
index aa15f9c..b90f258 100644
--- a/libgda-ui/demos/form_rw.c
+++ b/libgda-ui/demos/form_rw.c
@@ -33,12 +33,8 @@ do_form_rw (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiForm widget displays data from the 'products' table.\n\n"
diff --git a/libgda-ui/demos/grid.c b/libgda-ui/demos/grid.c
index 69fe21f..cd9ee43 100644
--- a/libgda-ui/demos/grid.c
+++ b/libgda-ui/demos/grid.c
@@ -33,12 +33,8 @@ do_grid (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiGrid widget displays data from the 'products' table.\n\n"
diff --git a/libgda-ui/demos/grid_data_layout.c b/libgda-ui/demos/grid_data_layout.c
index 2c55387..f775653 100644
--- a/libgda-ui/demos/grid_data_layout.c
+++ b/libgda-ui/demos/grid_data_layout.c
@@ -36,12 +36,8 @@ do_grid_data_layout (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiGrid widget displays information about customers,\n"
diff --git a/libgda-ui/demos/grid_pict.c b/libgda-ui/demos/grid_pict.c
index 3eb305b..1e30c5c 100644
--- a/libgda-ui/demos/grid_pict.c
+++ b/libgda-ui/demos/grid_pict.c
@@ -37,12 +37,8 @@ do_grid_pict (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiGrid widget displays data from the 'pictures' table.\n\n"
diff --git a/libgda-ui/demos/grid_rw.c b/libgda-ui/demos/grid_rw.c
index 459d417..309526e 100644
--- a/libgda-ui/demos/grid_rw.c
+++ b/libgda-ui/demos/grid_rw.c
@@ -33,12 +33,8 @@ do_grid_rw (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiGrid widget displays data from the 'products' table.\n\n"
diff --git a/libgda-ui/demos/linked_grid_form.c b/libgda-ui/demos/linked_grid_form.c
index 4cae576..fc23096 100644
--- a/libgda-ui/demos/linked_grid_form.c
+++ b/libgda-ui/demos/linked_grid_form.c
@@ -90,12 +90,8 @@ do_linked_grid_form (GtkWidget *do_widget)
g_object_set_data_full (G_OBJECT (window), "demodata", data, g_free);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("The following GdauiForm and GdauiGrid widgets\n"
diff --git a/libgda-ui/demos/linked_model_param.c b/libgda-ui/demos/linked_model_param.c
index 06b4ba4..f3e9c30 100644
--- a/libgda-ui/demos/linked_model_param.c
+++ b/libgda-ui/demos/linked_model_param.c
@@ -45,12 +45,8 @@ do_linked_model_param (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new ("");
diff --git a/libgda-ui/demos/login.c b/libgda-ui/demos/login.c
index d52eb96..528063d 100644
--- a/libgda-ui/demos/login.c
+++ b/libgda-ui/demos/login.c
@@ -78,12 +78,8 @@ do_login (GtkWidget *do_widget)
table = gtk_table_new (3, 2, FALSE);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
table, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), table, TRUE, TRUE, 0);
-#endif
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
/* Create the login widget */
diff --git a/libgda-ui/demos/provider_sel.c b/libgda-ui/demos/provider_sel.c
index 5a9d5fd..a7ed1a5 100644
--- a/libgda-ui/demos/provider_sel.c
+++ b/libgda-ui/demos/provider_sel.c
@@ -32,12 +32,7 @@ do_provider_sel (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
-
-#if GTK_CHECK_VERSION(2,18,0)
vbox = gtk_dialog_get_content_area (GTK_DIALOG (window));
-#else
- vbox = GTK_DIALOG (window)->vbox;
-#endif
/* Create the widget */
label = gtk_label_new ("Provider selector:");
diff --git a/libgda-ui/demos/tree.c b/libgda-ui/demos/tree.c
index 8c557c2..9f04dcb 100644
--- a/libgda-ui/demos/tree.c
+++ b/libgda-ui/demos/tree.c
@@ -126,12 +126,8 @@ do_tree (GtkWidget *do_widget)
"feeds it to a GdauiTreeStore (which implements the GtkTreeModel\n"
"interface, and creates a GtkTreeView to display the contents\n"
"of the GdaTree");
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
label, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), label, TRUE, TRUE, 0);
-#endif
/* create GdaTree */
tree = gda_tree_new ();
@@ -152,12 +148,8 @@ do_tree (GtkWidget *do_widget)
G_TYPE_BOOLEAN, "scale-set");
treeview = gtk_tree_view_new_with_model (model);
g_object_unref (model);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
treeview, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), treeview, TRUE, TRUE, 0);
-#endif
/* create GtkTreeView's column */
enum {
diff --git a/libgda-ui/gdaui-basic-form.c b/libgda-ui/gdaui-basic-form.c
index 13e535b..95fd3fe 100644
--- a/libgda-ui/gdaui-basic-form.c
+++ b/libgda-ui/gdaui-basic-form.c
@@ -1906,27 +1906,17 @@ gdaui_basic_form_new_in_dialog (GdaSet *data_set, GtkWindow *parent,
str = g_markup_printf_escaped ("<b>%s:</b>", header);
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
label, FALSE, FALSE, SPACING);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), label, FALSE, FALSE, SPACING);
-#endif
gtk_widget_show (label);
}
gboolean can_expand;
g_object_get ((GObject*) form, "can-expand", &can_expand, NULL);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_container_set_border_width (GTK_CONTAINER (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg)))), 4);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), form,
can_expand, can_expand, 10);
-#else
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), 4);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), form,
- can_expand, can_expand, 10);
-#endif
g_signal_connect (G_OBJECT (form), "holder-changed",
G_CALLBACK (form_holder_changed), dlg);
diff --git a/libgda-ui/gdaui-cloud.c b/libgda-ui/gdaui-cloud.c
index 31956d7..d38c21f 100644
--- a/libgda-ui/gdaui-cloud.c
+++ b/libgda-ui/gdaui-cloud.c
@@ -1,6 +1,6 @@
/* gdaui-cloud.c
*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -727,11 +727,7 @@ visibility_notify_event (GtkWidget *text_view, GdkEventVisibility *event, GdauiC
{
gint wx, wy, bx, by;
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_pointer (gtk_widget_get_window (text_view), &wx, &wy, NULL);
-#else
- gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
-#endif
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
GTK_TEXT_WINDOW_WIDGET,
@@ -756,11 +752,7 @@ motion_notify_event (GtkWidget *text_view, GdkEventMotion *event, GdauiCloud *cl
set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y, cloud);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
-#else
- gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
-#endif
return FALSE;
}
diff --git a/libgda-ui/gdaui-data-filter.c b/libgda-ui/gdaui-data-filter.c
index 7e7dc69..b9841c7 100644
--- a/libgda-ui/gdaui-data-filter.c
+++ b/libgda-ui/gdaui-data-filter.c
@@ -1,6 +1,6 @@
/* gdaui-data-filter.c
*
- * Copyright (C) 2007 - 2009 Vivien Malerba
+ * Copyright (C) 2007 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -117,11 +117,7 @@ set_wait_cursor (GtkWidget *w)
if (parent) {
GdkCursor* cursor;
cursor = gdk_cursor_new (GDK_WATCH);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_set_cursor (gtk_widget_get_window (parent), cursor);
-#else
- gdk_window_set_cursor (parent->window, cursor);
-#endif
gdk_cursor_unref (cursor);
}
}
@@ -133,11 +129,7 @@ unset_wait_cursor (GtkWidget *w)
parent = gtk_widget_get_toplevel (w);
if (parent)
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_set_cursor (gtk_widget_get_window (parent), NULL);
-#else
- gdk_window_set_cursor (parent->window, NULL);
-#endif
}
static void
diff --git a/libgda-ui/gdaui-login.c b/libgda-ui/gdaui-login.c
index def52e4..42d2d2c 100644
--- a/libgda-ui/gdaui-login.c
+++ b/libgda-ui/gdaui-login.c
@@ -388,11 +388,7 @@ run_cc_cb (GtkButton *button, GdauiLogin *login)
if (!sresult) {
GtkWidget *msgdialog;
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (login));
-#if GTK_CHECK_VERSION(2,18,0)
if (!gtk_widget_is_toplevel (toplevel))
-#else
- if (!GTK_WIDGET_TOPLEVEL (toplevel))
-#endif
toplevel = NULL;
msgdialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel), GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
diff --git a/libgda-ui/gdaui-raw-form.c b/libgda-ui/gdaui-raw-form.c
index 263a358..a02890c 100644
--- a/libgda-ui/gdaui-raw-form.c
+++ b/libgda-ui/gdaui-raw-form.c
@@ -1,6 +1,6 @@
/* gdaui-raw-form.c
*
- * Copyright (C) 2002 - 2009 Vivien Malerba <malerba gnome-db org>
+ * Copyright (C) 2002 - 2010 Vivien Malerba <malerba gnome-db org>
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -787,11 +787,7 @@ filter_position_func (GtkWidget *widget,
gint monitor_num;
GdkRectangle monitor;
-#if GTK_CHECK_VERSION(2,18,0)
window = gtk_widget_get_window (widget);
-#else
- window = widget->window;
-#endif
screen = gdk_drawable_get_screen (window);
monitor_num = gdk_screen_get_monitor_at_window (screen, window);
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
@@ -856,15 +852,9 @@ action_filter_cb (GtkAction *action, GdauiRawForm *form)
gtk_widget_set_events (form->priv->filter_window,
gtk_widget_get_events (form->priv->filter_window) | GDK_KEY_PRESS_MASK);
-#if GTK_CHECK_VERSION(2,18,0)
if (gtk_widget_is_toplevel (toplevel) && gtk_window_get_group ((GtkWindow*) toplevel))
gtk_window_group_add_window (gtk_window_get_group ((GtkWindow*) toplevel),
GTK_WINDOW (form->priv->filter_window));
-#else
- if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_WINDOW (toplevel)->group)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
- GTK_WINDOW (form->priv->filter_window));
-#endif
g_signal_connect (form->priv->filter_window, "delete-event",
G_CALLBACK (filter_event), form);
@@ -889,7 +879,6 @@ action_filter_cb (GtkAction *action, GdauiRawForm *form)
}
gtk_container_add (GTK_CONTAINER (vbox), form->priv->filter);
}
-#if GTK_CHECK_VERSION(2,18,0)
else if (gtk_widget_is_toplevel (toplevel)) {
if (gtk_window_get_group ((GtkWindow*) toplevel))
gtk_window_group_add_window (gtk_window_get_group ((GtkWindow*) toplevel),
@@ -898,29 +887,14 @@ action_filter_cb (GtkAction *action, GdauiRawForm *form)
gtk_window_group_remove_window (gtk_window_get_group ((GtkWindow*) form->priv->filter_window),
GTK_WINDOW (form->priv->filter_window));
}
-#else
- else if (GTK_WIDGET_TOPLEVEL (toplevel)) {
- if (GTK_WINDOW (toplevel)->group)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
- GTK_WINDOW (form->priv->filter_window));
- else if (GTK_WINDOW (form->priv->filter_window)->group)
- gtk_window_group_remove_window (GTK_WINDOW (form->priv->filter_window)->group,
- GTK_WINDOW (form->priv->filter_window));
- }
-#endif
/* move the filter window to a correct location */
/* FIXME: let the user specify the position function like GtkTreeView -> search_position_func() */
gtk_grab_add (form->priv->filter_window);
filter_position_func (GTK_WIDGET (form), form->priv->filter_window, NULL);
gtk_widget_show (form->priv->filter_window);
-#if GTK_CHECK_VERSION(2,18,0)
popup_grab_on_window (gtk_widget_get_window (form->priv->filter_window),
gtk_get_current_event_time ());
-#else
- popup_grab_on_window (form->priv->filter_window->window,
- gtk_get_current_event_time ());
-#endif
}
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 9885a76..b07f77e 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -1502,11 +1502,7 @@ filter_position_func (GtkWidget *widget,
gint monitor_num;
GdkRectangle monitor;
-#if GTK_CHECK_VERSION(2,18,0)
window = gtk_widget_get_window (widget);
-#else
- window = widget->window;
-#endif
screen = gdk_drawable_get_screen (window);
monitor_num = gdk_screen_get_monitor_at_window (screen, window);
@@ -1572,15 +1568,9 @@ action_filter_cb (GtkAction *action, GdauiRawGrid *grid)
gtk_widget_set_events (grid->priv->filter_window,
gtk_widget_get_events (grid->priv->filter_window) | GDK_KEY_PRESS_MASK);
-#if GTK_CHECK_VERSION(2,18,0)
if (gtk_widget_is_toplevel (toplevel) && gtk_window_get_group (GTK_WINDOW (toplevel)))
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (grid->priv->filter_window));
-#else
- if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_WINDOW (toplevel)->group)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
- GTK_WINDOW (grid->priv->filter_window));
-#endif
g_signal_connect (grid->priv->filter_window, "delete-event",
G_CALLBACK (filter_event), grid);
@@ -1605,7 +1595,6 @@ action_filter_cb (GtkAction *action, GdauiRawGrid *grid)
}
gtk_container_add (GTK_CONTAINER (vbox), grid->priv->filter);
}
-#if GTK_CHECK_VERSION(2,18,0)
else if (gtk_widget_is_toplevel (toplevel)) {
if (gtk_window_get_group ((GtkWindow*) toplevel))
gtk_window_group_add_window (gtk_window_get_group ((GtkWindow*) toplevel),
@@ -1614,30 +1603,14 @@ action_filter_cb (GtkAction *action, GdauiRawGrid *grid)
gtk_window_group_remove_window (gtk_window_get_group (GTK_WINDOW (grid->priv->filter_window)),
GTK_WINDOW (grid->priv->filter_window));
}
-#else
- else if (GTK_WIDGET_TOPLEVEL (toplevel)) {
- if (GTK_WINDOW (toplevel)->group)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
- GTK_WINDOW (grid->priv->filter_window));
- else if (GTK_WINDOW (grid->priv->filter_window)->group)
- gtk_window_group_remove_window (GTK_WINDOW (grid->priv->filter_window)->group,
- GTK_WINDOW (grid->priv->filter_window));
- }
-#endif
/* move the filter window to a correct location */
/* FIXME: let the user specify the position function like GtkTreeView -> search_position_func() */
gtk_grab_add (grid->priv->filter_window);
filter_position_func (GTK_WIDGET (grid), grid->priv->filter_window, NULL);
gtk_widget_show (grid->priv->filter_window);
-#if GTK_CHECK_VERSION(2,18,0)
popup_grab_on_window (gtk_widget_get_window (grid->priv->filter_window),
- gtk_get_current_event_time ());
-#else
- popup_grab_on_window (grid->priv->filter_window->window,
- gtk_get_current_event_time ());
-#endif
-
+ gtk_get_current_event_time ());
}
/*
@@ -1882,11 +1855,7 @@ menu_save_as_cb (GtkWidget *widget, GdauiRawGrid *grid)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
g_free (str);
-#if GTK_CHECK_VERSION(2,18,0)
dbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
- dbox = GTK_DIALOG (dialog)->vbox;
-#endif
gtk_box_pack_start (GTK_BOX (dbox), label, FALSE, TRUE, 2);
str = g_strdup_printf ("<b>%s:</b>", _("File name"));
@@ -2128,11 +2097,7 @@ confirm_file_overwrite (GtkWindow *parent, const gchar *path)
g_free (msg);
button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_set_can_default (button, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_NO);
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index 0f4f8c2..7324762 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -1119,11 +1119,7 @@ gdaui_server_operation_new_in_dialog (GdaServerOperation *op, GtkWindow *parent,
GTK_STOCK_CANCEL,
GTK_RESPONSE_REJECT,
NULL);
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
-#else
- dcontents = GTK_DIALOG (dlg)->vbox;
-#endif
if (header && *header) {
GtkWidget *label;
diff --git a/libgda-ui/internal/popup-container.c b/libgda-ui/internal/popup-container.c
index 936861e..7bb2609 100644
--- a/libgda-ui/internal/popup-container.c
+++ b/libgda-ui/internal/popup-container.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 The GNOME Foundation
+ * Copyright (C) 2009 - 2010 The GNOME Foundation
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -215,13 +215,8 @@ popup_container_show (GtkWidget *widget)
if (do_move)
gtk_window_move (GTK_WINDOW (widget), root_x, root_y);
-#if GTK_CHECK_VERSION(2,18,0)
popup_grab_on_window (gtk_widget_get_window (widget),
gtk_get_current_event_time ());
-#else
- popup_grab_on_window (widget->window,
- gtk_get_current_event_time ());
-#endif
}
static void
@@ -270,20 +265,12 @@ popup_position (PopupContainer *container, gint *out_x, gint *out_y)
gtk_widget_size_request (poswidget, &req);
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation alloc;
gdk_window_get_origin (gtk_widget_get_window (poswidget), &x, &y);
gtk_widget_get_allocation (poswidget, &alloc);
x += alloc.x;
y += alloc.y;
y += alloc.height;
-#else
- gdk_window_get_origin (poswidget->window, &x, &y);
-
- x += poswidget->allocation.x;
- y += poswidget->allocation.y;
- y += poswidget->allocation.height;
-#endif
if (x < 0)
x = 0;
diff --git a/libgda-ui/internal/utility.c b/libgda-ui/internal/utility.c
index 37d7a43..b761d41 100644
--- a/libgda-ui/internal/utility.c
+++ b/libgda-ui/internal/utility.c
@@ -1,6 +1,6 @@
/* utility.c
*
- * Copyright (C) 2003 - 2009 Vivien Malerba <malerba gnome-db org>
+ * Copyright (C) 2003 - 2010 Vivien Malerba <malerba gnome-db org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -440,12 +440,8 @@ create_data_error_dialog (GdauiDataProxy *form, gboolean with_question, gboolean
gtk_container_add (GTK_CONTAINER (sw), view);
gtk_container_add (GTK_CONTAINER (exp), sw);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
exp, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), exp, TRUE, TRUE, 0);
-#endif
gtk_widget_show_all (exp);
gtk_window_set_resizable (GTK_WINDOW (dlg), TRUE);
diff --git a/tools/browser/auth-dialog.c b/tools/browser/auth-dialog.c
index 3aa932c..fb7e0b8 100644
--- a/tools/browser/auth-dialog.c
+++ b/tools/browser/auth-dialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -147,11 +147,7 @@ auth_dialog_init (AuthDialog *dialog)
GTK_STOCK_CANCEL,
GTK_RESPONSE_REJECT, NULL);
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
- dcontents = GTK_DIALOG (dialog)->vbox;
-#endif
gtk_box_set_spacing (GTK_BOX (dcontents), 5);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, TRUE);
@@ -409,12 +405,7 @@ auth_dialog_add_cnc_string (AuthDialog *dialog, const gchar *cnc_string, GError
gchar *str, *tmp, *ptr;
GtkWidget *dcontents;
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
- dcontents = GTK_DIALOG (dialog)->vbox;
-#endif
-
label = gtk_label_new ("");
tmp = g_strdup (ad->ext.cnc_string);
for (ptr = tmp; *ptr; ptr++) {
diff --git a/tools/browser/browser-spinner.c b/tools/browser/browser-spinner.c
index 69aa6c0..868496c 100644
--- a/tools/browser/browser-spinner.c
+++ b/tools/browser/browser-spinner.c
@@ -33,7 +33,7 @@
#define GSEAL_ENABLE
#undef KEEP_GSEAL_ENABLE
#endif
-#if GTK_CHECK_VERSION(2,20,0)
+
#include "browser-spinner.h"
/**
* browser_spinner_start:
@@ -79,910 +79,3 @@ browser_spinner_set_size (BrowserSpinner *spinner,
size, &width, &height);
gtk_widget_set_size_request (GTK_WIDGET (spinner), width, height);
}
-#else
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "browser-spinner.h"
-
-/* Spinner cache implementation */
-
-#define BROWSER_TYPE_SPINNER_CACHE (browser_spinner_cache_get_type())
-#define BROWSER_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), BROWSER_TYPE_SPINNER_CACHE, BrowserSpinnerCache))
-#define BROWSER_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), BROWSER_TYPE_SPINNER_CACHE, BrowserSpinnerCacheClass))
-#define BROWSER_IS_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), BROWSER_TYPE_SPINNER_CACHE))
-#define BROWSER_IS_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), BROWSER_TYPE_SPINNER_CACHE))
-#define BROWSER_SPINNER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), BROWSER_TYPE_SPINNER_CACHE, BrowserSpinnerCacheClass))
-
-typedef struct _BrowserSpinnerCache BrowserSpinnerCache;
-typedef struct _BrowserSpinnerCacheClass BrowserSpinnerCacheClass;
-typedef struct _BrowserSpinnerCachePrivate BrowserSpinnerCachePrivate;
-
-struct _BrowserSpinnerCacheClass
-{
- GObjectClass parent_class;
-};
-
-struct _BrowserSpinnerCache
-{
- GObject parent_object;
-
- /*< private >*/
- BrowserSpinnerCachePrivate *priv;
-};
-
-#define BROWSER_SPINNER_CACHE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), BROWSER_TYPE_SPINNER_CACHE, BrowserSpinnerCachePrivate))
-
-struct _BrowserSpinnerCachePrivate
-{
- /* Hash table of GdkScreen -> BrowserSpinnerCacheData */
- GHashTable *hash;
-};
-
-typedef struct
-{
- guint ref_count;
- GtkIconSize size;
- int width;
- int height;
- GdkPixbuf **animation_pixbufs;
- guint n_animation_pixbufs;
-} BrowserSpinnerImages;
-
-#define LAST_ICON_SIZE GTK_ICON_SIZE_DIALOG + 1
-#define SPINNER_ICON_NAME "process-working"
-#define SPINNER_FALLBACK_ICON_NAME "gnome-spinner"
-#define BROWSER_SPINNER_IMAGES_INVALID ((BrowserSpinnerImages *) 0x1)
-
-typedef struct
-{
- GdkScreen *screen;
- GtkIconTheme *icon_theme;
- BrowserSpinnerImages *images[LAST_ICON_SIZE];
-} BrowserSpinnerCacheData;
-
-static void browser_spinner_cache_class_init (BrowserSpinnerCacheClass *klass);
-static void browser_spinner_cache_init (BrowserSpinnerCache *cache);
-
-static GObjectClass *browser_spinner_cache_parent_class;
-
-static GType
-browser_spinner_cache_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- {
- const GTypeInfo our_info =
- {
- sizeof (BrowserSpinnerCacheClass),
- NULL,
- NULL,
- (GClassInitFunc) browser_spinner_cache_class_init,
- NULL,
- NULL,
- sizeof (BrowserSpinnerCache),
- 0,
- (GInstanceInitFunc) browser_spinner_cache_init
- };
-
- type = g_type_register_static (G_TYPE_OBJECT,
- "BrowserSpinnerCache",
- &our_info, 0);
- }
-
- return type;
-}
-
-static BrowserSpinnerImages *
-browser_spinner_images_ref (BrowserSpinnerImages *images)
-{
- g_return_val_if_fail (images != NULL, NULL);
-
- images->ref_count++;
-
- return images;
-}
-
-static void
-browser_spinner_images_unref (BrowserSpinnerImages *images)
-{
- g_return_if_fail (images != NULL);
-
- images->ref_count--;
- if (images->ref_count == 0)
- {
- guint i;
-
- for (i = 0; i < images->n_animation_pixbufs; ++i)
- {
- g_object_unref (images->animation_pixbufs[i]);
- }
- g_free (images->animation_pixbufs);
-
- g_free (images);
- }
-}
-
-static void
-browser_spinner_cache_data_unload (BrowserSpinnerCacheData *data)
-{
- GtkIconSize size;
- BrowserSpinnerImages *images;
-
- g_return_if_fail (data != NULL);
-
- for (size = GTK_ICON_SIZE_INVALID; size < LAST_ICON_SIZE; ++size)
- {
- images = data->images[size];
- data->images[size] = NULL;
-
- if (images != NULL && images != BROWSER_SPINNER_IMAGES_INVALID)
- {
- browser_spinner_images_unref (images);
- }
- }
-}
-
-static GdkPixbuf *
-extract_frame (GdkPixbuf *grid_pixbuf,
- int x,
- int y,
- int size)
-{
- GdkPixbuf *pixbuf;
-
- if (x + size > gdk_pixbuf_get_width (grid_pixbuf) ||
- y + size > gdk_pixbuf_get_height (grid_pixbuf))
- {
- return NULL;
- }
-
- pixbuf = gdk_pixbuf_new_subpixbuf (grid_pixbuf,
- x, y,
- size, size);
- g_return_val_if_fail (pixbuf != NULL, NULL);
-
- return pixbuf;
-}
-
-static GdkPixbuf *
-scale_to_size (GdkPixbuf *pixbuf,
- int dw,
- int dh)
-{
- GdkPixbuf *result;
- int pw, ph;
-
- g_return_val_if_fail (pixbuf != NULL, NULL);
-
- pw = gdk_pixbuf_get_width (pixbuf);
- ph = gdk_pixbuf_get_height (pixbuf);
-
- if (pw != dw || ph != dh)
- {
- result = gdk_pixbuf_scale_simple (pixbuf, dw, dh,
- GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- return result;
- }
-
- return pixbuf;
-}
-
-static BrowserSpinnerImages *
-browser_spinner_images_load (GdkScreen *screen,
- GtkIconTheme *icon_theme,
- GtkIconSize icon_size)
-{
- BrowserSpinnerImages *images;
- GdkPixbuf *icon_pixbuf, *pixbuf;
- GtkIconInfo *icon_info = NULL;
- int grid_width, grid_height, x, y, requested_size, size, isw, ish, n;
- const char *icon;
- GSList *list = NULL, *l;
-
- if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
- icon_size, &isw, &ish)) goto loser;
-
- requested_size = MAX (ish, isw);
-
- /* Load the animation. The 'rest icon' is the 0th frame */
- icon_info = gtk_icon_theme_lookup_icon (icon_theme,
- SPINNER_ICON_NAME,
- requested_size, 0);
- if (icon_info == NULL)
- {
- g_warning ("Throbber animation not found");
-
- /* If the icon naming spec compliant name wasn't found, try the old name */
- icon_info = gtk_icon_theme_lookup_icon (icon_theme,
- SPINNER_FALLBACK_ICON_NAME,
- requested_size, 0);
- if (icon_info == NULL)
- {
- g_warning ("Throbber fallback animation not found either");
- goto loser;
- }
- }
- g_assert (icon_info != NULL);
-
- size = gtk_icon_info_get_base_size (icon_info);
- icon = gtk_icon_info_get_filename (icon_info);
- if (icon == NULL) goto loser;
-
- icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
- gtk_icon_info_free (icon_info);
- icon_info = NULL;
-
- if (icon_pixbuf == NULL)
- {
- g_warning ("Could not load the spinner file");
- goto loser;
- }
-
- grid_width = gdk_pixbuf_get_width (icon_pixbuf);
- grid_height = gdk_pixbuf_get_height (icon_pixbuf);
-
- n = 0;
- for (y = 0; y < grid_height; y += size)
- {
- for (x = 0; x < grid_width ; x += size)
- {
- pixbuf = extract_frame (icon_pixbuf, x, y, size);
-
- if (pixbuf)
- {
- list = g_slist_prepend (list, pixbuf);
- ++n;
- }
- else
- {
- g_warning ("Cannot extract frame (%d, %d) from the grid\n", x, y);
- }
- }
- }
-
- g_object_unref (icon_pixbuf);
-
- if (list == NULL) goto loser;
- g_assert (n > 0);
-
- if (size > requested_size)
- {
- for (l = list; l != NULL; l = l->next)
- {
- l->data = scale_to_size (l->data, isw, ish);
- }
- }
-
- /* Now we've successfully got all the data */
- images = g_new (BrowserSpinnerImages, 1);
- images->ref_count = 1;
-
- images->size = icon_size;
- images->width = images->height = requested_size;
-
- images->n_animation_pixbufs = n;
- images->animation_pixbufs = g_new (GdkPixbuf *, n);
-
- for (l = list; l != NULL; l = l->next)
- {
- g_assert (l->data != NULL);
- images->animation_pixbufs[--n] = l->data;
- }
- g_assert (n == 0);
-
- g_slist_free (list);
-
- return images;
-
-loser:
- if (icon_info)
- {
- gtk_icon_info_free (icon_info);
- }
- g_slist_foreach (list, (GFunc) g_object_unref, NULL);
-
- return NULL;
-}
-
-static BrowserSpinnerCacheData *
-browser_spinner_cache_data_new (GdkScreen *screen)
-{
- BrowserSpinnerCacheData *data;
-
- data = g_new0 (BrowserSpinnerCacheData, 1);
-
- data->screen = screen;
- data->icon_theme = gtk_icon_theme_get_for_screen (screen);
- g_signal_connect_swapped (data->icon_theme, "changed",
- G_CALLBACK (browser_spinner_cache_data_unload),
- data);
-
- return data;
-}
-
-static void
-browser_spinner_cache_data_free (BrowserSpinnerCacheData *data)
-{
- g_return_if_fail (data != NULL);
- g_return_if_fail (data->icon_theme != NULL);
-
- g_signal_handlers_disconnect_by_func
- (data->icon_theme,
- G_CALLBACK (browser_spinner_cache_data_unload), data);
-
- browser_spinner_cache_data_unload (data);
-
- g_free (data);
-}
-
-static BrowserSpinnerImages *
-browser_spinner_cache_get_images (BrowserSpinnerCache *cache,
- GdkScreen *screen,
- GtkIconSize icon_size)
-{
- BrowserSpinnerCachePrivate *priv = cache->priv;
- BrowserSpinnerCacheData *data;
- BrowserSpinnerImages *images;
-
- g_return_val_if_fail (icon_size >= 0 && icon_size < LAST_ICON_SIZE, NULL);
-
- /* Backward compat: "invalid" meant "native" size which doesn't exist anymore */
- if (icon_size == GTK_ICON_SIZE_INVALID)
- {
- icon_size = GTK_ICON_SIZE_DIALOG;
- }
-
- data = g_hash_table_lookup (priv->hash, screen);
- if (data == NULL)
- {
- data = browser_spinner_cache_data_new (screen);
- /* FIXME: think about what happens when the screen's display is closed later on */
- g_hash_table_insert (priv->hash, screen, data);
- }
-
- images = data->images[icon_size];
- if (images == BROWSER_SPINNER_IMAGES_INVALID)
- {
- /* Load failed, but don't try endlessly again! */
- return NULL;
- }
-
- if (images != NULL)
- {
- /* Return cached data */
- return browser_spinner_images_ref (images);
- }
-
- images = browser_spinner_images_load (screen, data->icon_theme, icon_size);
-
- if (images == NULL)
- {
- /* Mark as failed-to-load */
- data->images[icon_size] = BROWSER_SPINNER_IMAGES_INVALID;
-
- return NULL;
- }
-
- data->images[icon_size] = images;
-
- return browser_spinner_images_ref (images);
-}
-
-static void
-browser_spinner_cache_init (BrowserSpinnerCache *cache)
-{
- BrowserSpinnerCachePrivate *priv;
-
- priv = cache->priv = BROWSER_SPINNER_CACHE_GET_PRIVATE (cache);
-
- priv->hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL,
- (GDestroyNotify) browser_spinner_cache_data_free);
-}
-
-static void
-browser_spinner_cache_finalize (GObject *object)
-{
- BrowserSpinnerCache *cache = BROWSER_SPINNER_CACHE (object);
- BrowserSpinnerCachePrivate *priv = cache->priv;
-
- g_hash_table_destroy (priv->hash);
-
- G_OBJECT_CLASS (browser_spinner_cache_parent_class)->finalize (object);
-}
-
-static void
-browser_spinner_cache_class_init (BrowserSpinnerCacheClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- browser_spinner_cache_parent_class = g_type_class_peek_parent (klass);
-
- object_class->finalize = browser_spinner_cache_finalize;
-
- g_type_class_add_private (object_class, sizeof (BrowserSpinnerCachePrivate));
-}
-
-static BrowserSpinnerCache *spinner_cache = NULL;
-
-static BrowserSpinnerCache *
-browser_spinner_cache_ref (void)
-{
- if (spinner_cache == NULL)
- {
- BrowserSpinnerCache **cache_ptr;
-
- spinner_cache = g_object_new (BROWSER_TYPE_SPINNER_CACHE, NULL);
- cache_ptr = &spinner_cache;
- g_object_add_weak_pointer (G_OBJECT (spinner_cache),
- (gpointer *) cache_ptr);
-
- return spinner_cache;
- }
-
- return g_object_ref (spinner_cache);
-}
-
-/* Spinner implementation */
-
-#define SPINNER_TIMEOUT 125 /* ms */
-
-#define BROWSER_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), BROWSER_TYPE_SPINNER, BrowserSpinnerPriv))
-
-struct _BrowserSpinnerPriv
-{
- GtkIconTheme *icon_theme;
- BrowserSpinnerCache *cache;
- GtkIconSize size;
- BrowserSpinnerImages *images;
- guint current_image;
- guint timeout;
- guint timer_task;
- guint spinning : 1;
- guint need_load : 1;
-};
-
-static void browser_spinner_class_init (BrowserSpinnerClass *class);
-static void browser_spinner_init (BrowserSpinner *spinner);
-
-static GObjectClass *parent_class;
-
-GType
-browser_spinner_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- {
- const GTypeInfo our_info =
- {
- sizeof (BrowserSpinnerClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) browser_spinner_class_init,
- NULL,
- NULL, /* class_data */
- sizeof (BrowserSpinner),
- 0, /* n_preallocs */
- (GInstanceInitFunc) browser_spinner_init
- };
-
- type = g_type_register_static (GTK_TYPE_WIDGET,
- "BrowserSpinner",
- &our_info, 0);
- }
-
- return type;
-}
-
-static gboolean
-browser_spinner_load_images (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv = spinner->priv;
-
- if (priv->need_load)
- {
- priv->images =
- browser_spinner_cache_get_images
- (priv->cache,
- gtk_widget_get_screen (GTK_WIDGET (spinner)),
- priv->size);
-
- priv->current_image = 0; /* 'rest' icon */
- priv->need_load = FALSE;
- }
-
- return priv->images != NULL;
-}
-
-static void
-browser_spinner_unload_images (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv = spinner->priv;
-
- if (priv->images != NULL)
- {
- browser_spinner_images_unref (priv->images);
- priv->images = NULL;
- }
-
- priv->current_image = 0;
- priv->need_load = TRUE;
-}
-
-static void
-icon_theme_changed_cb (GtkIconTheme *icon_theme,
- BrowserSpinner *spinner)
-{
- browser_spinner_unload_images (spinner);
- gtk_widget_queue_resize (GTK_WIDGET (spinner));
-}
-
-static void
-browser_spinner_init (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv;
-
- priv = spinner->priv = BROWSER_SPINNER_GET_PRIVATE (spinner);
-
-#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE);
-#else
- GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW);
-#endif
-
- priv->cache = browser_spinner_cache_ref ();
- priv->size = GTK_ICON_SIZE_DIALOG;
- priv->spinning = FALSE;
- priv->timeout = SPINNER_TIMEOUT;
- priv->need_load = TRUE;
-}
-
-static int
-browser_spinner_expose (GtkWidget *widget, GdkEventExpose *event)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (widget);
- BrowserSpinnerPriv *priv = spinner->priv;
- BrowserSpinnerImages *images;
- GdkPixbuf *pixbuf;
- GdkGC *gc;
- int x_offset, y_offset, width, height;
- GdkRectangle pix_area, dest;
- gboolean drawable;
-
-#if GTK_CHECK_VERSION(2,18,0)
- drawable = gtk_widget_is_drawable (widget);
-#else
- drawable = GTK_WIDGET_DRAWABLE (widget);
-#endif
- if (!drawable)
- return FALSE;
-
- if (priv->need_load && !browser_spinner_load_images (spinner))
- return FALSE;
-
- images = priv->images;
- if (!images)
- return FALSE;
-
- /* Otherwise |images| will be NULL anyway */
- g_assert (images->n_animation_pixbufs > 0);
-
- g_assert (priv->current_image >= 0 &&
- priv->current_image < images->n_animation_pixbufs);
-
- pixbuf = images->animation_pixbufs[priv->current_image];
-
- g_assert (pixbuf != NULL);
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
-
- /* Compute the offsets for the image centered on our allocation */
- GtkAllocation alloc;
-#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_get_allocation (widget, &alloc);
-#else
- alloc = widget->allocation;
-#endif
- x_offset = (alloc.width - width) / 2;
- y_offset = (alloc.height - height) / 2;
- pix_area.x = x_offset + alloc.x;
- pix_area.y = y_offset + alloc.y;
-
- pix_area.width = width;
- pix_area.height = height;
-
- if (!gdk_rectangle_intersect (&event->area, &pix_area, &dest))
- return FALSE;
-
- GdkWindow *win;
-#if GTK_CHECK_VERSION(2,18,0)
- win = gtk_widget_get_window (widget);
-#else
- win = widget->window;
-#endif
- gc = gdk_gc_new (win);
- gdk_draw_pixbuf (win, gc, pixbuf,
- dest.x - x_offset - alloc.x,
- dest.y - y_offset - alloc.y,
- dest.x, dest.y,
- dest.width, dest.height,
- GDK_RGB_DITHER_MAX, 0, 0);
- g_object_unref (gc);
-
- return FALSE;
-}
-
-static gboolean
-bump_spinner_frame_cb (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv = spinner->priv;
-
- /* This can happen when we've unloaded the images on a theme
- * change, but haven't been in the queued size request yet.
- * Just skip this update.
- */
- if (priv->images == NULL) return TRUE;
-
- priv->current_image++;
- if (priv->current_image >= priv->images->n_animation_pixbufs)
- {
- /* the 0th frame is the 'rest' icon */
- priv->current_image = MIN (1, priv->images->n_animation_pixbufs);
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (spinner));
-
- /* run again */
- return TRUE;
-}
-
-/**
- * browser_spinner_start:
- * @spinner: a #BrowserSpinner
- *
- * Start the spinner animation.
- **/
-void
-browser_spinner_start (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv = spinner->priv;
-
- priv->spinning = TRUE;
-
-#if GTK_CHECK_VERSION (2,19,5)
- if (gtk_widget_get_mapped (GTK_WIDGET (spinner)) &&
-#else
- if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)) &&
-#endif
- priv->timer_task == 0 &&
- browser_spinner_load_images (spinner)) {
- /* the 0th frame is the 'rest' icon */
- priv->current_image = MIN (1, priv->images->n_animation_pixbufs);
-
- priv->timer_task =
- g_timeout_add_full (G_PRIORITY_LOW,
- priv->timeout,
- (GSourceFunc) bump_spinner_frame_cb,
- spinner,
- NULL);
- }
-}
-
-static void
-browser_spinner_remove_update_callback (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv = spinner->priv;
-
- if (priv->timer_task != 0) {
- g_source_remove (priv->timer_task);
- priv->timer_task = 0;
- }
-}
-
-/**
- * browser_spinner_stop:
- * @spinner: a #BrowserSpinner
- *
- * Stop the spinner animation.
- **/
-void
-browser_spinner_stop (BrowserSpinner *spinner)
-{
- BrowserSpinnerPriv *priv = spinner->priv;
-
- priv->spinning = FALSE;
- priv->current_image = 0;
-
- if (priv->timer_task != 0) {
- browser_spinner_remove_update_callback (spinner);
-
-#if GTK_CHECK_VERSION (2,19,4)
- if (gtk_widget_get_mapped (GTK_WIDGET (spinner)))
-#else
- if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)))
-#endif
- gtk_widget_queue_draw (GTK_WIDGET (spinner));
- }
-}
-
-/*
- * browser_spinner_set_size:
- * @spinner: a #BrowserSpinner
- * @size: the size of type %GtkIconSize
- *
- * Set the size of the spinner.
- **/
-void
-browser_spinner_set_size (BrowserSpinner *spinner,
- GtkIconSize size)
-{
- if (size == GTK_ICON_SIZE_INVALID)
- {
- size = GTK_ICON_SIZE_DIALOG;
- }
-
- if (size != spinner->priv->size)
- {
- browser_spinner_unload_images (spinner);
-
- spinner->priv->size = size;
-
- gtk_widget_queue_resize (GTK_WIDGET (spinner));
- }
-}
-
-static void
-browser_spinner_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (widget);
- BrowserSpinnerPriv *priv = spinner->priv;
-
- if ((priv->need_load &&
- !browser_spinner_load_images (spinner)) ||
- priv->images == NULL)
- {
- requisition->width = requisition->height = 0;
- gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
- priv->size,
- &requisition->width,
- &requisition->height);
- return;
- }
-
- requisition->width = priv->images->width;
- requisition->height = priv->images->height;
-
- /* FIXME fix this hack */
- /* allocate some extra margin so we don't butt up against toolbar edges */
- if (priv->size != GTK_ICON_SIZE_MENU)
- {
- requisition->width += 2;
- requisition->height += 2;
- }
-}
-
-static void
-browser_spinner_map (GtkWidget *widget)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (widget);
- BrowserSpinnerPriv *priv = spinner->priv;
-
- GTK_WIDGET_CLASS (parent_class)->map (widget);
-
- if (priv->spinning)
- browser_spinner_start (spinner);
-}
-
-static void
-browser_spinner_unmap (GtkWidget *widget)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (widget);
-
- browser_spinner_remove_update_callback (spinner);
-
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
-}
-
-static void
-browser_spinner_dispose (GObject *object)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (object);
-
- g_signal_handlers_disconnect_by_func
- (spinner->priv->icon_theme,
- G_CALLBACK (icon_theme_changed_cb), spinner);
-
- G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-browser_spinner_finalize (GObject *object)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (object);
-
- browser_spinner_remove_update_callback (spinner);
- browser_spinner_unload_images (spinner);
-
- g_object_unref (spinner->priv->cache);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-browser_spinner_screen_changed (GtkWidget *widget,
- GdkScreen *old_screen)
-{
- BrowserSpinner *spinner = BROWSER_SPINNER (widget);
- BrowserSpinnerPriv *priv = spinner->priv;
- GdkScreen *screen;
-
- if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
- {
- GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, old_screen);
- }
-
- screen = gtk_widget_get_screen (widget);
-
- /* FIXME: this seems to be happening when then spinner is destroyed!? */
- if (old_screen == screen) return;
-
- /* We'll get mapped again on the new screen, but not unmapped from
- * the old screen, so remove timeout here.
- */
- browser_spinner_remove_update_callback (spinner);
-
- browser_spinner_unload_images (spinner);
-
- if (old_screen != NULL)
- {
- g_signal_handlers_disconnect_by_func
- (gtk_icon_theme_get_for_screen (old_screen),
- G_CALLBACK (icon_theme_changed_cb), spinner);
- }
-
- priv->icon_theme = gtk_icon_theme_get_for_screen (screen);
- g_signal_connect (priv->icon_theme, "changed",
- G_CALLBACK (icon_theme_changed_cb), spinner);
-}
-
-static void
-browser_spinner_class_init (BrowserSpinnerClass *class)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
- parent_class = g_type_class_peek_parent (class);
-
- object_class->dispose = browser_spinner_dispose;
- object_class->finalize = browser_spinner_finalize;
-
- widget_class->expose_event = browser_spinner_expose;
- widget_class->size_request = browser_spinner_size_request;
- widget_class->map = browser_spinner_map;
- widget_class->unmap = browser_spinner_unmap;
- widget_class->screen_changed = browser_spinner_screen_changed;
-
- g_type_class_add_private (object_class, sizeof (BrowserSpinnerPriv));
-}
-
-/*
- * browser_spinner_new:
- *
- * Create a new #BrowserSpinner. The spinner is a widget
- * that gives the user feedback about network status with
- * an animated image.
- *
- * Return Value: the spinner #GtkWidget
- **/
-GtkWidget *
-browser_spinner_new (void)
-{
- return GTK_WIDGET (g_object_new (BROWSER_TYPE_SPINNER, NULL));
-}
-
-#endif /* GTK_CHECK_VERSION */
diff --git a/tools/browser/browser-spinner.h b/tools/browser/browser-spinner.h
index 6019bac..7edabba 100644
--- a/tools/browser/browser-spinner.h
+++ b/tools/browser/browser-spinner.h
@@ -1,74 +1,30 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- * Copyright © 2000 Eazel, Inc.
- * Copyright © 2004, 2006 Christian Persch
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
- * Nautilus is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
*
- * Nautilus is distributed in the hope that it will be useful,
+ * This Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Author: Andy Hertzfeld <andy eazel com>
- *
- * $Id$
+ * You should have received a copy of the GNU Library General Public
+ * License along with this Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#ifndef BROWSER_SPINNER_H
#define BROWSER_SPINNER_H
-#if GTK_CHECK_VERSION(2,20,0)
#define BROWSER_SPINNER(x) GTK_SPINNER(x)
#define BrowserSpinner GtkSpinner
#define browser_spinner_new() gtk_spinner_new()
-void browser_spinner_start (BrowserSpinner *throbber);
-void browser_spinner_stop (BrowserSpinner *throbber);
-void browser_spinner_set_size (BrowserSpinner *spinner, GtkIconSize size);
-#else
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define BROWSER_TYPE_SPINNER (browser_spinner_get_type ())
-#define BROWSER_SPINNER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), BROWSER_TYPE_SPINNER, BrowserSpinner))
-#define BROWSER_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), BROWSER_TYPE_SPINNER, BrowserSpinnerClass))
-#define BROWSER_IS_SPINNER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), BROWSER_TYPE_SPINNER))
-#define BROWSER_IS_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), BROWSER_TYPE_SPINNER))
-#define BROWSER_SPINNER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BROWSER_TYPE_SPINNER, BrowserSpinnerClass))
-
-typedef struct _BrowserSpinner BrowserSpinner;
-typedef struct _BrowserSpinnerClass BrowserSpinnerClass;
-typedef struct _BrowserSpinnerPriv BrowserSpinnerPriv;
-
-struct _BrowserSpinner
-{
- GtkWidget parent;
-
- /*< private >*/
- BrowserSpinnerPriv *priv;
-};
-
-struct _BrowserSpinnerClass
-{
- GtkWidgetClass parent_class;
-};
-
-GType browser_spinner_get_type (void);
-GtkWidget *browser_spinner_new (void);
-void browser_spinner_start (BrowserSpinner *throbber);
-void browser_spinner_stop (BrowserSpinner *throbber);
-void browser_spinner_set_size (BrowserSpinner *spinner,
- GtkIconSize size);
-
-G_END_DECLS
-#endif /* GTK_CHECK_VERSION */
+void browser_spinner_start (BrowserSpinner *throbber);
+void browser_spinner_stop (BrowserSpinner *throbber);
+void browser_spinner_set_size (BrowserSpinner *spinner, GtkIconSize size);
#endif /* BROWSER_SPINNER_H */
diff --git a/tools/browser/canvas-example.c b/tools/browser/canvas-example.c
index 3a53b88..fbef9f4 100644
--- a/tools/browser/canvas-example.c
+++ b/tools/browser/canvas-example.c
@@ -133,20 +133,12 @@ label_drag_data_received (GtkWidget *label, GdkDragContext *context,
gint x, gint y, GtkSelectionData *data,
guint info, guint time)
{
-#if GTK_CHECK_VERSION(2,18,0)
if ((gtk_selection_data_get_length (data) >= 0) && (gtk_selection_data_get_format (data) == 8)) {
g_print ("Received \"%s\" in drop zone\n",
(gchar *) gtk_selection_data_get_data (data));
gtk_drag_finish (context, TRUE, FALSE, time);
return;
}
-#else
- if ((data->length >= 0) && (data->format == 8)) {
- g_print ("Received \"%s\" in drop zone\n", (gchar *)data->data);
- gtk_drag_finish (context, TRUE, FALSE, time);
- return;
- }
-#endif
gtk_drag_finish (context, FALSE, FALSE, time);
}
diff --git a/tools/browser/canvas/browser-canvas-column.c b/tools/browser/canvas/browser-canvas-column.c
index 47db253..2a9d209 100644
--- a/tools/browser/canvas/browser-canvas-column.c
+++ b/tools/browser/canvas/browser-canvas-column.c
@@ -1,6 +1,6 @@
/* browser-canvas-column.c
*
- * Copyright (C) 2002 - 2008 Vivien Malerba
+ * Copyright (C) 2002 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -320,10 +320,6 @@ browser_canvas_column_drag_data_get (BrowserCanvasItem *citem, GdkDragContext *d
g_free (tmp2);
g_free (tmp3);
g_free (tmp4);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_selection_data_set (data, gtk_selection_data_get_target (data), 8, (guchar*) str, strlen (str));
-#else
- gtk_selection_data_set (data, data->target, 8, (guchar*) str, strlen (str));
-#endif
g_free (str);
}
diff --git a/tools/browser/canvas/browser-canvas-db-relations.c b/tools/browser/canvas/browser-canvas-db-relations.c
index ed9bc99..d409108 100644
--- a/tools/browser/canvas/browser-canvas-db-relations.c
+++ b/tools/browser/canvas/browser-canvas-db-relations.c
@@ -1,6 +1,6 @@
/* browser-canvas-db-relations.c
*
- * Copyright (C) 2002 - 2009 Vivien Malerba
+ * Copyright (C) 2002 - 2010 Vivien Malerba
* Copyright (C) 2002 Fernando Martins
*
* This program is free software; you can redistribute it and/or
@@ -209,18 +209,11 @@ popup_position (PopupContainer *container, gint *out_x, gint *out_y)
gtk_widget_size_request (canvas, &req);
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation alloc;
gdk_window_get_origin (gtk_widget_get_window (canvas), &x, &y);
gtk_widget_get_allocation (canvas, &alloc);
x += alloc.x;
y += alloc.y;
-#else
- gdk_window_get_origin (canvas->window, &x, &y);
-
- x += canvas->allocation.x;
- y += canvas->allocation.y;
-#endif
if (x < 0)
x = 0;
diff --git a/tools/browser/canvas/browser-canvas-table.c b/tools/browser/canvas/browser-canvas-table.c
index a6e8be8..46538e5 100644
--- a/tools/browser/canvas/browser-canvas-table.c
+++ b/tools/browser/canvas/browser-canvas-table.c
@@ -1,6 +1,6 @@
/* browser-canvas-table.c
*
- * Copyright (C) 2002 - 2007 Vivien Malerba
+ * Copyright (C) 2002 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -535,11 +535,7 @@ browser_canvas_table_drag_data_get (BrowserCanvasItem *citem, GdkDragContext *dr
g_free (tmp1);
g_free (tmp2);
g_free (tmp3);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_selection_data_set (data, gtk_selection_data_get_target (data), 8, (guchar*) str, strlen (str));
-#else
- gtk_selection_data_set (data, data->target, 8, (guchar*) str, strlen (str));
-#endif
g_free (str);
}
diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c
index 8bc1046..9ef8672 100644
--- a/tools/browser/canvas/browser-canvas.c
+++ b/tools/browser/canvas/browser-canvas.c
@@ -1,6 +1,6 @@
/* browser-canvas.c
*
- * Copyright (C) 2007 - 2009 Vivien Malerba
+ * Copyright (C) 2007 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -276,29 +276,17 @@ motion_notify_event_cb (BrowserCanvas *canvas, GdkEvent *event, GooCanvas *gcanv
ha = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (canvas));
va = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (canvas));
-#if GTK_CHECK_VERSION(2,18,0)
upper = gtk_adjustment_get_upper (ha);
lower = gtk_adjustment_get_lower (ha);
page_size = gtk_adjustment_get_page_size (ha);
-#else
- upper = ha->upper;
- lower = ha->lower;
- page_size = ha->page_size;
-#endif
x = gtk_adjustment_get_value (ha);
x = CLAMP (x + canvas->xmouse - ((GdkEventMotion*) event)->x,
lower, upper - page_size);
gtk_adjustment_set_value (ha, x);
-#if GTK_CHECK_VERSION(2,18,0)
upper = gtk_adjustment_get_upper (va);
lower = gtk_adjustment_get_lower (va);
page_size = gtk_adjustment_get_page_size (va);
-#else
- upper = va->upper;
- lower = va->lower;
- page_size = va->page_size;
-#endif
y = gtk_adjustment_get_value (va);
y = CLAMP (y + canvas->ymouse - ((GdkEventMotion*) event)->y,
lower, upper - page_size);
@@ -310,13 +298,8 @@ motion_notify_event_cb (BrowserCanvas *canvas, GdkEvent *event, GooCanvas *gcanv
canvas->priv->canvas_moving = TRUE;
if (! hand_cursor)
hand_cursor = gdk_cursor_new (GDK_HAND2);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (canvas)),
hand_cursor);
-#else
- gdk_window_set_cursor (GTK_WIDGET (canvas)->window,
- hand_cursor);
-#endif
}
}
done = TRUE;
@@ -421,11 +404,7 @@ canvas_event_cb (BrowserCanvas *canvas, GdkEvent *event, GooCanvas *gcanvas)
case GDK_BUTTON_RELEASE:
if (canvas->priv->canvas_moving) {
canvas->priv->canvas_moving = FALSE;
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (canvas)), NULL);
-#else
- gdk_window_set_cursor (GTK_WIDGET (canvas)->window, NULL);
-#endif
}
break;
case GDK_2BUTTON_PRESS:
@@ -497,13 +476,8 @@ popup_export_cb (GtkMenuItem *mitem, BrowserCanvas *canvas)
#define MARGIN 5.
-#if GTK_CHECK_VERSION(2,18,0)
if (!gtk_widget_is_toplevel (toplevel))
toplevel = NULL;
-#else
- if (!GTK_WIDGET_TOPLEVEL (toplevel))
- toplevel = NULL;
-#endif
dlg = gtk_file_chooser_dialog_new (_("Save diagram as"), (GtkWindow*) toplevel,
GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -778,15 +752,10 @@ browser_canvas_fit_zoom_factor (BrowserCanvas *canvas)
g_return_val_if_fail (IS_BROWSER_CANVAS (canvas), 1.);
g_return_val_if_fail (canvas->priv, 1.);
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation alloc;
gtk_widget_get_allocation (GTK_WIDGET (canvas), &alloc);
xall = alloc.width;
yall = alloc.height;
-#else
- xall = GTK_WIDGET (canvas)->allocation.width;
- yall = GTK_WIDGET (canvas)->allocation.height;
-#endif
goo_canvas_item_get_bounds (GOO_CANVAS_ITEM (goo_canvas_get_root_item (canvas->priv->goocanvas)),
&bounds);
diff --git a/tools/browser/common/gdaui-entry-import.c b/tools/browser/common/gdaui-entry-import.c
index af5006f..21922cc 100644
--- a/tools/browser/common/gdaui-entry-import.c
+++ b/tools/browser/common/gdaui-entry-import.c
@@ -1,6 +1,6 @@
/* gdaui-entry-import.c
*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -178,11 +178,7 @@ open_button_clicked_cb (GtkWidget *button, GdauiEntryImport *mgtxt)
GTK_RESPONSE_REJECT,
NULL);
wid = gdaui_data_import_new ();
-#if GTK_CHECK_VERSION(2,18,0)
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), wid);
-#else
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), wid);
-#endif
gtk_widget_show_all (dialog);
res = gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/tools/browser/common/objects-cloud.c b/tools/browser/common/objects-cloud.c
index 2f81ec9..66d99ad 100644
--- a/tools/browser/common/objects-cloud.c
+++ b/tools/browser/common/objects-cloud.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 The GNOME Foundation
+ * Copyright (C) 2009 - 2010 The GNOME Foundation
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -514,11 +514,7 @@ visibility_notify_event (GtkWidget *text_view, GdkEventVisibility *event, Object
{
gint wx, wy, bx, by;
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_pointer (gtk_widget_get_window (text_view), &wx, &wy, NULL);
-#else
- gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
-#endif
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
GTK_TEXT_WINDOW_WIDGET,
@@ -542,11 +538,7 @@ motion_notify_event (GtkWidget *text_view, GdkEventMotion *event, ObjectsCloud *
event->x, event->y, &x, &y);
set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y, cloud);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
-#else
- gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
-#endif
return FALSE;
}
diff --git a/tools/browser/connection-binding-properties.c b/tools/browser/connection-binding-properties.c
index 02d6f9a..53a4d34 100644
--- a/tools/browser/connection-binding-properties.c
+++ b/tools/browser/connection-binding-properties.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -185,12 +185,7 @@ create_layout (ConnectionBindingProperties *cprop)
gchar *str;
GtkWidget *dcontents;
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (cprop));
-#else
- dcontents = GTK_DIALOG (cprop)->vbox;
-#endif
-
str = g_strdup_printf ("<b>%s:</b>\n<small>%s</small>",
_("Virtual connection's properties"),
diff --git a/tools/browser/data-manager/data-favorite-selector.c b/tools/browser/data-manager/data-favorite-selector.c
index 9450e14..e94ca3e 100644
--- a/tools/browser/data-manager/data-favorite-selector.c
+++ b/tools/browser/data-manager/data-favorite-selector.c
@@ -601,23 +601,15 @@ tree_store_drag_drop_cb (GdauiTreeStore *store, const gchar *path, GtkSelectionD
gint id;
bfav = browser_connection_get_favorites (tsel->priv->bcnc);
-#if GTK_CHECK_VERSION(2,18,0)
id = browser_favorites_find (bfav, 0, (gchar*) gtk_selection_data_get_data (selection_data),
&fav, NULL);
-#else
- id = browser_favorites_find (bfav, 0, (gchar*) selection_data->data, &fav, NULL);
-#endif
if (id < 0) {
memset (&fav, 0, sizeof (BrowserFavoritesAttributes));
fav.id = -1;
fav.type = BROWSER_FAVORITES_DATA_MANAGERS;
fav.name = _("Unnamed data manager");
fav.descr = NULL;
-#if GTK_CHECK_VERSION(2,18,0)
fav.contents = (gchar*) gtk_selection_data_get_data (selection_data);
-#else
- fav.contents = (gchar*) selection_data->data;
-#endif
}
pos = atoi (path);
@@ -664,13 +656,8 @@ tree_store_drag_get_cb (GdauiTreeStore *store, const gchar *path, GtkSelectionDa
if (cvalue) {
const gchar *str;
str = g_value_get_string (cvalue);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
8, (guchar*) str, strlen (str));
-#else
- gtk_selection_data_set (selection_data, selection_data->target,
- 8, (guchar*) str, strlen (str));
-#endif
return TRUE;
}
}
diff --git a/tools/browser/data-manager/data-widget.c b/tools/browser/data-manager/data-widget.c
index 205a67d..838c218 100644
--- a/tools/browser/data-manager/data-widget.c
+++ b/tools/browser/data-manager/data-widget.c
@@ -165,12 +165,8 @@ create_part (DataWidget *dwid, DataSource *source)
part->spinner = BROWSER_SPINNER (browser_spinner_new ());
browser_spinner_set_size ((BrowserSpinner*) part->spinner, GTK_ICON_SIZE_LARGE_TOOLBAR);
-#if GTK_CHECK_VERSION(2,20,0)
page = gtk_alignment_new (0.5, 0.5, 0., 0.);
gtk_container_add (GTK_CONTAINER (page), (GtkWidget*) part->spinner);
-#else
- page = GTK_WIDGET (part->spinner);
-#endif
gtk_notebook_append_page (GTK_NOTEBOOK (nb), page, NULL);
part->data_widget = NULL;
diff --git a/tools/browser/login-dialog.c b/tools/browser/login-dialog.c
index ccd5d64..41a93d1 100644
--- a/tools/browser/login-dialog.c
+++ b/tools/browser/login-dialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@ -106,12 +106,7 @@ login_dialog_init (LoginDialog *dialog)
char *markup, *str;
GtkWidget *dcontents;
-#if GTK_CHECK_VERSION(2,18,0)
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
- dcontents = GTK_DIALOG (dialog)->vbox;
-#endif
-
dialog->priv = g_new0 (LoginDialogPrivate, 1);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
@@ -158,7 +153,8 @@ login_dialog_init (LoginDialog *dialog)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
dialog->priv->login = gdaui_login_new (NULL);
- gdaui_login_set_mode (GDAUI_LOGIN (dialog->priv->login), GDA_UI_LOGIN_ENABLE_CONTROL_CENTRE_MODE);
+ gdaui_login_set_mode (GDAUI_LOGIN (dialog->priv->login),
+ GDA_UI_LOGIN_ENABLE_CONTROL_CENTRE_MODE);
g_signal_connect (dialog->priv->login, "changed",
G_CALLBACK (login_contents_changed_cb), dialog);
gtk_container_add (GTK_CONTAINER (hbox), dialog->priv->login);
diff --git a/tools/browser/query-exec/query-console.c b/tools/browser/query-exec/query-console.c
index 9d4f93c..3db9824 100644
--- a/tools/browser/query-exec/query-console.c
+++ b/tools/browser/query-exec/query-console.c
@@ -704,18 +704,11 @@ popup_container_position_func (PopupContainer *cont, gint *out_x, gint *out_y)
console = g_object_get_data (G_OBJECT (cont), "console");
top = gtk_widget_get_toplevel (console);
gtk_widget_size_request ((GtkWidget*) cont, &req);
-#if GTK_CHECK_VERSION(2,18,0)
GtkAllocation alloc;
gdk_window_get_origin (gtk_widget_get_window (top), &x, &y);
gtk_widget_get_allocation (top, &alloc);
x += (alloc.width - req.width) / 2;
y += (alloc.height - req.height) / 2;
-#else
- gdk_window_get_origin (top->window, &x, &y);
-
- x += (top->allocation.width - req.width) / 2;
- y += (top->allocation.height - req.height) / 2;
-#endif
if (x < 0)
x = 0;
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index ad15fb7..3c51df6 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -1,5 +1,5 @@
/* GNOME DB library
- * Copyright (C) 1999 - 2009 The GNOME Foundation.
+ * Copyright (C) 1999 - 2010 The GNOME Foundation.
*
* AUTHORS:
* Rodrigo Moya <rodrigo gnome-db org>
@@ -649,11 +649,7 @@ text_view_expose_event (GtkTextView *tv, GdkEventExpose *event, QueryEditor *edi
redraw_rect.height = visible_rect.height;
GtkStateType state;
-#if GTK_CHECK_VERSION(2,18,0)
state = gtk_widget_get_state (GTK_WIDGET (tv));
-#else
- state = GTK_WIDGET_STATE (GTK_WIDGET (tv));
-#endif
gc = gtk_widget_get_style (GTK_WIDGET (tv))->bg_gc[state];
margin = gtk_text_view_get_left_margin (tv);
diff --git a/tools/browser/query-exec/query-favorite-selector.c b/tools/browser/query-exec/query-favorite-selector.c
index 3aebbb2..e1b1655 100644
--- a/tools/browser/query-exec/query-favorite-selector.c
+++ b/tools/browser/query-exec/query-favorite-selector.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 The GNOME Foundation
+ * Copyright (C) 2009 - 2010 The GNOME Foundation
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -573,23 +573,15 @@ tree_store_drag_drop_cb (GdauiTreeStore *store, const gchar *path, GtkSelectionD
gint id;
bfav = browser_connection_get_favorites (tsel->priv->bcnc);
-#if GTK_CHECK_VERSION(2,18,0)
id = browser_favorites_find (bfav, 0, (gchar*) gtk_selection_data_get_data (selection_data),
&fav, NULL);
-#else
- id = browser_favorites_find (bfav, 0, (gchar*) selection_data->data, &fav, NULL);
-#endif
if (id < 0) {
memset (&fav, 0, sizeof (BrowserFavoritesAttributes));
fav.id = -1;
fav.type = BROWSER_FAVORITES_QUERIES;
fav.name = _("Unnamed query");
fav.descr = NULL;
-#if GTK_CHECK_VERSION(2,18,0)
fav.contents = (gchar*) gtk_selection_data_get_data (selection_data);
-#else
- fav.contents = (gchar*) selection_data->data;
-#endif
}
pos = atoi (path);
@@ -636,13 +628,8 @@ tree_store_drag_get_cb (GdauiTreeStore *store, const gchar *path, GtkSelectionDa
if (cvalue) {
const gchar *str;
str = g_value_get_string (cvalue);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
8, (guchar*) str, strlen (str));
-#else
- gtk_selection_data_set (selection_data, selection_data->target,
- 8, (guchar*) str, strlen (str));
-#endif
return TRUE;
}
}
diff --git a/tools/browser/schema-browser/favorite-selector.c b/tools/browser/schema-browser/favorite-selector.c
index 9d57073..71649f4 100644
--- a/tools/browser/schema-browser/favorite-selector.c
+++ b/tools/browser/schema-browser/favorite-selector.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 The GNOME Foundation
+ * Copyright (C) 2009 - 2010 The GNOME Foundation
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -343,11 +343,7 @@ tree_store_drag_drop_cb (GdauiTreeStore *store, const gchar *path, GtkSelectionD
fav.type = BROWSER_FAVORITES_TABLES;
fav.name = NULL;
fav.descr = NULL;
-#if GTK_CHECK_VERSION(2,18,0)
fav.contents = (gchar*) gtk_selection_data_get_data (selection_data);
-#else
- fav.contents = (gchar*) selection_data->data;
-#endif
pos = atoi (path);
g_print ("%s() path => %s, pos: %d\n", __FUNCTION__, path, pos);
@@ -391,14 +387,9 @@ tree_store_drag_get_cb (GdauiTreeStore *store, const gchar *path, GtkSelectionDa
if (cvalue) {
const gchar *str;
str = g_value_get_string (cvalue);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_selection_data_set (selection_data,
gtk_selection_data_get_target (selection_data), 8,
(guchar*) str, strlen (str));
-#else
- gtk_selection_data_set (selection_data, selection_data->target, 8,
- (guchar*) str, strlen (str));
-#endif
return TRUE;
}
}
diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c
index 9d18d00..62f392d 100644
--- a/tools/browser/schema-browser/table-columns.c
+++ b/tools/browser/schema-browser/table-columns.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 The GNOME Foundation
+ * Copyright (C) 2009 - 2010 The GNOME Foundation
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -552,11 +552,7 @@ visibility_notify_event (GtkWidget *text_view, GdkEventVisibility *event, TableC
{
gint wx, wy, bx, by;
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_pointer (gtk_widget_get_window (text_view), &wx, &wy, NULL);
-#else
- gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
-#endif
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
GTK_TEXT_WINDOW_WIDGET,
@@ -581,11 +577,7 @@ motion_notify_event (GtkWidget *text_view, GdkEventMotion *event, TableColumns *
set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y, tcolumns);
-#if GTK_CHECK_VERSION(2,18,0)
gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
-#else
- gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
-#endif
return FALSE;
}
diff --git a/tools/browser/schema-browser/table-info.c b/tools/browser/schema-browser/table-info.c
index 40f5c63..9872148 100644
--- a/tools/browser/schema-browser/table-info.c
+++ b/tools/browser/schema-browser/table-info.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 The GNOME Foundation
+ * Copyright (C) 2009 - 2010 The GNOME Foundation
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -228,14 +228,9 @@ source_drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
case TARGET_KEY_VALUE: {
gchar *str;
str = table_info_to_selection (tinfo);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_selection_data_set (selection_data,
gtk_selection_data_get_target (selection_data), 8, (guchar*) str,
strlen (str));
-#else
- gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar*) str,
- strlen (str));
-#endif
g_free (str);
break;
}
diff --git a/tools/browser/support.c b/tools/browser/support.c
index 0fda728..444e83d 100644
--- a/tools/browser/support.c
+++ b/tools/browser/support.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 - 2010The GNOME Foundation.
+ * Copyright (C) 2009 - 2010 The GNOME Foundation.
*
* AUTHORS:
* Vivien Malerba <malerba gnome-db org>
@@ -212,11 +212,7 @@ browser_show_notice (GtkWindow *parent, const gchar *context, const gchar *forma
g_signal_connect_data (cb, "toggled",
G_CALLBACK (hide_notice_toggled_cb), g_strdup (context),
(GClosureNotify) g_free, 0);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), cb, FALSE, FALSE, 10);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), cb, FALSE, FALSE, 10);
-#endif
}
gtk_widget_show_all (dialog);
@@ -274,7 +270,6 @@ browser_show_help (GtkWindow *parent, const gchar *topic)
return;
}
-#if GTK_CHECK_VERSION(2,14,0)
gchar *ruri;
screen = gtk_widget_get_screen ((GtkWidget*) parent);
@@ -282,14 +277,6 @@ browser_show_help (GtkWindow *parent, const gchar *topic)
gtk_show_uri (screen, ruri, gtk_get_current_event_time (), &error);
g_free (ruri);
-#else
- gchar *command;
-
- command = g_strconcat ("gnome-help ghelp://", uri, NULL);
- screen = gtk_widget_get_screen (GTK_WIDGET (parent));
- gdk_spawn_command_line_on_screen (screen, command, &error);
- g_free (command);
-#endif
if (error) {
GtkWidget *d;
d = gtk_message_dialog_new (parent,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
