Merge branch 'v1.2.x'

dmcdougall · dmcdougall · commit 315640508217 · 2012-11-12T23:07:08.000-06:00
Conflicts:
	doc/users/whats_new.rst
	lib/matplotlib/__init__.py
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -35,8 +35,6 @@
 }
 </script>
 
-  <!-- The "Fork me on github" ribbon -->
-  <a href="https://github.com/matplotlib/matplotlib"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub"></a>
 
   <h1>John Hunter (1968-2012)</h1>
 
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -36,6 +36,13 @@
 <a href="{{ pathto('index') }}"><img src="{{
 pathto("_static/logo2.png", 1) }}" border="0" alt="matplotlib"/></a>
 </div>
+
+<!-- The "Fork me on github" ribbon -->
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
+<map name="ribbonmap">
+    <area shape="poly" coords="20,2,148,-1,148,135" href="https://github.com/matplotlib/matplotlib" alt="Fork me on GitHub" />
+</map>
+
 {{ super() }}
 {% endblock %}
 
diff --git a/doc/faq/usage_faq.rst b/doc/faq/usage_faq.rst
@@ -253,17 +253,21 @@ a file:
 ============   ================================================================
 Backend        Description
 ============   ================================================================
-GTKAgg         Agg rendering to a :term:`GTK` canvas (requires PyGTK_)
-GTK            GDK rendering to a :term:`GTK` canvas (not recommended)
+GTKAgg         Agg rendering to a :term:`GTK` 2.x canvas (requires PyGTK_)
+GTK3Agg        Agg rendering to a :term:`GTK` 3.x canvas (requires PyGObject_)
+GTK            GDK rendering to a :term:`GTK` 2.x canvas (not recommended)
                (requires PyGTK_)
-GTKCairo       Cairo rendering to a :term:`GTK` Canvas (requires PyGTK_)
+GTKCairo       Cairo rendering to a :term:`GTK` 2.x canvas (requires PyGTK_
+               and pycairo_)
+GTK3Cairo      Cairo rendering to a :term:`GTK` 3.x canvas (requires PyGObject_
+               and pycairo_)
 WXAgg          Agg rendering to to a :term:`wxWidgets` canvas
                (requires wxPython_)
 WX             Native :term:`wxWidgets` drawing to a :term:`wxWidgets` Canvas
                (not recommended) (requires wxPython_)
 TkAgg          Agg rendering to a :term:`Tk` canvas (requires TkInter_)
 QtAgg          Agg rendering to a :term:`Qt` canvas (requires PyQt_)
-               (not recommended; use Qt4Agg)
+               (deprecated; use Qt4Agg)
 Qt4Agg         Agg rendering to a :term:`Qt4` canvas (requires PyQt4_)
 FLTKAgg        Agg rendering to a :term:`FLTK` canvas (requires pyFLTK_)
                (not widely used; consider TKAgg, GTKAgg, WXAgg, or
@@ -280,6 +284,8 @@ macosx         Cocoa rendering in OSX windows
 .. _`Cairo graphics`: http://en.wikipedia.org/wiki/Cairo_(graphics)
 .. _`Gimp Drawing Kit`: http://en.wikipedia.org/wiki/GDK
 .. _PyGTK: http://www.pygtk.org
+.. _PyGObject: https://live.gnome.org/PyGObject
+.. _pycairo: http://www.cairographics.org/pycairo/
 .. _wxPython: http://www.wxpython.org/
 .. _TkInter: http://wiki.python.org/moin/TkInter
 .. _PyQt: http://www.riverbankcomputing.co.uk/software/pyqt/intro
@@ -425,6 +431,3 @@ generate one or more figures and display them before ending
 or generating a new set of figures.  In that case, use
 :func:`~matplotlib.pyplot.show` to display the figure(s) and
 to block execution until you have manually destroyed them.
-
-
-
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -15,6 +15,8 @@ revision, see the :ref:`github-stats`.
    versions 2.4 to 2.7.  matplotlib 1.2 and later require
    versions 2.6, 2.7, and 3.1 and higher.
 
+.. contents:: Table of Contents
+
 .. _whats-new-1-3:
 
 new in matplotlib-1.3
diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -1,3 +1,4 @@
+
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
 #include <pygobject.h>
@@ -121,6 +122,7 @@ class _gtkagg_module : public Py::ExtensionModule<_gtkagg_module>
                               destbuffer,
                               deststride);
 
+        gdk_gc_destroy(gc);
         if (needfree)
         {
             delete [] destbuffer;

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@`
`35`	`35`	`}`
`36`	`36`	`</script>`
`37`	`37`
`38`		`- <!-- The "Fork me on github" ribbon -->`
`39`		`- <a href="https://github.com/matplotlib/matplotlib"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub"></a>`
`40`	`38`
`41`	`39`	`<h1>John Hunter (1968-2012)</h1>`
`42`	`40`