Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / src / _accel.i

diff --git a/wxPython/src/_accel.i b/wxPython/src/_accel.i
index 5f0bee9ed2fb2fae9529fab810cb1ff5972e8dd5..cc20204c428198687a6deead1e7ae34e20e350f9 100644 (file)
--- a/wxPython/src/_accel.i
+++ b/wxPython/src/_accel.i
@@ -154,7 +154,8 @@ items or or of 3-tuples (flags, keyCode, cmdID)
     wxAcceleratorTable(int n, const wxAcceleratorEntry* entries);
     ~wxAcceleratorTable();
 
-    bool Ok() const;
+    bool IsOk() const;
+    %pythoncode { Ok = IsOk }
 };
 
 
@@ -164,6 +165,11 @@ const wxAcceleratorTable wxNullAcceleratorTable;
 %mutable;
 
 
-wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);
+%pythoncode {
+    def GetAccelFromString(label):
+        entry = AcceleratorEntry()
+        entry.FromString(label)
+        return entry
+}
 
 //---------------------------------------------------------------------------