Commits

Victor Stinner  committed d2a211f Merge

merge

  • Participants
  • Parent commits 7473367, ea126b8

Comments (0)

Files changed (3)

File hachoir-wx/hachoir_wx/field_view/core_type_menu_fwd.py

     def __init__(self, imp):
         self.imp = imp
 
-    def on_core_type_menu_ready(self, dispatcher, view):
+    def on_field_menu_ready(self, dispatcher, view):
         assert view is not None
         view.Bind(wx.EVT_MENU, self.on_type_selected)
 
     def on_type_selected(self, event):
-        self.imp.on_type_selected(event.GetId())
+        try:
+            self.imp.on_type_selected(event.GetId())
+        except KeyError:
+            event.Skip()

File hachoir-wx/hachoir_wx/field_view/field_split_menu_fwd.py

     def __init__(self, imp):
         self.imp = imp
 
-    def on_field_split_menu_ready(self, dispatcher, view):
+    def on_field_menu_ready(self, dispatcher, view):
         assert view is not None
 
         view.Bind(wx.EVT_MENU, self.on_split_bytes,

File hachoir-wx/hachoir_wx/resource/hachoir_wx.xrc

       <object class="wxMenu" name="field_menu_convert_to_core_type">
         <label>Convert to Core Type</label>
       </object>
-      <object class="wxMenuItem" name="field_menu_merge_down">
-        <label>Merge Down</label>
-      </object>
       <object class="wxMenuItem" name="field_menu_dump_to_disk">
         <label>Dump To Disk...</label>
       </object>