[gtk+/native-layout-incubator-2: 145/145] Merge branch 'master' into native-layout-incubator-2



commit 41915fc0a45fe0e066892915b8e288ee182eca2b
Merge: d8da5ac 48c34b6
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Mon Aug 16 12:09:11 2010 -0400

    Merge branch 'master' into native-layout-incubator-2
    
    Conflicts:
    	tests/testheightforwidth.c

 build/win32/vs9/gdk-win32.vcproj               |    1 -
 build/win32/vs9/gtk+.vsprops                   |    1 -
 configure.ac                                   |   14 +-
 demos/Makefile.am                              |   20 -
 demos/gtk-demo/appwindow.c                     |   18 +-
 demos/gtk-demo/textview.c                      |   30 +-
 demos/testpixbuf-drawable.c                    |  115 -
 demos/testpixbuf-save.c                        |   34 +-
 demos/testpixbuf.c                             |  643 ---
 docs/reference/gdk/gdk-docs.sgml               |    3 -
 docs/reference/gdk/gdk3-sections.txt           |  213 +-
 docs/reference/gdk/gdk3.types                  |    2 -
 docs/reference/gdk/tmpl/colors.sgml            |   10 -
 docs/reference/gdk/tmpl/drawing.sgml           |  290 --
 docs/reference/gdk/tmpl/event_structs.sgml     |    3 +-
 docs/reference/gdk/tmpl/gcs.sgml               |  427 --
 docs/reference/gdk/tmpl/gdkdisplay.sgml        |    9 +
 docs/reference/gdk/tmpl/gdkscreen.sgml         |   18 -
 docs/reference/gdk/tmpl/images.sgml            |  228 --
 docs/reference/gdk/tmpl/pango_interaction.sgml |  153 +-
 docs/reference/gdk/tmpl/pixbufs.sgml           |    5 +-
 docs/reference/gdk/tmpl/pixmaps.sgml           |   74 +-
 docs/reference/gdk/tmpl/rgb.sgml               |  410 --
 docs/reference/gdk/tmpl/visuals.sgml           |   10 +-
 docs/reference/gdk/tmpl/x_interaction.sgml     |   81 -
 docs/reference/gtk/building.sgml               |   32 -
 docs/reference/gtk/gtk-docs.sgml               |    2 +-
 docs/reference/gtk/gtk3-sections.txt           |   18 +-
 docs/reference/gtk/migrating-2to3.xml          |  388 ++-
 docs/reference/gtk/tmpl/gtkdrawingarea.sgml    |   13 +-
 docs/reference/gtk/tmpl/gtkexpander.sgml       |   23 +
 docs/reference/gtk/tmpl/gtkgc.sgml             |   51 -
 docs/reference/gtk/tmpl/gtknotebook.sgml       |   18 +
 docs/reference/gtk/tmpl/gtktexttag.sgml        |   23 -
 docs/sizing-test.txt                           |    3 +-
 docs/tutorial/gtk-tut.sgml                     |    1 -
 gdk/Makefile.am                                |    8 -
 gdk/directfb/Makefile.am                       |    2 -
 gdk/directfb/TODO                              |    1 -
 gdk/directfb/gdkcolor-directfb.c               |   48 -
 gdk/directfb/gdkdisplay-directfb.c             |    1 -
 gdk/directfb/gdkdrawable-directfb.c            | 1007 -----
 gdk/directfb/gdkgc-directfb.c                  |  386 --
 gdk/directfb/gdkimage-directfb.c               |  405 --
 gdk/directfb/gdkpixmap-directfb.c              |  105 -
 gdk/directfb/gdkprivate-directfb.h             |   40 -
 gdk/gdk.c                                      |    4 -
 gdk/gdk.h                                      |    3 -
 gdk/gdk.symbols                                |  150 +-
 gdk/gdkcolor.h                                 |    3 -
 gdk/gdkdisplay.c                               |   16 +
 gdk/gdkdisplay.h                               |    3 +-
 gdk/gdkdraw.c                                  | 1437 +-------
 gdk/gdkdrawable.h                              |  264 --
 gdk/gdkgc.c                                    | 1465 -------
 gdk/gdkgc.h                                    |  288 --
 gdk/gdkimage.c                                 |  566 ---
 gdk/gdkimage.h                                 |  126 -
 gdk/gdkinternals.h                             |  145 +-
 gdk/gdkoffscreenwindow.c                       |  411 +--
 gdk/gdkpango.c                                 | 1219 +------
 gdk/gdkpango.h                                 |  104 -
 gdk/gdkpixbuf-drawable.c                       | 1404 +------
 gdk/gdkpixbuf-render.c                         |   30 +-
 gdk/gdkpixbuf.h                                |   18 +-
 gdk/gdkpixmap.c                                |  576 ---
 gdk/gdkpixmap.h                                |   30 -
 gdk/gdkrgb.c                                   | 3711 ------------------
 gdk/gdkrgb.h                                   |  137 -
 gdk/gdkscreen.c                                |   26 -
 gdk/gdkscreen.h                                |    6 -
 gdk/gdktypes.h                                 |   11 -
 gdk/gdkwindow.c                                | 1129 +-----
 gdk/gdkwindow.h                                |    2 -
 gdk/gdkwindowimpl.h                            |   13 +-
 gdk/makefile.msc                               |    4 -
 gdk/quartz/Makefile.am                         |    2 -
 gdk/quartz/gdkcolor-quartz.c                   |   15 -
 gdk/quartz/gdkdevice-core.c                    |    4 +-
 gdk/quartz/gdkdrawable-quartz.c                |  479 +---
 gdk/quartz/gdkevents-quartz.c                  |   16 +-
 gdk/quartz/gdkgc-quartz.c                      |  686 ----
 gdk/quartz/gdkgeometry-quartz.c                |   52 +-
 gdk/quartz/gdkimage-quartz.c                   |  301 --
 gdk/quartz/gdkpixmap-quartz.c                  |   53 -
 gdk/quartz/gdkprivate-quartz.h                 |   68 +-
 gdk/quartz/gdkwindow-quartz.c                  |  106 +-
 gdk/testgdk.c                                  |  928 -----
 gdk/win32/Makefile.am                          |    2 -
 gdk/win32/gdkcolor-win32.c                     |   38 -
 gdk/win32/gdkdisplay-win32.c                   |    1 -
 gdk/win32/gdkdrawable-win32.c                  | 1128 +------
 gdk/win32/gdkgc-win32.c                        | 1102 ------
 gdk/win32/gdkimage-win32.c                     |  396 --
 gdk/win32/gdkpixmap-win32.c                    |  125 -
 gdk/win32/gdkprivate-win32.h                   |   71 -
 gdk/win32/gdkwin32.h                           |    7 -
 gdk/win32/gdkwindow-win32.c                    |   59 +-
 gdk/win32/makefile.msc                         |    1 -
 gdk/x11/Makefile.am                            |    2 -
 gdk/x11/gdkcolor-x11.c                         |   68 -
 gdk/x11/gdkcursor-x11.c                        |   88 +-
 gdk/x11/gdkdisplay-x11.c                       |    4 -
 gdk/x11/gdkdisplay-x11.h                       |   13 -
 gdk/x11/gdkdrawable-x11.c                      |  953 +-----
 gdk/x11/gdkdrawable-x11.h                      |    2 -
 gdk/x11/gdkgc-x11.c                            |  697 ----
 gdk/x11/gdkgeometry-x11.c                      |   96 +-
 gdk/x11/gdkimage-x11.c                         |  754 ----
 gdk/x11/gdkpixmap-x11.c                        |   98 -
 gdk/x11/gdkprivate-x11.h                       |   53 +-
 gdk/x11/gdkscreen-x11.c                        |   13 +-
 gdk/x11/gdkscreen-x11.h                        |    4 +-
 gdk/x11/gdktestutils-x11.c                     |    9 +-
 gdk/x11/gdkwindow-x11.c                        |   13 +-
 gdk/x11/gdkx.h                                 |   11 -
 gdk/x11/gdkxftdefaults.c                       |   37 +-
 gtk/Makefile.am                                |    4 +-
 gtk/gtk.h                                      |    1 -
 gtk/gtk.symbols                                |   18 +-
 gtk/gtkaboutdialog.c                           |  159 +-
 gtk/gtkaboutdialog.h                           |   38 +
 gtk/gtkaccellabel.c                            |    6 +-
 gtk/gtkaccellabel.h                            |    4 +-
 gtk/gtkbox.c                                   |  666 ++--
 gtk/gtkbuilder.c                               |    8 +-
 gtk/gtkbutton.c                                |   34 +-
 gtk/gtkcalendar.h                              |    3 -
 gtk/gtkcellrendererspin.c                      |    2 +-
 gtk/gtkcellrenderertext.c                      |    2 +-
 gtk/gtkcolorbutton.c                           |    4 +-
 gtk/gtkcolorsel.c                              |   93 +-
 gtk/gtkcombobox.c                              |   26 +-
 gtk/gtkdnd.c                                   |   42 +-
 gtk/gtkentry.c                                 |    4 +-
 gtk/gtkexpander.c                              |  102 +-
 gtk/gtkexpander.h                              |    3 +
 gtk/gtkfilechooser.c                           |    2 +-
 gtk/gtkfilechooserdefault.c                    |   41 -
 gtk/gtkfilechooserdialog.c                     |    6 +-
 gtk/gtkfilechooserprivate.h                    |    3 +-
 gtk/gtkframe.c                                 |  131 +-
 gtk/gtkgc.c                                    |  404 --
 gtk/gtkiconview.c                              |   28 -
 gtk/gtkimage.c                                 |  184 +-
 gtk/gtkimage.h                                 |   15 -
 gtk/gtkimcontext.h                             |    5 +-
 gtk/gtklabel.c                                 |  127 +-
 gtk/gtkliststore.c                             |    4 +-
 gtk/gtkmain.c                                  |   23 +-
 gtk/gtknotebook.c                              |   57 +-
 gtk/gtknotebook.h                              |    2 +
 gtk/gtkpango.c                                 |  233 ++
 gtk/{gtkgc.h => gtkpango.h}                    |   16 +-
 gtk/gtkplug.c                                  |    2 +-
 gtk/gtkprintunixdialog.c                       |    2 +-
 gtk/gtkprogressbar.c                           |   12 +-
 gtk/gtkspinbutton.c                            |    2 +-
 gtk/gtkstatusicon.c                            |    6 +-
 gtk/gtkstyle.c                                 | 2489 +++++-------
 gtk/gtkstyle.h                                 |   31 -
 gtk/gtktextdisplay.c                           |  364 +-
 gtk/gtktextdisplay.h                           |    2 +-
 gtk/gtktextlayout.c                            |   12 -
 gtk/gtktexttag.c                               |  215 -
 gtk/gtktexttag.h                               |    7 -
 gtk/gtktexttagprivate.h                        |   10 -
 gtk/gtktextutil.c                              |    2 +-
 gtk/gtktoggleaction.c                          |    4 +-
 gtk/gtktogglebutton.c                          |    2 +-
 gtk/gtktoggletoolbutton.c                      |    4 +-
 gtk/gtktrayicon-x11.c                          |    2 -
 gtk/gtktreemodel.c                             |    4 +-
 gtk/gtktreeselection.c                         |   33 +-
 gtk/gtktreestore.c                             |    4 +-
 gtk/gtktreeview.c                              |    7 +
 gtk/gtkwidget.c                                |   15 +-
 gtk/gtkwin32embedwidget.c                      |   37 +-
 gtk/gtkwindow-decorate.c                       |    4 +-
 gtk/gtkwindow.c                                |    4 -
 gtk/tests/defaultvalue.c                       |    6 -
 gtk/tests/filechooser.c                        |    1 -
 modules/engines/ms-windows/msw_style.c         |   14 +-
 modules/other/gail/gailadjustment.c            |   44 +
 modules/other/gail/gailimage.c                 |    8 -
 modules/other/gail/gailnotebook.c              |    2 +-
 modules/other/gail/gailrange.c                 |   20 +
 modules/other/gail/gailspinbutton.c            |   20 +
 modules/other/gail/gailtreeview.c              |   12 +-
 modules/other/gail/libgail-util/gailmisc.c     |   32 -
 po-properties/gl.po                            |  307 +-
 po-properties/he.po                            |  340 +-
 po-properties/pa.po                            | 3860 +++++++++---------
 po-properties/zh_CN.po                         |  554 ++--
 po/LINGUAS                                     |    1 +
 po/he.po                                       |  158 +-
 po/pa.po                                       | 1745 +++++----
 po/ug.po                                       | 5008 ++++++++++++++++++++++++
 po/zh_CN.po                                    |  173 +-
 tests/Makefile.am                              |    3 -
 tests/simple.c                                 |    3 +-
 tests/testdnd.c                                |   47 +-
 tests/testgtk.c                                |  553 +---
 tests/testheightforwidth.c                     |   43 +
 tests/testmultiscreen.c                        |    3 +-
 tests/testrgb.c                                |  330 --
 tests/testwindows.c                            |   29 +-
 207 files changed, 12538 insertions(+), 33797 deletions(-)
---
diff --cc tests/testheightforwidth.c
index 2c27047,f784864..dba3da9
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@@ -617,358 -617,47 +617,401 @@@ TestInterface interfaces[] = 
    },
  
    {
+     "Wrapping Frame Label",
+     "This test demonstrates how the frame label can fill to its natural width "
+     "and also trade height for width.",
+     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+     "<interface>"
+     "  <requires lib=\"gtk+\" version=\"2.20\"/>"
+     "  <!-- interface-naming-policy project-wide -->"
+     "  <object class=\"GtkWindow\" id=\"window\">"
+     "    <property name=\"default_width\">400</property>"
+     "    <property name=\"default_height\">150</property>"
+     "    <child>"
+     "      <object class=\"GtkFrame\" id=\"frame1\">"
+     "        <property name=\"visible\">True</property>"
+     "        <property name=\"border_width\">8</property>"
+     "        <property name=\"label_xalign\">0</property>"
+     "        <child>"
+     "          <object class=\"GtkAlignment\" id=\"alignment1\">"
+     "            <property name=\"visible\">True</property>"
+     "            <property name=\"left_padding\">12</property>"
+     "            <child>"
+     "              <object class=\"GtkLabel\" id=\"label2\">"
+     "                <property name=\"visible\">True</property>"
+     "                <property name=\"label\" translatable=\"yes\">some content</property>"
+     "              </object>"
+     "            </child>"
+     "          </object>"
+     "        </child>"
+     "        <child type=\"label\">"
+     "          <object class=\"GtkLabel\" id=\"label1\">"
+     "            <property name=\"visible\">True</property>"
+     "            <property name=\"label\" translatable=\"yes\">A frame label that's a little long and wraps</property>"
+     "            <property name=\"use_markup\">True</property>"
+     "            <property name=\"wrap\">True</property>"
+     "          </object>"
+     "        </child>"
+     "      </object>"
+     "    </child>"
+     "  </object>"
+     "</interface>",
+     NULL
+   },
++
++  {
 +    "Ellipsizing Treeview",
 +    "Demonstrates how natural size can be shared across treeview columns and renderers.",
 +    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
 +    "<interface>"
 +    "  <requires lib=\"gtk+\" version=\"2.20\"/>"
 +    "  <!-- interface-naming-policy project-wide -->"
 +    "  <object class=\"GtkWindow\" id=\"window\">"
 +    "    <property name=\"default_width\">500</property>"
 +    "    <child>"
 +    "      <object class=\"GtkHPaned\" id=\"hpaned1\">"
 +    "        <property name=\"visible\">True</property>"
 +    "        <property name=\"can_focus\">True</property>"
 +    "        <property name=\"position\">400</property>"
 +    "        <child>"
 +    "          <object class=\"GtkTreeView\" id=\"treeview1\">"
 +    "            <property name=\"visible\">True</property>"
 +    "            <property name=\"can_focus\">True</property>"
 +    "            <property name=\"model\">liststore1</property>"
 +    "            <property name=\"headers_clickable\">False</property>"
 +    "            <property name=\"search_column\">0</property>"
 +    "            <child>"
 +    "              <object class=\"GtkTreeViewColumn\" id=\"treeviewcolumn1\">"
 +    "                <property name=\"sizing\">autosize</property>"
 +    "                <property name=\"title\" translatable=\"yes\">#1</property>"
 +    "                <property name=\"expand\">True</property>"
 +    "                <child>"
 +    "                  <object class=\"GtkCellRendererText\" id=\"cellrenderertext1\">"
 +    "                    <property name=\"ellipsize\">end</property>"
 +    "                  </object>"
 +    "                  <attributes>"
 +    "                    <attribute name=\"text\">0</attribute>"
 +    "                  </attributes>"
 +    "                </child>"
 +    "                <child>"
 +    "                  <object class=\"GtkCellRendererPixbuf\" id=\"cellrendererpixbuf1\"/>"
 +    "                  <attributes>"
 +    "                    <attribute name=\"icon-name\">1</attribute>"
 +    "                  </attributes>"
 +    "                </child>"
 +    "              </object>"
 +    "            </child>"
 +    "            <child>"
 +    "              <object class=\"GtkTreeViewColumn\" id=\"treeviewcolumn2\">"
 +    "                <property name=\"sizing\">autosize</property>"
 +    "                <property name=\"title\" translatable=\"yes\">#2</property>"
 +    "                <property name=\"expand\">True</property>"
 +    "                <child>"
 +    "                  <object class=\"GtkCellRendererPixbuf\" id=\"cellrendererpixbuf2\"/>"
 +    "                  <attributes>"
 +    "                    <attribute name=\"icon-name\">1</attribute>"
 +    "                  </attributes>"
 +    "                </child>"
 +    "                <child>"
 +    "                  <object class=\"GtkCellRendererText\" id=\"cellrenderertext2\">"
 +    "                    <property name=\"ellipsize\">start</property>"
 +    "                  </object>"
 +    "                  <attributes>"
 +    "                    <attribute name=\"text\">2</attribute>"
 +    "                  </attributes>"
 +    "                </child>"
 +    "                <child>"
 +    "                  <object class=\"GtkCellRendererText\" id=\"cellrenderertext3\">"
 +    "                    <property name=\"ellipsize\">end</property>"
 +    "                  </object>"
 +    "                  <attributes>"
 +    "                    <attribute name=\"text\">3</attribute>"
 +    "                  </attributes>"
 +    "                </child>"
 +    "              </object>"
 +    "            </child>"
 +    "          </object>"
 +    "          <packing>"
 +    "            <property name=\"resize\">False</property>"
 +    "            <property name=\"shrink\">False</property>"
 +    "          </packing>"
 +    "        </child>"
 +    "        <child>"
 +    "          <object class=\"GtkLabel\" id=\"label1\">"
 +    "            <property name=\"visible\">True</property>"
 +    "            <property name=\"label\" translatable=\"yes\">static\n"
 +    "text\n"
 +    "here</property>"
 +    "          </object>"
 +    "          <packing>"
 +    "            <property name=\"resize\">True</property>"
 +    "            <property name=\"shrink\">False</property>"
 +    "          </packing>"
 +    "        </child>"
 +    "      </object>"
 +    "    </child>"
 +    "  </object>"
 +    "  <object class=\"GtkListStore\" id=\"liststore1\">"
 +    "    <columns>"
 +    "      <!-- column-name first-text -->"
 +    "      <column type=\"gchararray\"/>"
 +    "      <!-- column-name icon-name -->"
 +    "      <column type=\"gchararray\"/>"
 +    "      <!-- column-name second-text -->"
 +    "      <column type=\"gchararray\"/>"
 +    "      <!-- column-name third-text -->"
 +    "      <column type=\"gchararray\"/>"
 +    "    </columns>"
 +    "    <data>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">both columns</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-ok</col>"
 +    "        <col id=\"2\" translatable=\"yes\">this</col>"
 +    "        <col id=\"3\" translatable=\"yes\">this</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">contain ellipsizing cell renderers</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-cancel</col>"
 +    "        <col id=\"2\" translatable=\"yes\">renderer</col>"
 +    "        <col id=\"3\" translatable=\"yes\">renderer</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">to demonstrate natural</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-info</col>"
 +    "        <col id=\"2\" translatable=\"yes\">is not</col>"
 +    "        <col id=\"3\" translatable=\"yes\">can</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">distribution of size</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-apply</col>"
 +    "        <col id=\"2\" translatable=\"yes\">wide</col>"
 +    "        <col id=\"3\" translatable=\"yes\">be</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">across columns</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-dialog-warning</col>"
 +    "        <col id=\"2\" translatable=\"yes\">at all</col>"
 +    "        <col id=\"3\" translatable=\"yes\">wide because of this long text.</col>"
 +    "      </row>"
 +    "    </data>"
 +    "  </object>"
 +    "</interface>",
 +    NULL
 +  },
 +
 +  {
 +    "Wrapping Treeview",
 +    "Demonstrates how treeviews can recalculate row heights based on allocated widths.",
 +    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
 +    "<interface>"
 +    "  <requires lib=\"gtk+\" version=\"2.20\"/>"
 +    "  <!-- interface-naming-policy project-wide -->"
 +    "  <object class=\"GtkListStore\" id=\"liststore1\">"
 +    "    <columns>"
 +    "      <!-- column-name first-text -->"
 +    "      <column type=\"gchararray\"/>"
 +    "      <!-- column-name icon-name -->"
 +    "      <column type=\"gchararray\"/>"
 +    "      <!-- column-name second-text -->"
 +    "      <column type=\"gchararray\"/>"
 +    "      <!-- column-name third-text -->"
 +    "      <column type=\"gchararray\"/>"
 +    "    </columns>"
 +    "    <data>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">both columns contain word-wrapping</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-ok</col>"
 +    "        <col id=\"2\" translatable=\"yes\">this</col>"
 +    "        <col id=\"3\" translatable=\"yes\">this</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">cell renderers</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-cancel</col>"
 +    "        <col id=\"2\" translatable=\"yes\">renderer</col>"
 +    "        <col id=\"3\" translatable=\"yes\">renderer</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">to demonstrate height-for-width</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-info</col>"
 +    "        <col id=\"2\" translatable=\"yes\">is not</col>"
 +    "        <col id=\"3\" translatable=\"yes\">can</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">trading</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-apply</col>"
 +    "        <col id=\"2\" translatable=\"yes\">wide</col>"
 +    "        <col id=\"3\" translatable=\"yes\">be</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">for individual rows</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-dialog-warning</col>"
 +    "        <col id=\"2\" translatable=\"yes\">at all</col>"
 +    "        <col id=\"3\" translatable=\"yes\">wide because of this long text.</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">---------------</col>"
 +    "        <col id=\"1\" translatable=\"yes\"></col>"
 +    "        <col id=\"2\" translatable=\"yes\">-------</col>"
 +    "        <col id=\"3\" translatable=\"yes\">-------------</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">here we add some</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-bold</col>"
 +    "        <col id=\"2\" translatable=\"yes\">more</col>"
 +    "        <col id=\"3\" translatable=\"yes\">lets put some more</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">more text just</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-execute</col>"
 +    "        <col id=\"2\" translatable=\"yes\">and</col>"
 +    "        <col id=\"3\" translatable=\"yes\">text in all these</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">to show the scrolled window</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-add</col>"
 +    "        <col id=\"2\" translatable=\"yes\">more</col>"
 +    "        <col id=\"3\" translatable=\"yes\">columns</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">resizing and scrolling</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-remove</col>"
 +    "        <col id=\"2\" translatable=\"yes\">text</col>"
 +    "        <col id=\"3\" translatable=\"yes\">damn there are alot</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">more and more</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-copy</col>"
 +    "        <col id=\"2\" translatable=\"yes\">here</col>"
 +    "        <col id=\"3\" translatable=\"yes\">of columns to fill</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">text to enter</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-paste</col>"
 +    "        <col id=\"2\" translatable=\"yes\">more</col>"
 +    "        <col id=\"3\" translatable=\"yes\">in this liststore !</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">bla bla bla...</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-edit</col>"
 +    "        <col id=\"2\" translatable=\"yes\">text</col>"
 +    "        <col id=\"3\" translatable=\"yes\">ok here it comes</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">almost getting to the last column here</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-italic</col>"
 +    "        <col id=\"2\" translatable=\"yes\">more</col>"
 +    "        <col id=\"3\" translatable=\"yes\">its getting closer</col>"
 +    "      </row>"
 +    "      <row>"
 +    "        <col id=\"0\" translatable=\"yes\">stop its the last row !</col>"
 +    "        <col id=\"1\" translatable=\"yes\">gtk-save</col>"
 +    "        <col id=\"2\" translatable=\"yes\">text</col>"
 +    "        <col id=\"3\" translatable=\"yes\">and tada we reached the last damn row</col>"
 +    "      </row>"
 +    "    </data>"
 +    "  </object>"
 +    "  <object class=\"GtkWindow\" id=\"window\">"
 +    "    <property name=\"default_width\">700</property>"
 +    "    <property name=\"default_height\">400</property>"
 +    "    <child>"
 +    "      <object class=\"GtkHPaned\" id=\"hpaned1\">"
 +    "        <property name=\"visible\">True</property>"
 +    "        <property name=\"can_focus\">True</property>"
 +    "        <property name=\"position\">400</property>"
 +    "        <child>"
 +    "          <object class=\"GtkScrolledWindow\" id=\"scrolledwindow1\">"
 +    "            <property name=\"visible\">True</property>"
 +    "            <property name=\"can_focus\">True</property>"
 +    "            <property name=\"hscrollbar_policy\">automatic</property>"
 +    "            <property name=\"vscrollbar_policy\">automatic</property>"
 +    "            <property name=\"shadow_type\">in</property>"
 +    "            <child>"
 +    "              <object class=\"GtkTreeView\" id=\"treeview1\">"
 +    "                <property name=\"visible\">True</property>"
 +    "                <property name=\"can_focus\">True</property>"
 +    "                <property name=\"model\">liststore1</property>"
 +    "                <property name=\"headers_clickable\">False</property>"
 +    "                <property name=\"search_column\">0</property>"
 +    "                <child>"
 +    "                  <object class=\"GtkTreeViewColumn\" id=\"treeviewcolumn1\">"
 +    "                    <property name=\"sizing\">autosize</property>"
 +    "                    <property name=\"title\" translatable=\"yes\">#1</property>"
 +    "                    <property name=\"expand\">True</property>"
 +    "                    <child>"
 +    "                      <object class=\"GtkCellRendererText\" id=\"cellrenderertext1\">"
 +    "                        <property name=\"width_chars\">10</property>"
 +    "                        <property name=\"wrap_mode\">word</property>"
 +    "                        <property name=\"wrap_width\">300</property>"
 +    "                      </object>"
 +    "                      <attributes>"
 +    "                        <attribute name=\"text\">0</attribute>"
 +    "                      </attributes>"
 +    "                    </child>"
 +    "                    <child>"
 +    "                      <object class=\"GtkCellRendererPixbuf\" id=\"cellrendererpixbuf1\"/>"
 +    "                      <attributes>"
 +    "                        <attribute name=\"icon-name\">1</attribute>"
 +    "                      </attributes>"
 +    "                    </child>"
 +    "                  </object>"
 +    "                </child>"
 +    "                <child>"
 +    "                  <object class=\"GtkTreeViewColumn\" id=\"treeviewcolumn2\">"
 +    "                    <property name=\"sizing\">autosize</property>"
 +    "                    <property name=\"title\" translatable=\"yes\">#2</property>"
 +    "                    <property name=\"expand\">True</property>"
 +    "                    <child>"
 +    "                      <object class=\"GtkCellRendererPixbuf\" id=\"cellrendererpixbuf2\"/>"
 +    "                      <attributes>"
 +    "                        <attribute name=\"icon-name\">1</attribute>"
 +    "                      </attributes>"
 +    "                    </child>"
 +    "                    <child>"
 +    "                      <object class=\"GtkCellRendererText\" id=\"cellrenderertext2\">"
 +    "                        <property name=\"ellipsize\">start</property>"
 +    "                      </object>"
 +    "                      <attributes>"
 +    "                        <attribute name=\"text\">2</attribute>"
 +    "                      </attributes>"
 +    "                    </child>"
 +    "                    <child>"
 +    "                      <object class=\"GtkCellRendererText\" id=\"cellrenderertext3\">"
 +    "                        <property name=\"width_chars\">10</property>"
 +    "                        <property name=\"wrap_mode\">word</property>"
 +    "                        <property name=\"wrap_width\">300</property>"
 +    "                      </object>"
 +    "                      <attributes>"
 +    "                        <attribute name=\"text\">3</attribute>"
 +    "                      </attributes>"
 +    "                    </child>"
 +    "                  </object>"
 +    "                </child>"
 +    "              </object>"
 +    "            </child>"
 +    "          </object>"
 +    "          <packing>"
 +    "            <property name=\"resize\">False</property>"
 +    "            <property name=\"shrink\">False</property>"
 +    "          </packing>"
 +    "        </child>"
 +    "        <child>"
 +    "          <object class=\"GtkLabel\" id=\"label1\">"
 +    "            <property name=\"visible\">True</property>"
 +    "            <property name=\"label\" translatable=\"yes\">static\n"
 +    "text\n"
 +    "here\n</property>"
 +    "          </object>"
 +    "          <packing>"
 +    "            <property name=\"resize\">True</property>"
 +    "            <property name=\"shrink\">False</property>"
 +    "          </packing>"
 +    "        </child>"
 +    "      </object>"
 +    "    </child>"
 +    "  </object>"
 +    "</interface>",
 +    NULL
 +  },
  };
  
  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]