Merge pull request #439 from mdehoon/macosx_interactive

efiring · efiring · commit 2c5346fbfb0d · 2011-08-31T09:38:17.000-07:00
Modifying the MacOSX backend to make its interactive behavior consistent
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -224,10 +224,12 @@ def draw_if_interactive():
     it will be redrawn as soon as the event loop resumes via PyOS_InputHook.
     This function should be called after each draw event, even if
     matplotlib is not running interactively.
-    """
-    figManager =  Gcf.get_active()
-    if figManager is not None:
-        figManager.canvas.invalidate()
+	"""
+    if matplotlib.is_interactive():
+        figManager =  Gcf.get_active()
+        if figManager is not None:
+            figManager.canvas.invalidate()
+
 
 def new_figure_manager(num, *args, **kwargs):
     """
@@ -371,9 +373,8 @@ def notify_axes_change(fig):
         # This is ugly, but this is what tkagg and gtk are doing.
         # It is needed to get ginput() working.
         self.canvas.figure.show = lambda *args: self.show()
-
-    def show(self):
-        self.canvas.draw()
+        if matplotlib.is_interactive():
+            self.show()
 
     def close(self):
         Gcf.destroy(self.num)
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -803,6 +803,7 @@ static int _get_snap(GraphicsContext* self, enum e_snap_mode* mode)
     self->color[0] = r;
     self->color[1] = g;
     self->color[2] = b;
+    self->color[3] = 1.0;
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -2279,7 +2280,7 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
         {"Arial", 14},
         {"Helvetica", 15},
         {"Avant Garde", 16},
-        {"sans-serif", 10},
+        {"sans-serif", 15},
         {"Apple Chancery", 17},
         {"Textile", 18},
         {"Zapf Chancery", 19},
@@ -2364,8 +2365,8 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
        "Arial-BoldItalicMT"},
       {"Helvetica",                          /* 15 */
        "Helvetica-Bold",
-       "",
-       ""},
+       "Arial-ItalicMT",
+       "Arial-BoldItalicMT"},
       {"AvantGardeITC-Book",                 /* 16 */
        "AvantGardeITC-Demi",
        "AvantGardeITC-BookOblique",
@@ -2681,7 +2682,6 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
         PyErr_SetString(PyExc_RuntimeError, "CGContextRef is NULL");
         return NULL;
     }
-
     if(!PyArg_ParseTuple(args, "ffu#Ofssf",
                                 &x,
                                 &y,
@@ -3755,7 +3755,6 @@ static void _data_provider_release(void* info, const void* data, size_t size)
     [window setDelegate: view];
     [window makeFirstResponder: view];
     [[window contentView] addSubview: view];
-    [window makeKeyAndOrderFront: nil];
 
     nwin++;
 
@@ -3788,6 +3787,20 @@ static void _data_provider_release(void* info, const void* data, size_t size)
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
+static PyObject*
+FigureManager_show(FigureManager* self)
+{
+    Window* window = self->window;
+    if(window)
+    {
+        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+        [window makeKeyAndOrderFront: nil];
+        [pool release];
+    }
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
 static PyObject*
 FigureManager_destroy(FigureManager* self)
 {
@@ -3804,6 +3817,11 @@ static void _data_provider_release(void* info, const void* data, size_t size)
 }
 
 static PyMethodDef FigureManager_methods[] = {
+    {"show",
+     (PyCFunction)FigureManager_show,
+     METH_NOARGS,
+     "Shows the window associated with the figure manager."
+    },
     {"destroy",
      (PyCFunction)FigureManager_destroy,
      METH_NOARGS,
@@ -4662,7 +4680,9 @@ -(void)save_figure:(id)sender
     NSText* messagebox = [[NSText alloc] initWithFrame: rect];
     [messagebox setFont: font];
     [messagebox setDrawsBackground: NO];
-    [messagebox setEditable: NO];
+    [messagebox setSelectable: NO];
+    /* if selectable, the messagebox can become first responder,
+     * which is not supposed to happen */
     rect = [messagebox frame];
     rect.origin.y = 0.5 * (height - rect.size.height);
     [messagebox setFrameOrigin: rect.origin];
