equal
deleted
inserted
replaced
285 if "wxMSW" in wx.PlatformInfo: |
285 if "wxMSW" in wx.PlatformInfo: |
286 img = img.Scale(16, 16) |
286 img = img.Scale(16, 16) |
287 elif "wxGTK" in wx.PlatformInfo: |
287 elif "wxGTK" in wx.PlatformInfo: |
288 img = img.Scale(22, 22) |
288 img = img.Scale(22, 22) |
289 # wxMac can be any size upto 128x128, so leave the source img alone.... |
289 # wxMac can be any size upto 128x128, so leave the source img alone.... |
290 icon = wx.IconFromBitmap(img.ConvertToBitmap() ) |
290 icon = wx.IconFromBitmap(img.ConvertToBitmap()) |
291 return icon |
291 return icon |
292 |
292 |
293 def OnTaskBarStartPLC(self, evt): |
293 def OnTaskBarStartPLC(self, evt): |
294 if self.pyroserver.plcobj is not None: |
294 if self.pyroserver.plcobj is not None: |
295 plcstatus = self.pyroserver.plcobj.GetPLCstatus()[0] |
295 plcstatus = self.pyroserver.plcobj.GetPLCstatus()[0] |