[maemo-commits] [maemo-commits] r13777 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-09-12 14:24:16 +0300 (Wed, 12 Sep 2007)
New Revision: 13777

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtknotebook.c
Log:
2007-09-12 13:14:34  Tim Janik  <timj at imendio.com>

        * gtk/gtknotebook.c: make tabs scrollable and homogeneous by default
        if MAEMO_CHANGES is defined.
        (gtk_notebook_real_insert_page): expand notebook pages by default for
        the homogeneous setting to take effect.




Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-12 11:15:51 UTC (rev 13776)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-12 11:24:16 UTC (rev 13777)
@@ -1,3 +1,10 @@
+2007-09-12 13:14:34  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtknotebook.c: make tabs scrollable and homogeneous by default
+	if MAEMO_CHANGES is defined.
+	(gtk_notebook_real_insert_page): expand notebook pages by default for
+	the homogeneous setting to take effect.
+
 2007-09-10  Kristian Rietveld  <kris at imendio.com>
 
 	Merge from upstream:

Modified: projects/haf/trunk/gtk+/gtk/gtknotebook.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtknotebook.c	2007-09-12 11:15:51 UTC (rev 13776)
+++ projects/haf/trunk/gtk+/gtk/gtknotebook.c	2007-09-12 11:24:16 UTC (rev 13777)
@@ -1000,6 +1000,10 @@
   notebook->child_has_focus = FALSE;
   notebook->have_visible_child = FALSE;
   notebook->focus_out = FALSE;
+#ifdef MAEMO_CHANGES
+  notebook->homogeneous = TRUE;
+  notebook->scrollable = TRUE;
+#endif
 
   notebook->has_before_previous = 1;
   notebook->has_before_next     = 0;
@@ -3990,6 +3994,9 @@
   page->tab_label = tab_label;
   page->menu_label = menu_label;
   page->expand = FALSE;
+#ifdef MAEMO_CHANGES
+  page->expand = TRUE;
+#endif
   page->fill = TRUE;
   page->pack = GTK_PACK_START;