[Wnd-commit] wnd/wnd/controls/toolbar messagehandler.py,1.3,1.4 methods.py,1.1.1.1,1.2

[jürgen u. <cer...@us...>]

Update of /cvsroot/wnd/wnd/wnd/controls/toolbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29632

Modified Files:
	messagehandler.py methods.py 
Log Message:
bit of this and a bit of that

Index: methods.py
===================================================================
RCS file: /cvsroot/wnd/wnd/wnd/controls/toolbar/methods.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** methods.py	29 Apr 2005 15:22:34 -0000	1.1.1.1
--- methods.py	23 Jul 2005 19:23:58 -0000	1.2
***************
*** 43,47 ****
  			fState = 0
  			for i in state:
! 				try:  fState |= states[i]
  				except: 
  					try: fStyle |= styles[i]
--- 43,48 ----
  			fState = 0
  			for i in state:
! 				try:  
! 					fState |= states[i]
  				except: 
  					try: fStyle |= styles[i]
***************
*** 90,94 ****
  	# methods
  	
! 		
  	# NEW METHOD
  	def ResetSnapshot(self):
--- 91,103 ----
  	# methods
  	
! 	def Button(self, ID, title, *state, **kwargs):
! 		result = self._client_SetItem(kwargs.get('iImage', 0), ID, state,  TBSTYLE_BUTTON, kwargs.get('lp', 0), title, -1)
! 		if result: raise RuntimeError(result)
! 	
! 	def InsertButton(self, i, ID, title, *state, **kwargs):
! 		result = self._client_SetItem(kwargs.get('iImage'), ID, state,  TBSTYLE_BUTTON, kwargs.get('lp', 0), title, i)
! 		if result: raise RuntimeError(result)
! 	
! 	
  	# NEW METHOD
  	def ResetSnapshot(self):
***************
*** 143,158 ****
  		return self._client_GetButton(i).idCommand
  	
! 	def Button(self, ID, title, iImage=0, lp=0, *state):
! 		result = self._client_SetItem(iImage, ID, state,  TBSTYLE_BUTTON, lp, title, -1)
! 		if result: raise RuntimeError(result)
! 		
  	def Separator(self, ID=0):
  		result = self._client_SetItem(0, ID, 0, TBSTYLE_SEP, 0, None, -1)
  		if result: raise RuntimeError(result	)	
  
- 	def InsertButton(self, i, ID, title, iImage=0, lp=0, *state):
- 		result = self._client_SetItem(iImage, ID, state,  TBSTYLE_BUTTON, lp, title, i)
- 		if result: raise RuntimeError(result)
- 
  	def InsertSeparator(self, i, ID=0):
  		result = self._client_SetItem(0, ID, 0, TBSTYLE_SEP, 0, None, i)
--- 152,160 ----
  		return self._client_GetButton(i).idCommand
  	
! 
  	def Separator(self, ID=0):
  		result = self._client_SetItem(0, ID, 0, TBSTYLE_SEP, 0, None, -1)
  		if result: raise RuntimeError(result	)	
  
  	def InsertSeparator(self, i, ID=0):
  		result = self._client_SetItem(0, ID, 0, TBSTYLE_SEP, 0, None, i)
***************
*** 160,164 ****
  	
  	def RemoveButton(self, ID):
! 		i=self.IdToIndex(ID)
  		if not self.SendMessage(self.Hwnd, self.Msg.TB_DELETEBUTTON , i, 0):
  			raise RuntimeError("could not remove item")
--- 162,166 ----
  	
  	def RemoveButton(self, ID):
! 		i=self.IDToIndex(ID)
  		if not self.SendMessage(self.Hwnd, self.Msg.TB_DELETEBUTTON , i, 0):
  			raise RuntimeError("could not remove item")
***************
*** 177,181 ****
  	
  	def GetButtonText(self, ID):
! 		#try: self.IdToIndex(ID)
  		#except: raise IndexError("invalid ID")
  		p=create_string_buffer(self._client_textMax)
--- 179,183 ----
  	
  	def GetButtonText(self, ID):
! 		#try: self.IDToIndex(ID)
  		#except: raise IndexError("invalid ID")
  		p=create_string_buffer(self._client_textMax)

Index: messagehandler.py
===================================================================
RCS file: /cvsroot/wnd/wnd/wnd/controls/toolbar/messagehandler.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** messagehandler.py	2 Jul 2005 09:55:32 -0000	1.3
--- messagehandler.py	23 Jul 2005 19:23:58 -0000	1.4
***************
*** 164,167 ****
  		elif msg==self.Msg.WM_DESTROY:
  			self.onMSG(hwnd, "destroy", 0, 0)
! 			return 0
  
--- 164,167 ----
  		elif msg==self.Msg.WM_DESTROY:
  			self.onMSG(hwnd, "destroy", 0, 0)
!