[pygtk/windows: 137/139] Merge branch 'master' into windows
- From: John Stowers <jstowers src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygtk/windows: 137/139] Merge branch 'master' into windows
- Date: Thu, 24 Mar 2011 11:27:46 +0000 (UTC)
commit 402e85b95916ad61b4698a5f825b22f6e3a941a6
Merge: b101244 12206c5
Author: Dieter Verfaillie <dieterv optionexplicit be>
Date: Mon Mar 21 11:03:18 2011 +0100
Merge branch 'master' into windows
.gitignore | 7 +
NEWS | 15 +
README.win32 | 15 +-
configure.ac | 48 +-
docs/Makefile.am | 25 +-
docs/random/missing-symbols | 88 +-
docs/reference/ChangeLog | 22 +
docs/reference/pygtk-gtk-classes.xml | 12 +-
docs/reference/pygtk-gtk-functions.xml | 110 ++-
docs/reference/pygtk-gtkaboutdialog.xml | 217 ++-
docs/reference/pygtk-gtkaccelgroup.xml | 35 +
docs/reference/pygtk-gtkaccessible.xml | 80 +-
docs/reference/pygtk-gtkaction.xml | 87 +
docs/reference/pygtk-gtkadjustment.xml | 55 +
docs/reference/pygtk-gtkassistant.xml | 27 +
docs/reference/pygtk-gtkbuilder.xml | 204 ++-
docs/reference/pygtk-gtkbutton.xml | 273 +++-
docs/reference/pygtk-gtkcalendar.xml | 39 +
docs/reference/pygtk-gtkcelleditable.xml | 176 +-
docs/reference/pygtk-gtkcellrenderer.xml | 1167 +++++++------
docs/reference/pygtk-gtkcellrendererspinner.xml | 129 ++
docs/reference/pygtk-gtkcellrenderertoggle.xml | 369 +++--
docs/reference/pygtk-gtkcellview.xml | 6 +
docs/reference/pygtk-gtkclipboard.xml | 1060 ++++++------
docs/reference/pygtk-gtkcolorselectiondialog.xml | 203 ++-
docs/reference/pygtk-gtkcombobox.xml | 161 ++-
docs/reference/pygtk-gtkcomboboxtext.xml | 306 ++++
docs/reference/pygtk-gtkcontainer.xml | 2 +-
docs/reference/pygtk-gtkcurve.xml | 7 +-
docs/reference/pygtk-gtkdialog.xml | 1015 ++++++------
docs/reference/pygtk-gtkentry.xml | 1537 ++++++++++++++---
docs/reference/pygtk-gtkentrybuffer.xml | 551 ++++++
docs/reference/pygtk-gtkentrycompletion.xml | 37 +-
docs/reference/pygtk-gtkexpander.xml | 58 +
docs/reference/pygtk-gtkfileselection.xml | 5 +
docs/reference/pygtk-gtkfontselectiondialog.xml | 28 +
docs/reference/pygtk-gtkhandlebox.xml | 6 +
docs/reference/pygtk-gtkiconview.xml | 198 +++-
docs/reference/pygtk-gtkimagemenuitem.xml | 176 ++-
docs/reference/pygtk-gtkimmulticontext.xml | 58 +
docs/reference/pygtk-gtkinfobar.xml | 599 +++++++
docs/reference/pygtk-gtklabel.xml | 241 +++
docs/reference/pygtk-gtkliststore.xml | 10 +-
docs/reference/pygtk-gtkmenu.xml | 100 +-
docs/reference/pygtk-gtkmenuitem.xml | 132 ++
docs/reference/pygtk-gtkmessagedialog.xml | 39 +
docs/reference/pygtk-gtkmountoperation.xml | 67 -
docs/reference/pygtk-gtknotebook.xml | 189 ++-
docs/reference/pygtk-gtkoffscreenwindow.xml | 189 ++
docs/reference/pygtk-gtkprintcontext.xml | 4 +-
docs/reference/pygtk-gtkprintoperation.xml | 293 +++-
docs/reference/pygtk-gtkprintsettings.xml | 144 ++-
docs/reference/pygtk-gtkradioaction.xml | 27 +
docs/reference/pygtk-gtkrange.xml | 446 +++++-
docs/reference/pygtk-gtkrecentaction.xml | 25 +
docs/reference/pygtk-gtkrecentchooser.xml | 16 +
docs/reference/pygtk-gtkscale.xml | 66 +
docs/reference/pygtk-gtksettings.xml | 1098 ++++++------
docs/reference/pygtk-gtksizegroup.xml | 24 +
docs/reference/pygtk-gtkspinner.xml | 196 +++
docs/reference/pygtk-gtkstatusbar.xml | 56 +-
docs/reference/pygtk-gtkstatusicon.xml | 276 +++-
docs/reference/pygtk-gtktextbuffer.xml | 46 +
docs/reference/pygtk-gtktextview.xml | 108 ++
docs/reference/pygtk-gtktoolitem.xml | 115 ++-
docs/reference/pygtk-gtktoolitemgroup.xml | 698 ++++++++
docs/reference/pygtk-gtktoolpalette.xml | 811 +++++++++
docs/reference/pygtk-gtktoolshell.xml | 1 +
docs/reference/pygtk-gtktooltip.xml | 48 +-
docs/reference/pygtk-gtktreemodelfilter.xml | 4 +-
docs/reference/pygtk-gtktreestore.xml | 8 +-
docs/reference/pygtk-gtkviewport.xml | 52 +
docs/reference/pygtk-gtkwidget.xml | 2018 +++++++++++++++-------
docs/reference/pygtk-gtkwindow.xml | 779 +++++----
docs/reference/pygtk-introduction.xml | 263 +---
examples/atk/atk-demo.py | 2 +
examples/glade/autoconnect.py | 1 -
examples/glade/glade-demo.py | 3 +
examples/gobject/editable-interface.py | 2 +
examples/gobject/properties.py | 2 +
examples/gobject/signal.py | 3 +-
examples/gtk/application.py | 2 +
examples/gtk/bin.py | 3 +
examples/gtk/customtreemodel.py | 2 +
examples/gtk/mirror.py | 2 +
examples/gtk/scrollable.py | 2 +
examples/gtk/sizegroup.py | 2 +
examples/gtk/testprint.py | 3 +
examples/gtk/treeview_dnd.py | 123 ++
examples/gtk/widget.py | 2 +
examples/ide/edit.py | 4 +-
examples/pango/pangocairo-simple.py | 4 +-
examples/pango/utf8-demo.py | 2 +
examples/pygtk-demo/demos/appwindow.py | 2 +
examples/pygtk-demo/demos/builder.py | 2 +
examples/pygtk-demo/demos/buttonbox.py | 2 +
examples/pygtk-demo/demos/changedisplay.py | 2 +
examples/pygtk-demo/demos/colorsel.py | 2 +
examples/pygtk-demo/demos/dialogs.py | 2 +
examples/pygtk-demo/demos/dnd.py | 2 +
examples/pygtk-demo/demos/editable_cells.py | 2 +
examples/pygtk-demo/demos/entry_completion.py | 2 +
examples/pygtk-demo/demos/expander.py | 2 +
examples/pygtk-demo/demos/hypertext.py | 2 +
examples/pygtk-demo/demos/images.py | 3 +
examples/pygtk-demo/demos/infobar.py | 2 +
examples/pygtk-demo/demos/list_store.py | 2 +
examples/pygtk-demo/demos/menu.py | 2 +
examples/pygtk-demo/demos/panes.py | 2 +
examples/pygtk-demo/demos/pixbufs.py | 3 +
examples/pygtk-demo/demos/print_editor.py | 3 +
examples/pygtk-demo/demos/sizegroup.py | 2 +
examples/pygtk-demo/demos/spinner.py | 2 +
examples/pygtk-demo/demos/statusicon.py | 2 +
examples/pygtk-demo/demos/stock_browser.py | 2 +
examples/pygtk-demo/demos/textscroll.py | 2 +
examples/pygtk-demo/demos/textview.py | 2 +
examples/pygtk-demo/demos/toolpalette.py | 2 +
examples/pygtk-demo/demos/tooltip.py | 2 +
examples/pygtk-demo/demos/tree_store.py | 2 +
examples/pygtk-demo/demos/treemodel.py | 2 +
examples/pygtk-demo/demos/ui_manager.py | 2 +
examples/pygtk-demo/pygtk-demo.py | 7 +-
examples/simple/dnd.py | 2 +
examples/simple/hello.py | 2 +
examples/simple/scribble.py | 2 +
examples/simple/simple.py | 2 +
examples/simple/tooltip.py | 2 +
examples/threading/gtk_threading.py | 102 ++
gtk/Makefile.am | 12 +
gtk/gdk-base.defs | 2 +-
gtk/gtk-2.12.defs | 2 +-
gtk/gtk-2.24-types.defs | 6 +
gtk/gtk-2.24.defs | 132 ++
gtk/gtk.override | 29 +-
gtk/gtktreeview.override | 14 +-
gtk/gtkunixprint.override | 4 +-
pygtk.spec.in | 1 -
pygtk_postinstall.py | 75 +-
setup.py | 272 ++--
tests/common-windows.py | 25 +
tests/common.py | 2 +
tests/runtests-windows.py | 39 +
tests/test_conversion.py | 17 -
tests/test_enum.py | 55 +-
145 files changed, 14283 insertions(+), 4550 deletions(-)
---
diff --cc configure.ac
index a9fb17a,474f00e..222b509
--- a/configure.ac
+++ b/configure.ac
@@@ -168,7 -168,7 +168,7 @@@ AC_SUBST(PYGOBJECT_PYGDOCS
dnl atk
PKG_CHECK_MODULES(ATK, atk >= atk_required_version,
-- have_atk=true, have_atk=false)
++ have_atk=true, have_atk=false)
AC_SUBST(ATK_CFLAGS)
AC_SUBST(ATK_LIBS)
AM_CONDITIONAL(BUILD_ATK, $have_atk)
@@@ -178,7 -178,7 +178,7 @@@ f
dnl pango
PKG_CHECK_MODULES(PANGO, pango >= pango_required_version,
-- have_pango=true, have_pango=false)
++ have_pango=true, have_pango=false)
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS)
AM_CONDITIONAL(BUILD_PANGO, $have_pango)
@@@ -222,7 -222,7 +222,7 @@@ if test "x$have_pycairo" = "xtrue"; the
PKG_CHECK_MODULES(PANGOCAIRO,
[pangocairo >= pango_required_version,
pycairo >= pycairo_required_version],
-- have_pangocairo=true, have_pangocairo=false)
++ have_pangocairo=true, have_pangocairo=false)
if test ! $have_pangocairo
then
AC_MSG_RESULT(no)
@@@ -252,7 -252,7 +252,7 @@@
fi
PKG_CHECK_MODULES(GTK210, gtk+-2.0 >= 2.10.0,
-- HAVE_GTK_210="yes", HAVE_GTK_210="no")
++ HAVE_GTK_210="yes", HAVE_GTK_210="no")
if test "x$HAVE_GTK_210" = "xyes"; then
gtk_version="2.10"
have_gtk_210=true
@@@ -268,7 -268,7 +268,7 @@@
dnl check for gtk 2.12
PKG_CHECK_MODULES(GTK212, gtk+-2.0 >= 2.11.6,
-- HAVE_GTK_212="yes", HAVE_GTK_212="no")
++ HAVE_GTK_212="yes", HAVE_GTK_212="no")
if test "x$HAVE_GTK_212" = "xyes"; then
gtk_version="2.12"
@@@ -285,7 -285,7 +285,7 @@@
dnl check for gtk 2.14
PKG_CHECK_MODULES(GTK214, gtk+-2.0 >= 2.13.8,
-- HAVE_GTK_214="yes", HAVE_GTK_214="no")
++ HAVE_GTK_214="yes", HAVE_GTK_214="no")
if test "x$HAVE_GTK_214" = "xyes"; then
gtk_version="2.14"
@@@ -302,7 -302,7 +302,7 @@@
dnl check for gtk 2.16
PKG_CHECK_MODULES(GTK216, gtk+-2.0 >= 2.16.0,
-- HAVE_GTK_216="yes", HAVE_GTK_216="no")
++ HAVE_GTK_216="yes", HAVE_GTK_216="no")
if test "x$HAVE_GTK_216" = "xyes"; then
gtk_version="2.16"
@@@ -316,10 -316,10 +316,10 @@@
AM_CONDITIONAL(HAVE_GTK_2_16, $have_gtk_216)
AC_SUBST(HAVE_GTK_2_16)
AC_DEFINE([HAVE_GTK_2_16], [$have_gtk_216], [If Gtk 2.16 was found])
--
++
dnl check for gtk 2.18
PKG_CHECK_MODULES(GTK218, gtk+-2.0 >= 2.18.0,
-- HAVE_GTK_218="yes", HAVE_GTK_218="no")
++ HAVE_GTK_218="yes", HAVE_GTK_218="no")
if test "x$HAVE_GTK_218" = "xyes"; then
gtk_version="2.18"
@@@ -336,7 -336,7 +336,7 @@@
dnl check for gtk 2.20
PKG_CHECK_MODULES(GTK220, gtk+-2.0 >= 2.20.0,
-- HAVE_GTK_220="yes", HAVE_GTK_220="no")
++ HAVE_GTK_220="yes", HAVE_GTK_220="no")
if test "x$HAVE_GTK_220" = "xyes"; then
gtk_version="2.20"
@@@ -353,7 -353,7 +353,7 @@@
dnl check for gtk 2.22
PKG_CHECK_MODULES(GTK222, gtk+-2.0 >= 2.22.0,
-- HAVE_GTK_222="yes", HAVE_GTK_222="no")
++ HAVE_GTK_222="yes", HAVE_GTK_222="no")
if test "x$HAVE_GTK_222" = "xyes"; then
gtk_version="2.22"
@@@ -368,9 -368,26 +368,26 @@@
AC_SUBST(HAVE_GTK_2_22)
AC_DEFINE([HAVE_GTK_2_22], [$have_gtk_222], [If Gtk 2.22 was found])
+ dnl check for gtk 2.24
+ PKG_CHECK_MODULES(GTK224, gtk+-2.0 >= 2.24.0,
- HAVE_GTK_224="yes", HAVE_GTK_224="no")
++ HAVE_GTK_224="yes", HAVE_GTK_224="no")
+
+ if test "x$HAVE_GTK_224" = "xyes"; then
+ gtk_version="2.24"
+ have_gtk_224=true
+ PYGTK_CODEGEN_DEFINES="$PYGTK_CODEGEN_DEFINES -DHAVE_GTK_2_24"
+ else
+ AC_MSG_RESULT(no)
+ have_gtk_224=false
+ fi
+
+ AM_CONDITIONAL(HAVE_GTK_2_24, $have_gtk_224)
+ AC_SUBST(HAVE_GTK_2_24)
+ AC_DEFINE([HAVE_GTK_2_24], [$have_gtk_224], [If Gtk 2.24 was found])
+
dnl libglade
PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
-- have_libglade=true, have_libglade=false)
++ have_libglade=true, have_libglade=false)
AC_SUBST(LIBGLADE_CFLAGS)
AC_SUBST(LIBGLADE_LIBS)
AM_CONDITIONAL(BUILD_LIBGLADE, $have_libglade)
@@@ -380,7 -397,7 +397,7 @@@
dnl gtkunixprint
PKG_CHECK_MODULES(GTKUNIXPRINT, [gtk+-unix-print-2.0 >= gtkunixprint_required_version],
-- have_gtkunixprint=true, have_gtkunixprint=false)
++ have_gtkunixprint=true, have_gtkunixprint=false)
AC_SUBST(GTKUNIXPRINT_CFLAGS)
AC_SUBST(GTKUNIXPRINT_LIBS)
AM_CONDITIONAL(BUILD_GTKUNIXPRINT, $have_gtkunixprint)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
