From 90369b679c2a78d72dfc0f9d901a847cfb3045a2 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 3 Oct 2014 21:25:28 -0400 Subject: [PATCH] Fix #179 --- gui/builtinContextMenus/damagePattern.py | 7 ++++++- gui/builtinContextMenus/targetResists.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py index f76388629..e9e554fe7 100644 --- a/gui/builtinContextMenus/damagePattern.py +++ b/gui/builtinContextMenus/damagePattern.py @@ -5,6 +5,11 @@ import gui.globalEvents as GE import wx from gui import bitmapLoader +try: + from collections import OrderedDict +except ImportError: + from gui.utils.compat import OrderedDict + class DamagePattern(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -23,7 +28,7 @@ class DamagePattern(ContextMenu): "Selected Ammo"], p.name) ) self.patternIds = {} - self.subMenus = {} + self.subMenus = OrderedDict() self.singles = [] # iterate and separate damage patterns based on "[Parent] Child" diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index c7180a88f..fa02a3ad1 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -7,6 +7,11 @@ import gui.globalEvents as GE import wx from gui import bitmapLoader +try: + from collections import OrderedDict +except ImportError: + from gui.utils.compat import OrderedDict + class TargetResists(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -70,7 +75,7 @@ class TargetResists(ContextMenu): m.Bind(wx.EVT_MENU, self.handleResistSwitch) self.patternIds = {} - self.subMenus = {} + self.subMenus = OrderedDict() self.singles = [] for pattern in self.patterns: