aboutsummaryrefslogtreecommitdiff
path: root/src/idoscalemenuitem.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/idoscalemenuitem.c')
-rw-r--r--src/idoscalemenuitem.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c
index 499c28f..986d9a7 100644
--- a/src/idoscalemenuitem.c
+++ b/src/idoscalemenuitem.c
@@ -144,27 +144,15 @@ ido_scale_menu_item_size_allocate (GtkWidget *widget,
switch (priv->style)
{
case IDO_SCALE_MENU_ITEM_STYLE_IMAGE:
-#ifdef USE_GTK3
gtk_widget_get_preferred_size (priv->primary_image, &primary_req, NULL);
gtk_widget_get_preferred_size (priv->secondary_image, &secondary_req, NULL);
-#else
- gtk_widget_get_child_requisition (priv->primary_image, &primary_req);
- gtk_widget_get_child_requisition (priv->secondary_image, &secondary_req);
-#endif
-
primary_padding = gtk_widget_get_visible (priv->primary_image) ? primary_req.width : 0;
secondary_padding = gtk_widget_get_visible (priv->secondary_image) ? secondary_req.width : 0;
break;
case IDO_SCALE_MENU_ITEM_STYLE_LABEL:
-#ifdef USE_GTK3
gtk_widget_get_preferred_size (priv->primary_label, &primary_req, NULL);
gtk_widget_get_preferred_size (priv->secondary_label, &secondary_req, NULL);
-#else
- gtk_widget_get_child_requisition (priv->primary_label, &primary_req);
- gtk_widget_get_child_requisition (priv->secondary_label, &secondary_req);
-#endif
-
primary_padding = gtk_widget_get_visible (priv->primary_label) ? primary_req.width : 0;
secondary_padding = gtk_widget_get_visible (priv->secondary_label) ? secondary_req.width : 0;
break;
@@ -236,11 +224,7 @@ ido_scale_menu_item_constructed (GObject *object)
g_object_ref (priv->scale);
gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
-#ifdef USE_GTK3
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
- hbox = gtk_hbox_new (FALSE, 0);
-#endif
priv->primary_image = gtk_image_new ();
g_signal_connect (priv->primary_image, "notify",
@@ -485,10 +469,6 @@ ido_scale_menu_item_button_press_event (GtkWidget *menuitem,
IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
gdouble x;
-#ifndef USE_GTK3
- GtkWidget *scale = priv->scale;
-#endif
-
// can we block emissions of "grab-notify" on parent??
translate_event_coordinates (menuitem, event->x, &x);
@@ -497,28 +477,16 @@ ido_scale_menu_item_button_press_event (GtkWidget *menuitem,
translate_event_coordinates (menuitem, event->x_root, &x);
event->x_root = x;
-#ifndef USE_GTK3
- ubuntu_gtk_widget_set_has_grab (scale, TRUE);
-#endif
-
gtk_widget_event (priv->scale,
((GdkEvent *)(void*)(event)));
-#ifndef USE_GTK3
- ubuntu_gtk_widget_set_has_grab (scale, FALSE);
-#endif
-
if (!priv->grabbed)
{
priv->grabbed = TRUE;
g_signal_emit (menuitem, signals[SLIDER_GRABBED], 0);
}
-#ifdef USE_GTK3
return FALSE;
-#else
- return TRUE;
-#endif
}
static gboolean