Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid assert on Mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-11-28 23:12:23 +00:00
parent 2dfa37d69e
commit 800bd33631
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wxPython/demo/ComboCtrl.py
View File

@@ -260,7 +260,10 @@ class ComboCtrlWithCustomPopupAnim(wx.combo.ComboCtrl):
dc = wx.ScreenDC() dc = wx.ScreenDC()
bmp = wx.EmptyBitmap(rect.width, rect.height) bmp = wx.EmptyBitmap(rect.width, rect.height)
mdc = wx.MemoryDC(bmp) mdc = wx.MemoryDC(bmp)
mdc.Blit(0, 0, rect.width, rect.height, dc, rect.x, rect.y) if "wxMac" in wx.PlatformInfo:
pass
else:
mdc.Blit(0, 0, rect.width, rect.height, dc, rect.x, rect.y)
del mdc del mdc
self.aniBackBitmap = bmp self.aniBackBitmap = bmp
@@ -352,7 +355,7 @@ class FileSelectorCombo(wx.combo.ComboCtrl):
if dlg.ShowModal() == wx.ID_OK: if dlg.ShowModal() == wx.ID_OK:
self.SetValue(dlg.GetPath()) self.SetValue(dlg.GetPath())
dlg.Destroy() dlg.Destroy()
self.SetFocus()
# Overridden from ComboCtrl to avoid assert since there is no ComboPopup # Overridden from ComboCtrl to avoid assert since there is no ComboPopup
def DoSetPopupControl(self, popup): def DoSetPopupControl(self, popup):
@@ -412,6 +415,8 @@ class TestPanel(wx.Panel):
fgs.Add(wx.StaticText(self, -1, "Custom popup animation")) fgs.Add(wx.StaticText(self, -1, "Custom popup animation"))
for word in "How cool was that!? Way COOL!".split(): for word in "How cool was that!? Way COOL!".split():
popup.AddItem(word) popup.AddItem(word)
if "wxMac" in wx.PlatformInfo:
cc.SetValue("Sorry, animation not working yet on Mac")
cc = FileSelectorCombo(self, size=(250, -1)) cc = FileSelectorCombo(self, size=(250, -1))