- get wx backends compatible with wxPython Phoenix

matplotlib · wernerfb · Dec 2, 2013 · Dec 2, 2013 · Feb 11, 2014 · Feb 11, 2014
commit 549998082104e8f1aa395cb77a7b0111f54cc28c
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -667,8 +667,6 @@ class FigureCanvasWx(FigureCanvasBase, wx.Panel):
         wx.WXK_DELETE          : 'delete',
         wx.WXK_HOME            : 'home',
         wx.WXK_END             : 'end',
-        wx.WXK_PRIOR           : 'pageup',
-        wx.WXK_NEXT            : 'pagedown',
         wx.WXK_PAGEUP          : 'pageup',
         wx.WXK_PAGEDOWN        : 'pagedown',
         wx.WXK_NUMPAD0         : '0',
@@ -691,8 +689,6 @@ class FigureCanvasWx(FigureCanvasBase, wx.Panel):
         wx.WXK_NUMPAD_RIGHT    : 'right',
         wx.WXK_NUMPAD_DOWN     : 'down',
         wx.WXK_NUMPAD_LEFT     : 'left',
-        wx.WXK_NUMPAD_PRIOR    : 'pageup',
-        wx.WXK_NUMPAD_NEXT     : 'pagedown',
         wx.WXK_NUMPAD_PAGEUP   : 'pageup',
         wx.WXK_NUMPAD_PAGEDOWN : 'pagedown',
         wx.WXK_NUMPAD_HOME     : 'home',
@@ -736,7 +732,10 @@ def do_nothing(*args, **kwargs):
 
 
         # Create the drawing bitmap
-        self.bitmap =wx.EmptyBitmap(w, h)
+        if 'phoenix' in wx.PlatformInfo:
+            self.bitmap =wx.Bitmap(w, h)
+        else:
+            self.bitmap =wx.EmptyBitmap(w, h)
         DEBUG_MSG("__init__() - bitmap w:%d h:%d" % (w,h), 2, self)
         # TODO: Add support for 'point' inspection and plot navigation.
         self._isDrawn = False
@@ -873,7 +872,10 @@ def start_event_loop(self, timeout=0):
             bind(self, wx.EVT_TIMER, self.stop_event_loop, id=id)
 
         # Event loop handler for start/stop event loop
-        self._event_loop = wx.EventLoop()
+        if 'phoenix' in wx.PlatformInfo:
+            self._event_loop = wx.GUIEventLoop()
+        else:
+            self._event_loop = wx.EventLoop()
         self._event_loop.Run()
         timer.Stop()
 
@@ -897,7 +899,7 @@ def _get_imagesave_wildcards(self):
         'return the wildcard string for the filesave dialog'
         default_filetype = self.get_default_filetype()
         filetypes = self.get_supported_filetypes_grouped()
-        sorted_filetypes = list(six.iteritems(filetypes))
+        sorted_filetypes = filetypes.items()
         sorted_filetypes.sort()
         wildcards = []
         extensions = []
@@ -923,9 +925,12 @@ def gui_repaint(self, drawDC=None):
             if drawDC is None:
                 drawDC=wx.ClientDC(self)
 
-            drawDC.BeginDrawing()
-            drawDC.DrawBitmap(self.bitmap, 0, 0)
-            drawDC.EndDrawing()
+            if 'phoenix' in wx.PlatformInfo:
+                drawDC.DrawBitmap(self.bitmap, 0, 0)
+            else:       
+                drawDC.BeginDrawing()
+                drawDC.DrawBitmap(self.bitmap, 0, 0)
+                drawDC.EndDrawing()
             #wx.GetApp().Yield()
         else:
             pass
@@ -979,7 +984,11 @@ def _print_image(self, filename, filetype, *args, **kwargs):
         width = int(math.ceil(width))
         height = int(math.ceil(height))
 
-        self.bitmap = wx.EmptyBitmap(width, height)
+        if 'phoenix' in wx.PlatformInfo:
+            self.bitmap =wx.Bitmap(width, height)
+        else:
+            self.bitmap =wx.EmptyBitmap(width, height)
+
         renderer = RendererWx(self.bitmap, self.figure.dpi)
 
         gc = renderer.new_gc()
@@ -1052,7 +1061,11 @@ def _onSize(self, evt):
         DEBUG_MSG("_onSize()", 2, self)
         # Create a new, correctly sized bitmap
         self._width, self._height = self.GetClientSize()
-        self.bitmap =wx.EmptyBitmap(self._width, self._height)
+        if 'phoenix' in wx.PlatformInfo:
+            self.bitmap =wx.Bitmap(self._width, self._height)
+        else:
+            self.bitmap =wx.EmptyBitmap(self._width, self._height)
+
         self._isDrawn = False
 
         if self._width <= 1 or self._height <= 1: return # Empty figure
@@ -1636,12 +1649,25 @@ def _init_toolbar(self):
                 self.AddSeparator()
                 continue
             self.wx_ids[text] = wx.NewId()
-            if text in ['Pan', 'Zoom']:
-               self.AddCheckTool(self.wx_ids[text], _load_bitmap(image_file + '.png'),
-                                 shortHelp=text, longHelp=tooltip_text)
+            if 'phoenix' in wx.PlatformInfo:
+                if text in ['Pan', 'Zoom']:
+                    kind = wx.ITEM_CHECK
+                else:
+                    kind = wx.ITEM_NORMAL
+                self.AddTool(self.wx_ids[text], label=text,
+                             bitmap=_load_bitmap(image_file + '.png'),
+                             bmpDisabled=wx.NullBitmap,
+                             shortHelpString=text,
+                             longHelpString=tooltip_text,
+                             kind=kind)
             else:
-               self.AddSimpleTool(self.wx_ids[text], _load_bitmap(image_file + '.png'),
-                                  text, tooltip_text)
+                if text in ['Pan', 'Zoom']:
+                    self.AddCheckTool(self.wx_ids[text], _load_bitmap(image_file + '.png'),
+                                      shortHelp=text, longHelp=tooltip_text)
+                else:
+                    self.AddSimpleTool(self.wx_ids[text], _load_bitmap(image_file + '.png'),
+                                       text, tooltip_text)
+
             bind(self, wx.EVT_TOOL, getattr(self, callback), id=self.wx_ids[text])
 
         self.Realize()
@@ -1700,7 +1726,10 @@ def save_figure(self, *args):
                 error_msg_wx(str(e))
 
     def set_cursor(self, cursor):
-        cursor =wx.StockCursor(cursord[cursor])
+        if 'phoenix' in wx.PlatformInfo:
+            cursor = wx.Cursor(cursord[cursor])
+        else:
+            cursor = wx.StockCursor(cursord[cursor])
         self.canvas.SetCursor( cursor )
 
     def release(self, event):
@@ -1737,7 +1766,8 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
 
 
         dc.ResetBoundingBox()
-        dc.BeginDrawing()
+        if not 'phoenix' in wx.PlatformInfo:            
+            dc.BeginDrawing()       
         height = self.canvas.figure.bbox.height
         y1 = height - y1
         y0 = height - y0
@@ -1754,7 +1784,8 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
         else: dc.DrawRectangle(*lastrect)  #erase last
         self.lastrect = rect
         dc.DrawRectangle(*rect)
-        dc.EndDrawing()
+        if not 'phoenix' in wx.PlatformInfo:            
+            dc.EndDrawing()
 
     def set_status_bar(self, statbar):
         self.statbar = statbar

diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -136,7 +136,10 @@ def _convert_agg_to_wx_image(agg, bbox):
     """
     if bbox is None:
         # agg => rgb -> image
-        image = wx.EmptyImage(int(agg.width), int(agg.height))
+        if 'phoenix' in wx.PlatformInfo:
+            image = wx.Image(int(agg.width), int(agg.height))
+        else:
+            image = wx.EmptyImage(int(agg.width), int(agg.height))
         image.SetData(agg.tostring_rgb())
         return image
     else:
@@ -153,8 +156,12 @@ def _convert_agg_to_wx_bitmap(agg, bbox):
     """
     if bbox is None:
         # agg => rgba buffer -> bitmap
-        return wx.BitmapFromBufferRGBA(int(agg.width), int(agg.height),
-            agg.buffer_rgba())
+        if 'phoenix' in wx.PlatformInfo:
+            return wx.Bitmap.FromBufferRGBA(int(agg.width), int(agg.height),
+                                     agg.buffer_rgba())            
+        else:
+            return wx.BitmapFromBufferRGBA(int(agg.width), int(agg.height),
+                                           agg.buffer_rgba())
     else:
         # agg => rgba buffer -> bitmap => clipped bitmap
         return _WX28_clipped_agg_as_bitmap(agg, bbox)
@@ -170,12 +177,19 @@ def _WX28_clipped_agg_as_bitmap(agg, bbox):
     r = l + width
     t = b + height
 
-    srcBmp = wx.BitmapFromBufferRGBA(int(agg.width), int(agg.height),
-        agg.buffer_rgba())
+    if 'phoenix' in wx.PlatformInfo:
+        srcBmp = wx.Bitmap.FromBufferRGBA(int(agg.width), int(agg.height),
+                                   agg.buffer_rgba())        
+    else:
+        srcBmp = wx.BitmapFromBufferRGBA(int(agg.width), int(agg.height),
+                                         agg.buffer_rgba())
     srcDC = wx.MemoryDC()
     srcDC.SelectObject(srcBmp)
 
-    destBmp = wx.EmptyBitmap(int(width), int(height))
+    if 'phoenix' in wx.PlatformInfo:    
+        destBmp = wx.Bitmap(int(width), int(height))
+    else:
+        destBmp = wx.EmptyBitmap(int(width), int(height))
     destDC = wx.MemoryDC()
     destDC.SelectObject(destBmp)