X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b339f106ca9fa0243f37dc9a5ec9e9509efa1e3..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/demo/ComboCtrl.py diff --git a/wxPython/demo/ComboCtrl.py b/wxPython/demo/ComboCtrl.py index 9c6b745184..d12ff37dc5 100644 --- a/wxPython/demo/ComboCtrl.py +++ b/wxPython/demo/ComboCtrl.py @@ -260,7 +260,10 @@ class ComboCtrlWithCustomPopupAnim(wx.combo.ComboCtrl): dc = wx.ScreenDC() bmp = wx.EmptyBitmap(rect.width, rect.height) 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 self.aniBackBitmap = bmp @@ -352,7 +355,7 @@ class FileSelectorCombo(wx.combo.ComboCtrl): if dlg.ShowModal() == wx.ID_OK: self.SetValue(dlg.GetPath()) dlg.Destroy() - + self.SetFocus() # Overridden from ComboCtrl to avoid assert since there is no ComboPopup def DoSetPopupControl(self, popup): @@ -412,13 +415,14 @@ class TestPanel(wx.Panel): fgs.Add(wx.StaticText(self, -1, "Custom popup animation")) for word in "How cool was that!? Way COOL!".split(): popup.AddItem(word) + if "wxMac" in wx.PlatformInfo: + cc.SetValue("Sorry, animation not working yet on Mac") cc = FileSelectorCombo(self, size=(250, -1)) fgs.Add(cc) fgs.Add((10,10)) fgs.Add(wx.StaticText(self, -1, "Custom popup action, and custom button bitmap")) - box = wx.BoxSizer() box.Add(fgs, 1, wx.EXPAND|wx.ALL, 20)