[gtk+: 201/202] Merge branch 'gtk-2-90'



commit 77d4d3cdae0739c0a5643fb23891f8790f05c074
Merge: b3e0e25 0de8601
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 6 22:55:02 2010 -0400

    Merge branch 'gtk-2-90'
    
    Conflicts:
    	gtk/gtkentry.h

 configure.in                                       |    2 +-
 docs/faq/gtk-faq.sgml                              |   50 +-
 docs/refcounting.txt                               |    2 +-
 .../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml         |   14 -
 docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml     |    4 +-
 docs/reference/gdk/gdk-sections.txt                |   31 -
 docs/reference/gdk/tmpl/cursors.sgml               |    9 -
 docs/reference/gdk/tmpl/dnd.sgml                   |   14 -
 docs/reference/gdk/tmpl/events.sgml                |    8 -
 docs/reference/gdk/tmpl/gcs.sgml                   |   36 -
 docs/reference/gdk/tmpl/images.sgml                |   52 +-
 docs/reference/gdk/tmpl/input.sgml                 |   10 -
 docs/reference/gdk/tmpl/pango_interaction.sgml     |    9 -
 docs/reference/gdk/tmpl/pixbufs.sgml               |   40 -
 docs/reference/gdk/tmpl/pixmaps.sgml               |   32 -
 docs/reference/gdk/tmpl/rgb.sgml                   |   39 -
 docs/reference/gdk/tmpl/selections.sgml            |   30 -
 docs/reference/gdk/tmpl/visuals.sgml               |   17 -
 docs/reference/gtk/glossary.xml                    |    2 +-
 docs/reference/gtk/gtk-sections.txt                |  486 --
 docs/reference/gtk/gtk.types                       |    9 -
 docs/reference/gtk/objects_grouped.sgml            |    2 -
 docs/reference/gtk/tmpl/gtk-unused.sgml            |  163 +-
 docs/reference/gtk/tmpl/gtkcellrenderer.sgml       |    8 -
 docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml      |   19 -
 docs/reference/gtk/tmpl/gtkcolorsel.sgml           |   31 -
 docs/reference/gtk/tmpl/gtkcontainer.sgml          |   29 -
 docs/reference/gtk/tmpl/gtkctree.sgml              | 1260 ----
 docs/reference/gtk/tmpl/gtkcurve.sgml              |  163 -
 docs/reference/gtk/tmpl/gtkentry.sgml              |   54 -
 docs/reference/gtk/tmpl/gtkenums.sgml              |    9 -
 docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml  |   11 -
 docs/reference/gtk/tmpl/gtkfixed.sgml              |   20 -
 docs/reference/gtk/tmpl/gtkgamma.sgml              |   47 -
 docs/reference/gtk/tmpl/gtkhbbox.sgml              |   36 -
 docs/reference/gtk/tmpl/gtkinputdialog.sgml        |   75 -
 docs/reference/gtk/tmpl/gtklabel.sgml              |   15 -
 docs/reference/gtk/tmpl/gtkmain.sgml               |  191 +-
 docs/reference/gtk/tmpl/gtkmenu.sgml               |   33 -
 docs/reference/gtk/tmpl/gtkoldeditable.sgml        |  169 -
 docs/reference/gtk/tmpl/gtkoptionmenu.sgml         |  124 -
 docs/reference/gtk/tmpl/gtkpaned.sgml              |   19 -
 docs/reference/gtk/tmpl/gtkpixmap.sgml             |   83 -
 docs/reference/gtk/tmpl/gtkradiobutton.sgml        |    7 -
 docs/reference/gtk/tmpl/gtksignal.sgml             |  759 --
 docs/reference/gtk/tmpl/gtkstyle.sgml              |  314 -
 docs/reference/gtk/tmpl/gtktext.sgml               |  238 -
 docs/reference/gtk/tmpl/gtktogglebutton.sgml       |    8 -
 docs/reference/gtk/tmpl/gtktoolitem.sgml           |   11 -
 docs/reference/gtk/tmpl/gtktooltips.sgml           |  191 -
 docs/reference/gtk/tmpl/gtktree.sgml               |  306 -
 docs/reference/gtk/tmpl/gtktreeitem.sgml           |  119 -
 docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml     |    9 -
 docs/reference/gtk/tmpl/gtkwindow.sgml             |   88 -
 docs/styles.txt                                    |   11 -
 docs/tools/shooter.c                               |    5 +-
 docs/tutorial/gtk-tut.sgml                         |   38 +-
 examples/buttonbox/buttonbox.c                     |    1 -
 examples/colorsel/colorsel.c                       |    2 +-
 examples/list/list.c                               |    8 +-
 examples/text/Makefile                             |   16 -
 examples/text/text.c                               |  182 -
 examples/tree/Makefile                             |   16 -
 examples/tree/tree.c                               |  184 -
 gdk-pixbuf/gdk-pixbuf-animation.c                  |   30 -
 gdk-pixbuf/gdk-pixbuf-animation.h                  |    7 +-
 gdk-pixbuf/gdk-pixbuf-core.h                       |    9 +-
 gdk-pixbuf/gdk-pixbuf-io.h                         |    2 +-
 gdk-pixbuf/gdk-pixbuf-loader.h                     |    2 +-
 gdk-pixbuf/gdk-pixbuf-simple-anim.h                |    2 +-
 gdk-pixbuf/gdk-pixbuf-transform.h                  |    2 +-
 gdk-pixbuf/gdk-pixbuf.c                            |   33 -
 gdk-pixbuf/gdk-pixbuf.symbols                      |    8 -
 gdk-pixbuf/make-inline-pixbuf.c                    |    2 +-
 gdk/Makefile.am                                    |    1 -
 gdk/directfb/gdkdirectfb.h                         |    9 -
 gdk/directfb/gdkdnd-directfb.c                     |   12 -
 gdk/directfb/gdkevents-directfb.c                  |   30 -
 gdk/directfb/gdkimage-directfb.c                   |   36 +-
 gdk/directfb/gdkwindow-directfb.c                  |  208 -
 gdk/gdk.symbols                                    |   33 -
 gdk/gdkcairo.h                                     |    2 +-
 gdk/gdkcolor.h                                     |    2 +-
 gdk/gdkcursor.h                                    |    5 +-
 gdk/gdkdisplay.h                                   |    2 +-
 gdk/gdkdisplaymanager.h                            |    2 +-
 gdk/gdkdnd.h                                       |    7 +-
 gdk/gdkdrawable.h                                  |    2 +-
 gdk/gdkevents.c                                    |    2 +-
 gdk/gdkevents.h                                    |    5 +-
 gdk/gdkgc.c                                        |   53 -
 gdk/gdkgc.h                                        |   14 +-
 gdk/gdki18n.h                                      |   59 -
 gdk/gdkimage.c                                     |   65 -
 gdk/gdkimage.h                                     |   24 +-
 gdk/gdkinput.h                                     |    2 +-
 gdk/gdkkeys.h                                      |    2 +-
 gdk/gdkpango.c                                     |   18 -
 gdk/gdkpango.h                                     |    6 +-
 gdk/gdkpixbuf-render.c                             |   91 -
 gdk/gdkpixbuf.h                                    |   29 +-
 gdk/gdkpixmap.h                                    |    8 +-
 gdk/gdkproperty.h                                  |    2 +-
 gdk/gdkregion.h                                    |    2 +-
 gdk/gdkrgb.c                                       |   45 -
 gdk/gdkrgb.h                                       |   13 +-
 gdk/gdkscreen.h                                    |    2 +-
 gdk/gdkselection.h                                 |   10 +-
 gdk/gdkspawn.h                                     |    2 +-
 gdk/gdktypes.h                                     |    8 +-
 gdk/gdkvisual.h                                    |    6 +-
 gdk/gdkwindow.h                                    |    2 +-
 gdk/makefile.msc                                   |    1 -
 gdk/quartz/gdkdnd-quartz.c                         |   12 -
 gdk/quartz/gdkevents-quartz.c                      |    7 -
 gdk/quartz/gdkim-quartz.c                          |    1 -
 gdk/quartz/gdkimage-quartz.c                       |   10 -
 gdk/testgdk.c                                      |   40 +-
 gdk/win32/gdkdnd-win32.c                           |   16 -
 gdk/win32/gdkevents-win32.c                        |   24 -
 gdk/win32/gdkim-win32.c                            |    1 -
 gdk/win32/gdkimage-win32.c                         |   35 -
 gdk/x11/gdkdnd-x11.c                               |   32 -
 gdk/x11/gdkevents-x11.c                            |   38 -
 gdk/x11/gdkimage-x11.c                             |   56 -
 gtk/Makefile.am                                    |   74 +-
 gtk/gtk.h                                          |   25 -
 gtk/gtk.symbols                                    |  833 +---
 gtk/gtkaboutdialog.c                               |  219 +-
 gtk/gtkaboutdialog.h                               |   11 +-
 gtk/gtkaccelgroup.c                                |  114 +-
 gtk/gtkaccelgroup.h                                |   39 +-
 gtk/gtkaccelgroupprivate.h                         |   36 +
 gtk/gtkaccellabel.c                                |  154 +-
 gtk/gtkaccellabel.h                                |   19 +-
 gtk/gtkaccelmap.c                                  |    4 +-
 gtk/gtkaccelmap.h                                  |    2 +-
 gtk/gtkaccessible.h                                |    2 +-
 gtk/gtkaction.c                                    |  136 +-
 gtk/gtkaction.h                                    |   14 +-
 gtk/gtkactiongroup.h                               |    2 +-
 gtk/gtkactivatable.h                               |    2 +-
 gtk/gtkadjustment.h                                |    2 +-
 gtk/gtkalignment.h                                 |    2 +-
 gtk/gtkarrow.h                                     |    2 +-
 gtk/gtkaspectframe.h                               |    2 +-
 gtk/gtkassistant.h                                 |    2 +-
 gtk/gtkbbox.c                                      |  102 -
 gtk/gtkbbox.h                                      |   39 +-
 gtk/gtkbin.h                                       |    2 +-
 gtk/gtkbindings.c                                  |   47 -
 gtk/gtkbindings.h                                  |   10 +-
 gtk/gtkbox.c                                       |   44 -
 gtk/gtkbox.h                                       |    9 +-
 gtk/gtkbuildable.h                                 |    2 +-
 gtk/gtkbuilder.h                                   |    2 +-
 gtk/gtkbutton.h                                    |    2 +-
 gtk/gtkcalendar.c                                  |   46 -
 gtk/gtkcalendar.h                                  |   15 +-
 gtk/gtkcelleditable.h                              |    2 +-
 gtk/gtkcelllayout.h                                |    2 +-
 gtk/gtkcellrenderer.c                              |   22 -
 gtk/gtkcellrenderer.h                              |    9 +-
 gtk/gtkcellrendereraccel.h                         |    2 +-
 gtk/gtkcellrenderercombo.h                         |    2 +-
 gtk/gtkcellrendererpixbuf.h                        |    2 +-
 gtk/gtkcellrendererprogress.h                      |    2 +-
 gtk/gtkcellrendererspin.h                          |    2 +-
 gtk/gtkcellrenderertext.h                          |    2 +-
 gtk/gtkcellrenderertoggle.h                        |    2 +-
 gtk/gtkcellview.c                                  |   20 -
 gtk/gtkcellview.h                                  |    5 +-
 gtk/gtkcheckbutton.h                               |    2 +-
 gtk/gtkcheckmenuitem.c                             |   11 -
 gtk/gtkcheckmenuitem.h                             |    8 +-
 gtk/gtkclipboard.h                                 |    2 +-
 gtk/gtkclist.c                                     | 7806 --------------------
 gtk/gtkclist.h                                     |  792 --
 gtk/gtkcolorbutton.h                               |    2 +-
 gtk/gtkcolorsel.c                                  |   79 -
 gtk/gtkcolorsel.h                                  |   18 +-
 gtk/gtkcolorseldialog.h                            |    2 +-
 gtk/gtkcombo.c                                     | 1234 ----
 gtk/gtkcombo.h                                     |  118 -
 gtk/gtkcombobox.h                                  |    2 +-
 gtk/gtkcomboboxentry.h                             |    2 +-
 gtk/gtkcontainer.c                                 |   49 -
 gtk/gtkcontainer.h                                 |   16 +-
 gtk/gtkctree.c                                     | 6144 ---------------
 gtk/gtkctree.h                                     |  445 --
 gtk/gtkcurve.c                                     | 1039 ---
 gtk/gtkcurve.h                                     |  106 -
 gtk/gtkdebug.h                                     |    2 +-
 gtk/gtkdialog.h                                    |    2 +-
 gtk/gtkdnd-quartz.c                                |   10 -
 gtk/gtkdnd.c                                       |   47 -
 gtk/gtkdnd.h                                       |   10 +-
 gtk/gtkdrawingarea.c                               |   13 -
 gtk/gtkdrawingarea.h                               |    9 +-
 gtk/gtkeditable.h                                  |    2 +-
 gtk/gtkentry.c                                     |  137 -
 gtk/gtkentry.h                                     |   23 +-
 gtk/gtkentrybuffer.h                               |    2 +-
 gtk/gtkentrycompletion.h                           |    2 +-
 gtk/gtkenums.h                                     |   57 +-
 gtk/gtkeventbox.h                                  |    2 +-
 gtk/gtkexpander.h                                  |    2 +-
 gtk/gtkfilechooser.h                               |    2 +-
 gtk/gtkfilechooserbutton.c                         |   32 -
 gtk/gtkfilechooserbutton.h                         |    9 +-
 gtk/gtkfilechooserdefault.c                        |    4 -
 gtk/gtkfilechooserdialog.c                         |   43 -
 gtk/gtkfilechooserdialog.h                         |   11 +-
 gtk/gtkfilechooserutils.c                          |    3 -
 gtk/gtkfilechooserutils.h                          |    2 +-
 gtk/gtkfilechooserwidget.c                         |   29 -
 gtk/gtkfilechooserwidget.h                         |    8 +-
 gtk/gtkfilefilter.h                                |    2 +-
 gtk/gtkfilesel.c                                   | 3999 ----------
 gtk/gtkfilesel.h                                   |  125 -
 gtk/gtkfixed.c                                     |   48 -
 gtk/gtkfixed.h                                     |    8 +-
 gtk/gtkfontbutton.h                                |    2 +-
 gtk/gtkfontsel.c                                   |   57 -
 gtk/gtkfontsel.h                                   |   16 +-
 gtk/gtkframe.h                                     |    2 +-
 gtk/gtkgamma.c                                     |  494 --
 gtk/gtkgamma.h                                     |   82 -
 gtk/gtkgc.h                                        |    2 +-
 gtk/gtkhandlebox.h                                 |    2 +-
 gtk/gtkhbbox.c                                     |   40 -
 gtk/gtkhbbox.h                                     |   10 +-
 gtk/gtkhbox.h                                      |    2 +-
 gtk/gtkhpaned.h                                    |    2 +-
 gtk/gtkhruler.h                                    |    2 +-
 gtk/gtkhscale.h                                    |    2 +-
 gtk/gtkhscrollbar.h                                |    2 +-
 gtk/gtkhseparator.h                                |    2 +-
 gtk/gtkiconfactory.h                               |    2 +-
 gtk/gtkicontheme.h                                 |    2 +-
 gtk/gtkiconview.h                                  |    2 +-
 gtk/gtkimage.c                                     |   40 -
 gtk/gtkimage.h                                     |   13 +-
 gtk/gtkimagemenuitem.h                             |    2 +-
 gtk/gtkimcontext.h                                 |    2 +-
 gtk/gtkimcontextsimple.h                           |    2 +-
 gtk/gtkimmulticontext.h                            |    2 +-
 gtk/gtkinputdialog.c                               |  764 --
 gtk/gtkinputdialog.h                               |  100 -
 gtk/gtkinvisible.h                                 |    2 +-
 gtk/gtkitem.h                                      |    2 +-
 gtk/gtkitemfactory.c                               | 1586 ----
 gtk/gtkitemfactory.h                               |  236 -
 gtk/gtklabel.c                                     |   41 -
 gtk/gtklabel.h                                     |   16 +-
 gtk/gtklayout.c                                    |   36 -
 gtk/gtklayout.h                                    |   16 +-
 gtk/gtklinkbutton.h                                |    2 +-
 gtk/gtklist.c                                      | 2587 -------
 gtk/gtklist.h                                      |  138 -
 gtk/gtklistitem.c                                  |  635 --
 gtk/gtklistitem.h                                  |   91 -
 gtk/gtkliststore.h                                 |    2 +-
 gtk/gtkmain.c                                      |  192 +-
 gtk/gtkmain.h                                      |   51 +-
 gtk/gtkmarshal.list                                |   36 -
 gtk/gtkmenu.c                                      |    2 +-
 gtk/gtkmenu.h                                      |    8 +-
 gtk/gtkmenubar.h                                   |    8 +-
 gtk/gtkmenuitem.c                                  |   18 -
 gtk/gtkmenuitem.h                                  |    7 +-
 gtk/gtkmenushell.h                                 |    2 +-
 gtk/gtkmenutoolbutton.c                            |   33 +-
 gtk/gtkmenutoolbutton.h                            |   10 +-
 gtk/gtkmessagedialog.h                             |    2 +-
 gtk/gtkmisc.h                                      |    2 +-
 gtk/gtkmodules.h                                   |    2 +-
 gtk/gtknotebook.c                                  |  278 +-
 gtk/gtknotebook.h                                  |   26 +-
 gtk/gtkobject.c                                    |  593 --
 gtk/gtkobject.h                                    |  116 +-
 gtk/gtkoldeditable.c                               |  829 ---
 gtk/gtkoldeditable.h                               |  126 -
 gtk/gtkoptionmenu.c                                | 1036 ---
 gtk/gtkoptionmenu.h                                |   88 -
 gtk/gtkpagesetup.h                                 |    2 +-
 gtk/gtkpagesetupunixdialog.h                       |    2 +-
 gtk/gtkpaned.c                                     |   11 -
 gtk/gtkpaned.h                                     |   11 +-
 gtk/gtkpapersize.h                                 |    2 +-
 gtk/gtkpixmap.c                                    |  286 -
 gtk/gtkpixmap.h                                    |   83 -
 gtk/gtkplug.h                                      |    2 +-
 gtk/gtkpreview.c                                   |  565 --
 gtk/gtkpreview.h                                   |  137 -
 gtk/gtkprintcontext.h                              |    2 +-
 gtk/gtkprinter.h                                   |    2 +-
 gtk/gtkprintjob.h                                  |    2 +-
 gtk/gtkprintoperation.h                            |    2 +-
 gtk/gtkprintoperationpreview.h                     |    2 +-
 gtk/gtkprintsettings.h                             |    2 +-
 gtk/gtkprintunixdialog.h                           |    2 +-
 gtk/gtkprogress.c                                  |    6 +-
 gtk/gtkprogressbar.c                               |  197 +-
 gtk/gtkprogressbar.h                               |   23 +-
 gtk/gtkradioaction.h                               |    2 +-
 gtk/gtkradiobutton.h                               |    6 +-
 gtk/gtkradiomenuitem.h                             |    6 +-
 gtk/gtkradiotoolbutton.h                           |    2 +-
 gtk/gtkrange.h                                     |    2 +-
 gtk/gtkrc.c                                        |   96 -
 gtk/gtkrc.h                                        |   17 +-
 gtk/gtkrecentaction.h                              |    2 +-
 gtk/gtkrecentchooser.c                             |   66 -
 gtk/gtkrecentchooser.h                             |    7 +-
 gtk/gtkrecentchooserdialog.h                       |    2 +-
 gtk/gtkrecentchoosermenu.h                         |    2 +-
 gtk/gtkrecentchooserwidget.h                       |    2 +-
 gtk/gtkrecentfilter.h                              |    2 +-
 gtk/gtkrecentmanager.c                             |   52 -
 gtk/gtkrecentmanager.h                             |    8 +-
 gtk/gtkruler.h                                     |    2 +-
 gtk/gtkscale.h                                     |    2 +-
 gtk/gtkscalebutton.c                               |   40 -
 gtk/gtkscalebutton.h                               |   10 +-
 gtk/gtkscrollbar.h                                 |    2 +-
 gtk/gtkscrolledwindow.h                            |    2 +-
 gtk/gtkselection.c                                 |   10 +-
 gtk/gtkselection.h                                 |    6 +-
 gtk/gtkseparator.h                                 |    2 +-
 gtk/gtkseparatormenuitem.h                         |    2 +-
 gtk/gtkseparatortoolitem.h                         |    2 +-
 gtk/gtksettings.h                                  |    2 +-
 gtk/gtksignal.c                                    |  394 -
 gtk/gtksignal.h                                    |  149 -
 gtk/gtksizegroup.h                                 |    2 +-
 gtk/gtksocket.c                                    |   26 -
 gtk/gtksocket.h                                    |    7 +-
 gtk/gtkspinbutton.h                                |    7 +-
 gtk/gtkstatusbar.h                                 |    2 +-
 gtk/gtkstatusicon.c                                |   18 -
 gtk/gtkstatusicon.h                                |    6 +-
 gtk/gtkstock.h                                     |    2 +-
 gtk/gtkstyle.c                                     |  799 +--
 gtk/gtkstyle.h                                     |  196 +-
 gtk/gtktable.h                                     |    2 +-
 gtk/gtktearoffmenuitem.h                           |    2 +-
 gtk/gtktext.c                                      | 5461 --------------
 gtk/gtktext.h                                      |  217 -
 gtk/gtktextbuffer.h                                |    2 +-
 gtk/gtktextbufferrichtext.h                        |    2 +-
 gtk/gtktextchild.h                                 |    2 +-
 gtk/gtktextiter.h                                  |    2 +-
 gtk/gtktextmark.h                                  |    2 +-
 gtk/gtktexttag.h                                   |    2 +-
 gtk/gtktexttagtable.h                              |    2 +-
 gtk/gtktextview.h                                  |    2 +-
 gtk/gtktipsquery.c                                 |  524 --
 gtk/gtktipsquery.h                                 |  110 -
 gtk/gtktoggleaction.h                              |    2 +-
 gtk/gtktogglebutton.h                              |    6 +-
 gtk/gtktoggletoolbutton.h                          |    2 +-
 gtk/gtktoolbar.c                                   |  820 +--
 gtk/gtktoolbar.h                                   |  118 +-
 gtk/gtktoolbutton.h                                |    2 +-
 gtk/gtktoolitem.c                                  |   80 -
 gtk/gtktoolitem.h                                  |   18 +-
 gtk/gtktooltip.h                                   |    2 +-
 gtk/gtktooltips.c                                  |  338 -
 gtk/gtktooltips.h                                  |  109 -
 gtk/gtktree.c                                      | 1136 ---
 gtk/gtktree.h                                      |  132 -
 gtk/gtktreednd.h                                   |    2 +-
 gtk/gtktreeitem.c                                  | 1000 ---
 gtk/gtktreeitem.h                                  |   90 -
 gtk/gtktreemodel.h                                 |   11 +-
 gtk/gtktreemodelfilter.h                           |    2 +-
 gtk/gtktreemodelsort.h                             |    2 +-
 gtk/gtktreeselection.h                             |    2 +-
 gtk/gtktreesortable.h                              |    2 +-
 gtk/gtktreestore.h                                 |    2 +-
 gtk/gtktreeview.c                                  |   65 -
 gtk/gtktreeview.h                                  |   15 +-
 gtk/gtktreeviewcolumn.c                            |   17 -
 gtk/gtktreeviewcolumn.h                            |    5 +-
 gtk/gtktypeutils.c                                 |  168 -
 gtk/gtktypeutils.h                                 |  167 +-
 gtk/gtkuimanager.h                                 |    2 +-
 gtk/gtkvbbox.c                                     |   63 -
 gtk/gtkvbbox.h                                     |   13 +-
 gtk/gtkvbox.h                                      |    2 +-
 gtk/gtkviewport.h                                  |    2 +-
 gtk/gtkvolumebutton.h                              |    2 +-
 gtk/gtkvpaned.h                                    |    2 +-
 gtk/gtkvruler.h                                    |    2 +-
 gtk/gtkvscale.h                                    |    2 +-
 gtk/gtkvscrollbar.h                                |    2 +-
 gtk/gtkvseparator.h                                |    2 +-
 gtk/gtkwidget.c                                    |  254 +-
 gtk/gtkwidget.h                                    |  374 +-
 gtk/gtkwindow.c                                    |   15 +-
 gtk/gtkwindow.h                                    |   12 +-
 gtk/makefile.msc.in                                |    6 -
 gtk/tests/builder.c                                |    8 +-
 gtk/tests/defaultvalue.c                           |   17 -
 gtk/tests/floating.c                               |   14 +-
 gtk/tests/object.c                                 |    1 -
 modules/other/gail/Makefile.am                     |   11 -
 modules/other/gail/gail.c                          |   21 +-
 modules/other/gail/gail.h                          |    6 -
 modules/other/gail/gailclist.c                     | 1609 ----
 modules/other/gail/gailclist.h                     |   64 -
 modules/other/gail/gailclistcell.c                 |  106 -
 modules/other/gail/gailclistcell.h                 |   54 -
 modules/other/gail/gailcombo.c                     |  639 --
 modules/other/gail/gailcombo.h                     |   58 -
 modules/other/gail/gailentry.c                     |    4 +-
 modules/other/gail/gailitem.c                      |    7 -
 modules/other/gail/gaillabel.c                     |   20 +-
 modules/other/gail/gaillist.c                      |  242 -
 modules/other/gail/gaillist.h                      |   51 -
 modules/other/gail/gailmenu.c                      |    2 +-
 modules/other/gail/gailmenuitem.c                  |   10 +-
 modules/other/gail/gailoptionmenu.c                |  356 -
 modules/other/gail/gailoptionmenu.h                |   51 -
 modules/other/gail/gailpixmap.c                    |  158 -
 modules/other/gail/gailpixmap.h                    |   54 -
 modules/other/gail/gailtoplevel.c                  |    3 -
 modules/other/gail/gailwidget.c                    |   34 +-
 modules/other/gail/gailwindow.c                    |    2 +-
 modules/other/gail/tests/Makefile.am               |    1 -
 modules/other/gail/tests/ferret.c                  |    5 +-
 modules/other/gail/tests/testcombo.c               |   10 +-
 modules/other/gail/tests/testoptionmenu.c          |  157 -
 tests/Makefile.am                                  |    3 -
 tests/prop-editor.c                                |    1 +
 tests/stresstest-toolbar.c                         |    7 +-
 tests/testgtk.c                                    | 3886 +---------
 tests/testgtkrc                                    |    1 -
 tests/testinput.c                                  |   41 -
 tests/testmenus.c                                  |  246 -
 tests/testoffscreen.c                              |   22 +-
 tests/testselection.c                              |   37 +-
 tests/testsocket.c                                 |   62 +-
 tests/testsocket_common.c                          |   90 +-
 tests/testtext.c                                   |    2 +-
 tests/testtoolbar.c                                |   53 +-
 tests/testtreeview.c                               |   79 +-
 448 files changed, 1184 insertions(+), 64106 deletions(-)
---
diff --cc gtk/gtkentry.h
index 9bbba0b,f0a3dd7..9bf5f85
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@@ -302,33 -302,9 +302,14 @@@ void         gtk_entry_set_icon_drag_so
  							  GtkTargetList        *target_list,
  							  GdkDragAction         actions);
  gint         gtk_entry_get_current_icon_drag_source      (GtkEntry             *entry);
- 
- GdkWindow  * gtk_entry_get_icon_window                   (GtkEntry             *entry,
+ GdkWindow*   gtk_entry_get_icon_window                   (GtkEntry             *entry,
                                                            GtkEntryIconPosition  icon_pos);
  
 +gboolean    gtk_entry_im_context_filter_keypress         (GtkEntry             *entry,
 +                                                          GdkEventKey          *event);
 +void        gtk_entry_reset_im_context                   (GtkEntry             *entry);
 +
 +
- /* Deprecated compatibility functions
-  */
- 
- #ifndef GTK_DISABLE_DEPRECATED
- GtkWidget* gtk_entry_new_with_max_length	(gint           max);
- void       gtk_entry_append_text    		(GtkEntry      *entry,
- 						 const gchar   *text);
- void       gtk_entry_prepend_text   		(GtkEntry      *entry,
- 						 const gchar   *text);
- void       gtk_entry_set_position   		(GtkEntry      *entry,
- 						 gint           position);
- void       gtk_entry_select_region  		(GtkEntry      *entry,
- 						 gint           start,
- 						 gint           end);
- void       gtk_entry_set_editable   		(GtkEntry      *entry,
- 						 gboolean       editable);
- #endif /* GTK_DISABLE_DEPRECATED */
- 
  G_END_DECLS
  
  #endif /* __GTK_ENTRY_H__ */



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