vane/pywinauto
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Added some extra checks to ComboBox.Select()

Browse Source
This commit is contained in:
markm 2006-02-12 01:48:23 +00:00
parent 5b8d020c63
commit cf5409e053
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pywinauto/controls/win32_controls.py
View File

@ -144,6 +144,9 @@ class ButtonWrapper(HwndWrapper.HwndWrapper):
time.sleep(HwndWrapper.delay_after_button_click) time.sleep(HwndWrapper.delay_after_button_click)
#def IsSelected (self):
# (for radio buttons)
#==================================================================== #====================================================================
@ -214,9 +217,9 @@ class ComboBoxWrapper(HwndWrapper.HwndWrapper):
return self.SendMessage(win32defines.CB_GETCOUNT) return self.SendMessage(win32defines.CB_GETCOUNT)
#----------------------------------------------------------- #-----------------------------------------------------------
def ItemData(self, i): def ItemData(self, item):
"Returns the item data associated with the item if any" "Returns the item data associated with the item if any"
return self.SendMessage(win32defines.CB_GETITEMDATA, i) return self.SendMessage(win32defines.CB_GETITEMDATA, item)
#----------------------------------------------------------- #-----------------------------------------------------------
def ItemTexts(self): def ItemTexts(self):
@ -239,9 +242,9 @@ class ComboBoxWrapper(HwndWrapper.HwndWrapper):
"Return the properties of the control as a dictionary" "Return the properties of the control as a dictionary"
props = HwndWrapper.HwndWrapper.GetProperties(self) props = HwndWrapper.HwndWrapper.GetProperties(self)
props['ItemData'] = [] #props['ItemData'] = []
for i in range(self.ItemCount()): #for i in range(self.ItemCount()):
props['ItemData'].append(self.ItemData(i)) # props['ItemData'].append(self.ItemData(i))
return props return props
@ -258,6 +261,16 @@ class ComboBoxWrapper(HwndWrapper.HwndWrapper):
# string then find which item it is # string then find which item it is
if isinstance(item, (int, long)): if isinstance(item, (int, long)):
index = item index = item
if index >= self.ItemCount():
raise IndexError(
"Combobox has %d items, you requested item %d"%
(self.ItemCount(),
index))
# negative index
if index < 0:
index = (self.ItemCount() + index)
else: else:
index = self.Texts().index(item) -1 index = self.Texts().index(item) -1
@ -270,8 +283,14 @@ class ComboBoxWrapper(HwndWrapper.HwndWrapper):
# return this control so that actions can be chained. # return this control so that actions can be chained.
return self return self
#def IsSelected(self, item): #TODO def EditControl(self):
# pass #
#
#TODO def ListControl(self):
#TODO def ItemText(self, index):
#TODO def
#==================================================================== #====================================================================
class ListBoxWrapper(HwndWrapper.HwndWrapper): class ListBoxWrapper(HwndWrapper.HwndWrapper):