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

Thu Jan 25 14:57:16 EET 2007

Author: timj
Date: 2007-01-25 14:57:14 +0200 (Thu, 25 Jan 2007)
New Revision: 9344

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertext.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h
Log:
Thu Jan 25 13:55:47 2007  Tim Janik  <timj at imendio.com>

        * gtk/gtkcellrenderertext.c:
        * gtk/gtkcellrenderertoggle.c:
        * gtk/gtktreeview.h: conditionalize with MAEMO_CHANGES.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================

--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-25 12:50:53 UTC (rev 9343)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-25 12:57:14 UTC (rev 9344)
@@ -1,3 +1,9 @@
+Thu Jan 25 13:55:47 2007  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtkcellrenderertext.c:
+	* gtk/gtkcellrenderertoggle.c:
+	* gtk/gtktreeview.h: conditionalize with MAEMO_CHANGES.
+
 Thu Jan 25 12:44:35 2007  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtktextbuffer.h: conditionalize with MAEMO_CHANGES.

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertext.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertext.c	2007-01-25 12:50:53 UTC (rev 9343)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertext.c	2007-01-25 12:57:14 UTC (rev 9344)
@@ -160,10 +160,12 @@
 
   GTK_CELL_RENDERER (celltext)->xalign = 0.0;
   GTK_CELL_RENDERER (celltext)->yalign = 0.5;
-  /* MAEMO START */
+  GTK_CELL_RENDERER (celltext)->xpad = 2;
+  GTK_CELL_RENDERER (celltext)->ypad = 2;
+#ifdef MAEMO_CHANGES
   GTK_CELL_RENDERER (celltext)->xpad = 0;
   GTK_CELL_RENDERER (celltext)->ypad = 0;
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
   celltext->fixed_height_rows = -1;
   celltext->font = pango_font_description_new ();
 
@@ -1619,9 +1621,10 @@
   else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
 	   GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
     {
-      /* MAEMO START */
+      state = GTK_STATE_PRELIGHT;
+#ifdef MAEMO_CHANGES
       state = GTK_STATE_NORMAL;
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
     }
   else
     {

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c	2007-01-25 12:50:53 UTC (rev 9343)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcellrenderertoggle.c	2007-01-25 12:57:14 UTC (rev 9344)
@@ -68,15 +68,17 @@
   PROP_ACTIVE,
   PROP_RADIO,
   PROP_INCONSISTENT,
-  PROP_INDICATOR_SIZE
-  /* MAEMO START */
-  , PROP_CHECKBOX_MODE
-  /* MAEMO END */
+  PROP_INDICATOR_SIZE,
+#ifdef MAEMO_CHANGES
+  PROP_CHECKBOX_MODE
+#endif /* MAEMO_CHANGES */
 };
 
-/* MAEMO START */
+#ifndef MAEMO_CHANGES
+#define TOGGLE_WIDTH 12
+#else  /* MAEMO_CHANGES */
 #define TOGGLE_WIDTH 26
-/* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
 
@@ -88,9 +90,9 @@
   gint indicator_size;
 
   guint inconsistent : 1;
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   guint checkbox_mode : 1;
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 };
 
 
@@ -108,9 +110,15 @@
   celltoggle->radio = FALSE;
 
   GTK_CELL_RENDERER (celltoggle)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
-  /* MAEMO CHANGE: assignments to xpad, ypad removed */
+#ifdef MAEMO_CHANGES
+  GTK_CELL_RENDERER (celltoggle)->xpad = 2;
+  GTK_CELL_RENDERER (celltoggle)->ypad = 2;
+#endif /* MAEMO_CHANGES */
 
+  priv->indicator_size = 12;
+#ifdef MAEMO_CHANGES
   priv->indicator_size = TOGGLE_WIDTH;
+#endif /* MAEMO_CHANGES */
   priv->inconsistent = FALSE;
 }
 
@@ -159,7 +167,7 @@
 							 FALSE,
 							 GTK_PARAM_READWRITE));
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /**
    * GtkCellRendererToggle:checkbox-mode:
    *
@@ -176,7 +184,7 @@
                                                          FALSE,
                                                          GTK_PARAM_READABLE |
                                                          GTK_PARAM_WRITABLE));
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   g_object_class_install_property (object_class,
 				   PROP_INDICATOR_SIZE,
@@ -238,11 +246,11 @@
     case PROP_INDICATOR_SIZE:
       g_value_set_int (value, priv->indicator_size);
       break;
-    /* MAEMO START */
+#ifdef MAEMO_CHANGES
     case PROP_CHECKBOX_MODE:
       g_value_set_boolean (value, priv->checkbox_mode);
       break;
-    /* MAEMO END */
+#endif /* MAEMO_CHANGES */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -278,11 +286,11 @@
     case PROP_INDICATOR_SIZE:
       priv->indicator_size = g_value_get_int (value);
       break;
-    /* MAEMO START */
+#ifdef MAEMO_CHANGES
     case PROP_CHECKBOX_MODE:
       priv->checkbox_mode = g_value_get_boolean (value);
       break;
-    /* MAEMO END */
+#endif /* MAEMO_CHANGES */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -375,7 +383,7 @@
   if (width <= 0 || height <= 0)
     return;
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   if (priv->checkbox_mode)
     {
       /* Checkbox mode drawing */
@@ -413,7 +421,7 @@
   else
     {
       /* Normal operation */
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (priv->inconsistent)
     shadow = GTK_SHADOW_ETCHED_IN;
@@ -438,9 +446,9 @@
       else
         state = GTK_STATE_INSENSITIVE;
     }
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   if (celltoggle->radio)
     {

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h	2007-01-25 12:50:53 UTC (rev 9343)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h	2007-01-25 12:57:14 UTC (rev 9344)
@@ -103,20 +103,15 @@
   gboolean (* select_cursor_parent)       (GtkTreeView       *tree_view);
   gboolean (* start_interactive_search)   (GtkTreeView       *tree_view);
 
-  /* MAEMO START */
+  /* Padding for future expansion */
+#ifdef MAEMO_CHANGES
   void     (* row_insensitive)            (GtkTreeView       *tree_view,
                                            GtkTreePath       *path);
-  /* MAEMO END */
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
+#endif /* MAEMO_CHANGES */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
-
-  /* MAEMO START */
-  /* void (*_gtk_reserved4) (void); */
-  /* MAEMO END */
+  void (*_gtk_reserved4) (void);
 };
 
 


