Moved resources around to forestall conflicts with debuggee

diff --git a/Mac/Tools/twit/TwitCore.py b/Mac/Tools/twit/TwitCore.py
index a4d68bde1ae9bc5551b1a37fab3dc247f0827f49..8cd8c0e428a5d360fa5aab6794833390c7abc5f7 100644 (file)
--- a/Mac/Tools/twit/TwitCore.py
+++ b/Mac/Tools/twit/TwitCore.py
@@ -15,11 +15,11 @@ SIMPLE_TYPES=(
 )
 
 # XXXX Mac-specific
-ICON_NORMAL=512
-ICON_RETURN=515
-ICON_CALL=516
-ICON_ZERO=517
-ICON_DEAD=518
+ICON_NORMAL=500
+ICON_RETURN=503
+ICON_CALL=504
+ICON_ZERO=505
+ICON_DEAD=506
 
 class DebuggerStuff(bdb.Bdb):
 

diff --git a/Mac/Tools/twit/mac_widgets.py b/Mac/Tools/twit/mac_widgets.py
index 5e39feb1c0bb713d6ec1c4b78c70744345eb2776..569214f672793cbf6f34ed93d4d46d0a2206a97d 100644 (file)
--- a/Mac/Tools/twit/mac_widgets.py
+++ b/Mac/Tools/twit/mac_widgets.py
@@ -17,7 +17,10 @@ TEXTWIDTH=4096 # More-or-less random value
 TEXTFONT=4
 TEXTSIZE=9
 
-PIC_BREAK=513
+# Resource numbers
+PIC_CURRENT=500
+PIC_BREAK=501
+
 picture_cache={}
 
 class MT_TextWidget:
@@ -184,14 +187,14 @@ class MT_IconTextWidget(MT_TextWidget):
                                self.terect[0]-1, self.rect[3]-SCROLLBAR)
                self.curlinerange = (self.terect[1]+self.ted.lineHeight,
                                self.terect[3]-2*self.ted.lineHeight)
-               self.piccurrent = 512
+               self.piccurrent = PIC_CURRENT
                
        def setbreaks(self, list):
                self.breakpointlist = list[:]
                Qd.SetPort(self.wid)
                Win.InvalRect(self.iconrect)
                
-       def setcurline(self, line, pic=512):
+       def setcurline(self, line, pic=PIC_CURRENT):
                self.curline = line
                self.piccurrent = pic
                Qd.SetPort(self.wid)

diff --git a/Mac/Tools/twit/mactwit_app.py b/Mac/Tools/twit/mactwit_app.py
index ed96af51e54fb6d5b6b1559197da0f2a39e1c2b7..4b8433a718512ef40eeefff560938998f3377c1f 100644 (file)
--- a/Mac/Tools/twit/mactwit_app.py
+++ b/Mac/Tools/twit/mactwit_app.py
@@ -20,9 +20,9 @@ import macfs
 import string
 
 # Resource-id (for checking existence)
-ID_MODULES=512
+ID_MODULES=500
 
-ID_ABOUT=515
+ID_ABOUT=502
 
 _arrow = Qd.qd.arrow
 _watch = Qd.GetCursor(4).data

diff --git a/Mac/Tools/twit/mactwit_browser.py b/Mac/Tools/twit/mactwit_browser.py
index 5de871653056f412b91ab3e470c812b5c1dc3186..4c711466415a1a3a435ae2bff617f762b66afc87 100644 (file)
--- a/Mac/Tools/twit/mactwit_browser.py
+++ b/Mac/Tools/twit/mactwit_browser.py
@@ -27,7 +27,7 @@ import Res
 import Qd
 import List
 import sys
-from types import *
+from Types import *
 from QuickDraw import *
 import string
 import time
@@ -37,7 +37,7 @@ import os
 start_object = sys
 
 # Resource definitions
-ID_MAIN = 516
+ID_MAIN = 503
 NUM_LISTS = 4  # the number of lists used. could be changed, but the dlg item numbers should be consistent
 MAIN_TITLE = 3 # this is only the first text item, the other three ID's should be 5, 7 and 9
 MAIN_LIST = 4  # this is only the first list, the other three ID's should be 6, 8 and 10

diff --git a/Mac/Tools/twit/mactwit_mod.py b/Mac/Tools/twit/mactwit_mod.py
index eb3d84d134aefd19687a91bdcb3a39cf23d15f59..8c54480d6f2770dcbe6258c2d22601125aaa4e1a 100644 (file)
--- a/Mac/Tools/twit/mactwit_mod.py
+++ b/Mac/Tools/twit/mactwit_mod.py
@@ -10,7 +10,7 @@ import TwitCore
 from mac_widgets import MT_AnyList, MT_IconTextWidget
 
 # Our dialogs
-ID_MODULES=512
+ID_MODULES=500
 I_MODULES_TITLE=1
 I_MODULES=2
 I_VARS_TITLE=3

diff --git a/Mac/Tools/twit/mactwit_stack.py b/Mac/Tools/twit/mactwit_stack.py
index d15f5f93e34db8bbbd65860c91d9dc038a5fbeb3..e38fec3e20f8fa384c05ef0318400b2a722cd416 100644 (file)
--- a/Mac/Tools/twit/mactwit_stack.py
+++ b/Mac/Tools/twit/mactwit_stack.py
@@ -10,7 +10,7 @@ import TwitCore
 from mac_widgets import MT_AnyList, MT_IndexList, MT_IconTextWidget
 
 # Our dialogs
-ID_STACK=513
+ID_STACK=501
 I_STACK_TITLE=1
 I_STACK=2
 I_VARS_TITLE=3

diff --git a/Mac/Tools/twit/twit.py b/Mac/Tools/twit/twit.py
index 6c6bad4d2de1b8331daa6af89bba5e5ce8298f9c..2cc3f41218794b1c03ba4cfb0b71df196c6d5ba1 100644 (file)
--- a/Mac/Tools/twit/twit.py
+++ b/Mac/Tools/twit/twit.py
@@ -20,7 +20,7 @@ if not dirname in sys.path:
 
 if os.name == 'mac':
        import MacOS
-       MacOS.splash(515)       # Try to show the splash screen
+       MacOS.splash(502)       # Try to show the splash screen
        import mactwit_app; twit_app = mactwit_app
 else:
        try:

diff --git a/Mac/Tools/twit/twit.rsrc.hqx b/Mac/Tools/twit/twit.rsrc.hqx
index a6a9a8f9eabfafb9efd20ba35d84821afce44b4d..3bc1259d4e586723201135232ba0fcd1df78d494 100644 (file)
--- a/Mac/Tools/twit/twit.rsrc.hqx
+++ b/Mac/Tools/twit/twit.rsrc.hqx
@@ -2,7 +2,7 @@
 
 :#A4hDA3ZFR0bB`"bFh*M8P0&4!%!N!HdV-5P!*!%!3!!!,)5!!#a%J!!!TS!!!$
 `DIrr)"H6)!!#JH$`Drrr)"H8*!#3"2"[rrmJ#A4hDA3ZFR0bB`)!!!!rN!J!N!`
-rN!J!N"LZUS!V!*!'Y+`!m(Errb!AR%3!N!6`Grrr)"HG5!#3"2"irrmJ&jj-!*!
+rN!J!N"LZaQ0F!*!'Y+`!m(Errb!AR%3!N!6`Grrr)"HG5!#3"2"irrmJ&jj-!*!
 %m(Rrrb!ARe!!N!6`H[rr)"HJ9!#3"2"lrrmJ&k&B!*!%m(crrf!ASP`!N!6`IIr
 r)"HMB!#3"2#!rrmJ&k4N!*!&!rrr)"HPD!!#G#LrK2rr)"G2)!#3"#S!6!"S!AJ
 #'J!%!3!"!*!&!J!99(GTG#!Y)%e[C(9XC5"LFQphFf9b!!!!,`!U!"!"``(8!!3
@@ -922,4 +922,4 @@ UD@0c)`!!!EC659T&!!!"`J)!N!88+3*%8Q`#!3!2!!!8Z`*%8R3#!`"I!!!5R!*
 08h4KBfXJBR*[Gh0PFJe6G'&MDb"LFQphFf9b$Ne[C(9XC5"LFQphFf9b"8&bFQp
 h#Q*bC@&VF'pTER3*3@*[GA3JBQpi#8&LEh9d)'*[H!P"BQpeG#"LEhJ16@pNG@a
 P)'*bEhGcCA)08h4KBfXJBR*[Gh0PFJY@BA)JBR*[Gh0PFJj#FQphFf9b)(GTEQ4
-[G`j2GfjPFL"bCA0[GA*MC8aE:
+[G`j2GfjPFL"bCA0[GA*MCF65: