Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit afd0aa6

Browse files
jackjansenjackjansen
committed
Replace {Enable,Disable,Check}Item with their carbon-compatible equivalents {Enable,Disable,Check}MenuItem.
1 parent 5a8115c commit afd0aa6

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎Mac/Lib/FrameWork.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -478,15 +478,15 @@ def fixmenudimstate(self):
478478
if wid and self.parent._windows.has_key(wid):
479479
window = self.parent._windows[wid]
480480
if hasattr(window, "domenu_" + callback):
481-
menu.menu.EnableItem(i + 1)
481+
menu.menu.EnableMenuItem(i + 1)
482482
elif hasattr(self.parent, "domenu_" + callback):
483-
menu.menu.EnableItem(i + 1)
483+
menu.menu.EnableMenuItem(i + 1)
484484
else:
485-
menu.menu.DisableItem(i + 1)
485+
menu.menu.DisableMenuItem(i + 1)
486486
elif hasattr(self.parent, "domenu_" + callback):
487-
menu.menu.EnableItem(i + 1)
487+
menu.menu.EnableMenuItem(i + 1)
488488
else:
489-
menu.menu.DisableItem(i + 1)
489+
menu.menu.DisableMenuItem(i + 1)
490490
elif callback:
491491
pass
492492

@@ -587,13 +587,13 @@ def dispatch(self, id, item, window, event):
587587

588588
def enable(self, onoff):
589589
if onoff:
590-
self.menu.EnableItem(0)
590+
self.menu.EnableMenuItem(0)
591591
if self._parent:
592-
self._parent.menu.EnableItem(self._parent_item)
592+
self._parent.menu.EnableMenuItem(self._parent_item)
593593
else:
594-
self.menu.DisableItem(0)
594+
self.menu.DisableMenuItem(0)
595595
if self._parent:
596-
self._parent.menu.DisableItem(self._parent_item)
596+
self._parent.menu.DisableMenuItem(self._parent_item)
597597
if self.bar and self.bar.parent:
598598
self.bar.parent.needmenubarredraw = 1
599599

@@ -629,13 +629,13 @@ def delete(self):
629629
del self.item
630630

631631
def check(self, onoff):
632-
self.menu.menu.CheckItem(self.item, onoff)
632+
self.menu.menu.CheckMenuItem(self.item, onoff)
633633

634634
def enable(self, onoff):
635635
if onoff:
636-
self.menu.menu.EnableItem(self.item)
636+
self.menu.menu.EnableMenuItem(self.item)
637637
else:
638-
self.menu.menu.DisableItem(self.item)
638+
self.menu.menu.DisableMenuItem(self.item)
639639

640640
def settext(self, text):
641641
self.menu.menu.SetMenuItemText(self.item, text)

‎Mac/Tools/IDE/PyConsole.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def makenamespacemenu(self, *args):
167167
# XXX this functionality should be generally available in Wmenus
168168
submenuid = self.namespacemenu.menu.menu.GetItemMark(3)
169169
menu = self.namespacemenu.menu.bar.menus[submenuid]
170-
menu.menu.CheckItem(i + 1, 1)
170+
menu.menu.CheckMenuItem(i + 1, 1)
171171

172172
def browsenamespace(self):
173173
import PyBrowser, W

‎Mac/Tools/IDE/Wapplication.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ def do_suspendresume(self, event):
200200

201201
def checkopenwindowsmenu(self):
202202
if self._openwindowscheckmark:
203-
self.openwindowsmenu.menu.CheckItem(self._openwindowscheckmark, 0)
203+
self.openwindowsmenu.menu.CheckMenuItem(self._openwindowscheckmark, 0)
204204
window = Win.FrontWindow()
205205
if window:
206206
for item, wid in self._openwindows.items():
207207
if wid == window:
208208
#self.pythonwindowsmenuitem.check(1)
209-
self.openwindowsmenu.menu.CheckItem(item, 1)
209+
self.openwindowsmenu.menu.CheckMenuItem(item, 1)
210210
self._openwindowscheckmark = item
211211
break
212212
else:
@@ -236,9 +236,9 @@ def checkmenus(self, window):
236236
def enablemenubar(self, onoff):
237237
for m in self.menubar.menus.values():
238238
if onoff:
239-
m.menu.EnableItem(0)
239+
m.menu.EnableMenuItem(0)
240240
elif m.menu.GetMenuItemText(3) <> 'Cut': # ew...
241-
m.menu.DisableItem(0)
241+
m.menu.DisableMenuItem(0)
242242
MenuToolbox.DrawMenuBar()
243243

244244
def makemenubar(self):

‎Mac/Tools/IDE/Wmenus.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def click(self, point, modifiers):
101101
l, t, r, b = self._bounds
102102
l, t = Qd.LocalToGlobal((l+1, t+1))
103103
Wbase.SetCursor("arrow")
104-
self.menu.menu.EnableItem(0)
104+
self.menu.menu.EnableMenuItem(0)
105105
reply = self.menu.menu.PopUpMenuSelect(t, l, 1)
106106
if reply:
107107
id = (reply & 0xffff0000) >> 16
@@ -190,7 +190,7 @@ def click(self, point, modifiers):
190190
l, t, r, b = self._bounds
191191
l, t = Qd.LocalToGlobal((l+1, t+1))
192192
Wbase.SetCursor("arrow")
193-
self.menu.menu.EnableItem(0)
193+
self.menu.menu.EnableMenuItem(0)
194194
reply = self.menu.menu.PopUpMenuSelect(t, l, 1)
195195
if reply:
196196
id = (reply & 0xffff0000) >> 16

0 commit comments

Comments
 (0)