← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to wxPython/wx/lib/mixins/gridlabelrenderer.py

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wxPython/wx/lib/mixins/gridlabelrenderer.py
7
7
# Author:      Robin Dunn
8
8
#
9
9
# Created:     20-Mar-2009
10
 
# RCS-ID:      $Id: gridlabelrenderer.py 63321 2010-01-30 00:59:12Z RD $
 
10
# RCS-ID:      $Id: gridlabelrenderer.py 67478 2011-04-13 18:25:25Z RD $
11
11
# Copyright:   (c) 2009 by Total Control Software
12
12
# Licence:     wxWindows license
13
13
#----------------------------------------------------------------------
98
98
        dc = wx.PaintDC(window)
99
99
                
100
100
        rows = self.CalcRowLabelsExposed(window.GetUpdateRegion())
 
101
        if rows == [-1]:
 
102
            return
101
103
 
102
104
        x, y = self.CalcUnscrolledPosition((0,0))
103
105
        pt = dc.GetDeviceOrigin()
120
122
        dc = wx.PaintDC(window)
121
123
 
122
124
        cols = self.CalcColLabelsExposed(window.GetUpdateRegion())
 
125
        if cols == [-1]:
 
126
            return
123
127
 
124
128
        x, y = self.CalcUnscrolledPosition((0,0))
125
129
        pt = dc.GetDeviceOrigin()