From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 3 Apr 2002 21:52:10 +0000 (+0000)
Subject: e macresource.need() to open the W resource file in the application init
X-Git-Tag: v2.3c1~6154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9c0358bf45bd6e0fe0b17720b41d20d618e6d9d;p=thirdparty%2FPython%2Fcpython.git

e macresource.need() to open the W resource file in the application init
code (if it isn't open already).

PythonIDE still opens the resource file "manually" because it also uses
presence of the CURS resource to determine whether it needs to adjust
sys.path.
---

diff --git a/Mac/Tools/IDE/Wapplication.py b/Mac/Tools/IDE/Wapplication.py
index ec0071f22bb7..27613f2cb42d 100644
--- a/Mac/Tools/IDE/Wapplication.py
+++ b/Mac/Tools/IDE/Wapplication.py
@@ -7,6 +7,7 @@ from Carbon import Events
 import traceback
 from types import *
 from Carbon import Menu; MenuToolbox = Menu; del Menu
+import macresource
 
 if hasattr(Win, "FrontNonFloatingWindow"):
 	MyFrontWindow = Win.FrontNonFloatingWindow
@@ -19,6 +20,8 @@ KILLUNKNOWNWINDOWS = 0  # Set to 0 for debugging.
 class Application(FrameWork.Application):
 	
 	def __init__(self, signature='Pyth'):
+		# Open our resource file, if it is not open yet
+		macresource.need('CURS', 468, "Widgets.rsrc")
 		import W
 		W.setapplication(self, signature)
 		FrameWork.Application.__init__(self)
diff --git a/Mac/Tools/IDE/Wminiapp.py b/Mac/Tools/IDE/Wminiapp.py
index 3ebd226d48ed..e09e3343d8ec 100644
--- a/Mac/Tools/IDE/Wminiapp.py
+++ b/Mac/Tools/IDE/Wminiapp.py
@@ -8,7 +8,7 @@ class TestApp(Wapplication.Application):
 	
 	def __init__(self):
 		from Carbon import Res
-		macresource.open_pathname("Widgets.rsrc")
+#		macresource.open_pathname("Widgets.rsrc")
 		self._menustocheck = []
 		self.preffilepath = os.path.join("Python", "PythonIDE preferences")
 		Wapplication.Application.__init__(self, 'Pyth')