[gtk+/combo-refactor: 200/201] Merge branch 'treeview-refactor' into combo-refactor
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/combo-refactor: 200/201] Merge branch 'treeview-refactor' into combo-refactor
- Date: Tue, 21 Dec 2010 12:53:00 +0000 (UTC)
commit 32291a0d408a31724db99cd8aa3c90397c7f77f1
Merge: a197314 720612d
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Tue Dec 21 21:31:39 2010 +0900
Merge branch 'treeview-refactor' into combo-refactor
Conflicts:
gtk/Makefile.am
demos/gtk-demo/assistant.c | 6 +-
demos/gtk-demo/clipboard.c | 6 +-
demos/gtk-demo/combobox.c | 4 +-
demos/gtk-demo/stock_browser.c | 6 +-
demos/gtk-demo/toolpalette.c | 2 +-
docs/reference/gdk/Makefile.am | 3 +-
docs/reference/gdk/gdk-docs.sgml | 1 +
docs/reference/gdk/gdk3-sections.txt | 14 +-
docs/reference/gtk/Makefile.am | 3 +-
docs/reference/gtk/gtk3-sections.txt | 51 +-
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 53 +-
gdk/Makefile.am | 5 +-
gdk/gdk.c | 16 +-
gdk/gdk.h | 1 -
gdk/gdk.symbols | 13 +-
gdk/gdkdevice.c | 125 +-
gdk/gdkdevice.h | 1 +
gdk/gdkdevicemanager.c | 31 +-
gdk/gdkdeviceprivate.h | 6 +-
gdk/gdkdisplay.c | 58 +-
gdk/gdkdisplay.h | 4 -
gdk/gdkdnd.c | 37 +
gdk/gdkdnd.h | 2 +
gdk/gdkevents.c | 60 +
gdk/gdkevents.h | 3 +
gdk/gdkglobals.c | 2 +-
gdk/gdkinput.h | 60 -
gdk/gdkinternals.h | 18 +-
gdk/gdkmain.h | 2 +-
gdk/gdkpoly-generic.h | 291 --
gdk/gdkwindow.c | 408 ++--
gdk/gdkwindow.h | 6 +
gdk/x11/Makefile.am | 1 -
gdk/x11/gdkdevicemanager-x11.c | 2 +-
gdk/x11/gdkdevicemanager-xi2.c | 178 +-
gdk/x11/gdkdevicemanager-xi2.h | 1 -
gdk/x11/gdkdisplay-x11.c | 2 +-
gdk/x11/gdkeventsource.c | 32 +-
gdk/x11/gdkinput.c | 227 --
gdk/x11/gdkmain-x11.c | 2 +-
gdk/x11/gdkwindow-x11.h | 3 +
gtk/Makefile.am | 1 +
gtk/gtk.symbols | 48 +-
gtk/gtkaboutdialog.c | 544 +++--
gtk/gtkaccelmap.c | 2 +-
gtk/gtkbindings.c | 407 +---
gtk/gtkbuilder.c | 2 +-
gtk/gtkcalendar.c | 10 +-
gtk/gtkcellarea.c | 1735 ++++++-----
gtk/gtkcellarea.h | 487 ++--
gtk/gtkcellareabox.c | 1498 +++++----
gtk/gtkcellareabox.h | 39 +-
gtk/gtkcellareaboxcontext.c | 631 ++--
gtk/gtkcellareaboxcontext.h | 77 +-
gtk/gtkcellareacontext.c | 290 +-
gtk/gtkcellareacontext.h | 86 +-
gtk/gtkcelllayout.c | 13 +-
gtk/gtkcellrenderer.c | 3 +
gtk/gtkcellrendererpixbuf.c | 7 +-
gtk/gtkcellrendererspinner.c | 7 +
gtk/gtkcellrenderertext.c | 7 +
gtk/gtkcellrenderertoggle.c | 7 +
gtk/gtkclipboard.c | 32 +-
gtk/gtkcolorbutton.c | 16 +-
gtk/gtkcolorsel.c | 30 +-
gtk/gtkcombobox.c | 22 +-
gtk/gtkcomboboxtext.c | 3 +
gtk/gtkcssprovider.c | 62 +-
gtk/gtkdnd-quartz.c | 4 +-
gtk/gtkdnd.c | 107 +-
gtk/gtkdrawingarea.c | 1 -
gtk/gtkdrawingarea.h | 2 -
gtk/gtkentry.c | 248 +-
gtk/gtkenums.h | 11 +-
gtk/gtkexpander.c | 190 +-
gtk/gtkfilechooserbutton.c | 2 +-
gtk/gtkfilechooserdefault.c | 19 +-
gtk/gtkiconfactory.c | 8 +-
gtk/gtkiconfactory.h | 4 +-
gtk/gtkicontheme.c | 2 +-
gtk/gtkiconview.c | 10 +-
gtk/gtkimage.c | 28 +-
gtk/gtkinfobar.c | 146 +-
gtk/gtklinkbutton.c | 2 +-
gtk/gtkmain.c | 38 +-
gtk/gtknotebook.c | 554 +++-
gtk/gtkplug-x11.c | 1 +
gtk/gtkplug.c | 17 +-
gtk/gtkprintjob.c | 386 +++-
gtk/gtkprintjob.h | 50 +-
gtk/gtkprintoperation-unix.c | 22 +-
gtk/gtkprintunixdialog.c | 1 +
gtk/gtkrange.c | 342 ++-
gtk/gtkrc.c | 3640 +---------------------
gtk/gtkrc.h | 18 -
gtk/gtkscale.c | 68 +-
gtk/gtkscrollbar.c | 12 +-
gtk/gtksearchenginetracker.c | 571 ++--
gtk/gtkselection.c | 47 +-
gtk/gtkselection.h | 54 +-
gtk/gtkselectionprivate.h | 40 +
gtk/gtksettings.c | 2 -
gtk/gtksizerequest.c | 16 +
gtk/gtksocket-x11.c | 127 +-
gtk/gtksocket.c | 241 +-
gtk/gtksocket.h | 20 +-
gtk/gtksocketprivate.h | 59 +-
gtk/gtkspinbutton.c | 243 +-
gtk/gtkstatusicon.c | 14 +-
gtk/gtkstyle.c | 484 +---
gtk/gtkstyle.h | 10 +-
gtk/gtkstylecontext.c | 68 +-
gtk/gtkstylecontext.h | 81 +-
gtk/gtkstyleprovider.c | 2 +-
gtk/gtktextbuffer.c | 27 +-
gtk/gtktextview.c | 163 +-
gtk/gtkthemingengine.c | 68 +-
gtk/gtkthemingengine.h | 2 +
gtk/gtktoolpalette.c | 30 +-
gtk/gtktrayicon-x11.c | 11 +-
gtk/gtktreednd.c | 10 +-
gtk/gtktreemodelsort.c | 462 ++--
gtk/gtktreemodelsort.h | 28 +-
gtk/gtktreeprivate.h | 1 +
gtk/gtktreeselection.c | 313 ++-
gtk/gtktreeselection.h | 11 +-
gtk/gtktreestore.c | 401 ++-
gtk/gtktreestore.h | 18 +-
gtk/gtktreeview.c | 68 +-
gtk/gtktreeviewcolumn.c | 30 +-
gtk/gtkvolumebutton.c | 105 +-
gtk/gtkwidget.c | 388 +--
gtk/gtkwidget.h | 16 +-
gtk/gtkwidgetpath.c | 31 +-
gtk/gtkwidgetpath.h | 6 +-
gtk/gtkwidgetprivate.h | 5 +
gtk/gtkwindow.c | 86 +-
gtk/gtkwindow.h | 63 +-
gtk/gtkwindowprivate.h | 90 +
gtk/tests/stylecontext.c | 4 +-
modules/input/gtkimcontextxim.c | 35 +-
modules/other/gail/gail.c | 2 +-
modules/other/gail/gailtreeview.c | 2 +-
modules/other/gail/libgail-util/gailmisc.c | 42 +-
modules/printbackends/cups/gtkprintbackendcups.c | 39 +-
modules/printbackends/file/gtkprintbackendfile.c | 40 +-
modules/printbackends/lpr/gtkprintbackendlpr.c | 40 +-
po-properties/es.po | 1406 +++++-----
po-properties/he.po | 1253 ++++----
po/es.po | 308 +-
po/fa.po | 851 +++---
po/he.po | 392 ++--
po/nb.po | 306 +-
po/vi.po | 254 +-
tests/testassistant.c | 6 +-
tests/testcellarea.c | 15 +-
tests/testcombo.c | 64 +-
tests/testdnd.c | 16 +-
tests/testgtk.c | 10 +-
tests/testiconview-keynav.c | 36 +-
tests/testimage.c | 2 +-
tests/testinput.c | 17 +-
tests/testnotebookdnd.c | 8 +-
tests/testselection.c | 31 +-
tests/testtreeedit.c | 79 +-
tests/testtreeview.c | 3 +
166 files changed, 10198 insertions(+), 13320 deletions(-)
---
diff --cc gtk/Makefile.am
index 11a494c,62be9e1..78007f9
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -433,7 -433,7 +433,8 @@@ gtk_private_h_sources =
gtktreedatalist.h \
gtktreeprivate.h \
gtkwidgetprivate.h \
+ gtktreemenu.h \
+ gtkwindowprivate.h \
$(gtk_clipboard_dnd_h_sources) \
$(gtk_appchooser_impl_h_sources)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
