← Back to branch summary

~taskcoach-developers/taskcoach/trunk

« back to all changes in this revision

Viewing changes to taskcoachlib/widgets/calendarwidget.py

  • Committer: fraca7
  • Date: 2014-03-29 17:17:22 UTC
  • Revision ID: svn-v4:1bde7e76-c350-445e-a5b0-d0792d1e7eef:trunk/taskcoach:6450
Merge with release 1.3 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
taskcoachlib/widgets/calendarwidget.py
364
364
                else:
365
365
                    r, g, b, a = color
366
366
                if r + g + b < 128 * 3:
367
 
                    self.foreground = wx.Color(255 - r, 255 - g, 255 - b)
 
367
                    self.foreground = wx.Colour(255 - r, 255 - g, 255 - b)
368
368
            else:
369
 
                self.color = wx.Color(*(self.task.backgroundColor(True) or (255, 255, 255)))
370
 
                self.foreground = wx.Color(*(self.task.foregroundColor(True) or (0, 0, 0)))
 
369
                self.color = wx.Colour(*(self.task.backgroundColor(True) or (255, 255, 255)))
 
370
                self.foreground = wx.Colour(*(self.task.foregroundColor(True) or (0, 0, 0)))
371
371
        finally:
372
372
            self.Thaw()
373
373
 
418
418
            if self.task.completed():
419
419
                self.done = True
420
420
 
421
 
            self.color = wx.Color(*(self.task.backgroundColor(True) or (255, 255, 255)))
422
 
            self.foreground = wx.Color(*(self.task.foregroundColor(True) or (0, 0, 0)))
 
421
            self.color = wx.Colour(*(self.task.backgroundColor(True) or (255, 255, 255)))
 
422
            self.foreground = wx.Colour(*(self.task.foregroundColor(True) or (0, 0, 0)))
423
423
            self.font = self.task.font(True)
424
424
 
425
425
            self.icons = [self.iconProvider(self.task, False)]