[pywin32-checkins] pywin32/Pythonwin/pywin/debugger dbgpyapp.py, 1.3, 1.4 debugger.py, 1.15, 1.16

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12299

Modified Files:
	dbgpyapp.py debugger.py 
Log Message:
Remove ToolbarDebugging altogether

Index: debugger.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/debugger.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** debugger.py	5 Mar 2005 03:24:12 -0000	1.15
--- debugger.py	20 Feb 2008 22:35:45 -0000	1.16
***************
*** 499,503 ****
  
  		frame = win32ui.GetMainFrame()
- 		frame.SaveBarState("ToolbarDebugging")
  		# Hide the debuger toolbars (as they wont normally form part of the main toolbar state.
  		for id, klass, float in DebuggerDialogInfos:
--- 499,502 ----
***************
*** 510,519 ****
  				pass
  
- 		# Restore the standard toolbar config
- 		try:
- 			frame.LoadBarState("ToolbarDefault")
- 		except win32ui.error, msg: # When once created toolbars no longer exist.
- 			pass
- #			print msg # LoadBarState failed (with win32 exception!)
  		self._UnshowCurrentLine()
  		self.set_quit()
--- 509,512 ----
***************
*** 786,794 ****
  			w.Init(self)
  
- 		try:
- 			frame.LoadBarState("ToolbarDebugging")
- 		except win32ui.error, details:
- 			print "LoadBarState failed - %s" % details
- 
  		# ALWAYS show debugging toolbar, regardless of saved state
  		tb = frame.GetControlBar(win32ui.ID_VIEW_TOOLBAR_DBG)
--- 779,782 ----

Index: dbgpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/dbgpyapp.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbgpyapp.py	7 Sep 2000 22:48:38 -0000	1.3
--- dbgpyapp.py	20 Feb 2008 22:35:45 -0000	1.4
***************
*** 46,59 ****
  #		win32ui.CreateDebuggerThread()
  		win32ui.EnableControlContainer()
- 
- 		# Load the ToolBar state near the end of the init process, as
- 		# there may be Toolbar IDs created by the user or other modules.
- 		# By now all these modules should be loaded, so all the toolbar IDs loaded.
- 		try:
- 			self.frame.LoadBarState("ToolbarDefault")
- 		except win32ui.error:
- 			# MFC sucks.  It does essentially "GetDlgItem(x)->Something", so if the
- 			# toolbar with ID x does not exist, MFC crashes!  Pythonwin has a trap for this
- 			# but I need to investigate more how to prevent it (AFAIK, ensuring all the
- 			# toolbars are created by now _should_ stop it!)
- 			pass
--- 46,47 ----