[maemo-commits] [maemo-commits] r10058 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-20 16:25:05 +0200 (Tue, 20 Feb 2007)
New Revision: 10058

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c
Log:
2007-02-20  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtkcellrenderertoggle.c: back out checkbox-mode.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-20 14:12:29 UTC (rev 10057)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-20 14:25:05 UTC (rev 10058)
@@ -1,5 +1,9 @@
 2007-02-20  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtkcellrenderertoggle.c: back out checkbox-mode.
+
+2007-02-20  Kristian Rietveld  <kris at imendio.com>
+
 	* gdk/gdkwindow.h: modify GdkWindowTypeHint so that we don't end
 	the enumerator list with a comma.  (MB#1087).
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c	2007-02-20 14:12:29 UTC (rev 10057)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c	2007-02-20 14:25:05 UTC (rev 10058)
@@ -68,10 +68,7 @@
   PROP_ACTIVE,
   PROP_RADIO,
   PROP_INCONSISTENT,
-  PROP_INDICATOR_SIZE,
-#ifdef MAEMO_CHANGES
-  PROP_CHECKBOX_MODE
-#endif /* MAEMO_CHANGES */
+  PROP_INDICATOR_SIZE
 };
 
 #ifndef MAEMO_CHANGES
@@ -90,9 +87,6 @@
   gint indicator_size;
 
   guint inconsistent : 1;
-#ifdef MAEMO_CHANGES
-  guint checkbox_mode : 1;
-#endif /* MAEMO_CHANGES */
 };
 
 
@@ -167,26 +161,7 @@
 							 FALSE,
 							 GTK_PARAM_READWRITE));
 
-#ifdef MAEMO_CHANGES
-  /**
-   * GtkCellRendererToggle:checkbox-mode:
-   *
-   * Activates the checkbox mode of drawing selection. Currently there are no 
-   * major differences in how the drawing is done.
-   * 
-   * Since: maemo 1.0
-   */
   g_object_class_install_property (object_class,
-                                   PROP_CHECKBOX_MODE,
-                                   g_param_spec_boolean ("checkbox-mode",
-                                                         P_("Checkbox Mode"),
-                                                         P_("Activates the checkbox mode of drawing selection"),
-                                                         FALSE,
-                                                         GTK_PARAM_READABLE |
-                                                         GTK_PARAM_WRITABLE));
-#endif /* MAEMO_CHANGES */
-
-  g_object_class_install_property (object_class,
 				   PROP_INDICATOR_SIZE,
 				   g_param_spec_int ("indicator-size",
 						     P_("Indicator size"),
@@ -246,11 +221,6 @@
     case PROP_INDICATOR_SIZE:
       g_value_set_int (value, priv->indicator_size);
       break;
-#ifdef MAEMO_CHANGES
-    case PROP_CHECKBOX_MODE:
-      g_value_set_boolean (value, priv->checkbox_mode);
-      break;
-#endif /* MAEMO_CHANGES */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -286,11 +256,6 @@
     case PROP_INDICATOR_SIZE:
       priv->indicator_size = g_value_get_int (value);
       break;
-#ifdef MAEMO_CHANGES
-    case PROP_CHECKBOX_MODE:
-      priv->checkbox_mode = g_value_get_boolean (value);
-      break;
-#endif /* MAEMO_CHANGES */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -383,46 +348,6 @@
   if (width <= 0 || height <= 0)
     return;
 
-#ifdef MAEMO_CHANGES
-  if (priv->checkbox_mode)
-    {
-      /* Checkbox mode drawing */
-
-      state = GTK_STATE_NORMAL;
-
-      if (!cell->sensitive)
-        {
-          state = GTK_STATE_INSENSITIVE;
-        }
-#if 0
-      /* FIXME: Enable this after the activatable-issue is cleared up */
-      if (!celltoggle->activatable)
-        state = GTK_STATE_INSENSITIVE;
-#endif
-
-      if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
-        shadow = GTK_SHADOW_IN;
-      else
-        shadow = GTK_SHADOW_OUT;
-
-      if (priv->inconsistent)
-        shadow = GTK_SHADOW_ETCHED_IN;
-
-      if ((flags & GTK_CELL_RENDERER_FOCUSED) == GTK_CELL_RENDERER_FOCUSED)
-        {
-          /* Don't overlap with the focus border */
-          height -= 2;
-          if (GTK_WIDGET_HAS_FOCUS (widget))
-            state = GTK_STATE_ACTIVE;
-          else
-            state = GTK_STATE_PRELIGHT;
-        }
-    }
-  else
-    {
-      /* Normal operation */
-#endif /* MAEMO_CHANGES */
-
   if (priv->inconsistent)
     shadow = GTK_SHADOW_ETCHED_IN;
   else
@@ -446,9 +371,6 @@
       else
         state = GTK_STATE_INSENSITIVE;
     }
-#ifdef MAEMO_CHANGES
-    }
-#endif /* MAEMO_CHANGES */
 
   if (celltoggle->radio)
     {