Merge branch 'v1.0.x'

Author: ddale

.gitignore

@@ -40,3 +40,9 @@ Thumbs.db
 ###################################
 lib/matplotlib/mpl-data/matplotlib.conf
 lib/matplotlib/mpl-data/matplotlibrc
+
+# Documentation generated files #
+#################################
+doc/examples
+doc/_templates/gallery.html
+doc/_static/matplotlibrc

lib/matplotlib/backends/backend_wx.py

@@ -352,7 +352,7 @@ def draw_image(self, gc, x, y, im):
         bitmap = wx.BitmapFromBufferRGBA(cols,rows,image_array)
         gc = self.get_gc()
         gc.select()
-        gc.gfx_ctx.DrawBitmap(bitmap,int(l),int(b),int(w),int(h))
+        gc.gfx_ctx.DrawBitmap(bitmap,int(l),int(self.height-b),int(w),int(-h))
         gc.unselect()
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath):