← Back to branch summary

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

« back to all changes in this revision

Viewing changes to wxPython/wx/tools/XRCed/AttributePanel.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/tools/XRCed/AttributePanel.py
2
2
# Purpose:      View components for editing attributes
3
3
# Author:       Roman Rolinsky <rolinsky@mema.ucl.ac.be>
4
4
# Created:      17.06.2007
5
 
# RCS-ID:       $Id: AttributePanel.py 64158 2010-04-27 11:59:52Z ROL $
 
5
# RCS-ID:       $Id: AttributePanel.py 65408 2010-08-25 22:52:11Z RD $
6
6
 
7
7
import string
8
8
import wx
70
70
 
71
71
        topSizer = wx.BoxSizer(wx.VERTICAL)
72
72
        pinSizer = wx.BoxSizer(wx.HORIZONTAL)
73
 
        sizer = wx.FlexGridSizer(2, 2, 1, 5)
 
73
        sizer = wx.FlexGridSizer(cols=2, vgap=1, hgap=5)
74
74
        self.labelRef = wx.StaticText(self, -1, 'ref:')
75
75
        self.textRef = params.ParamText(self, 'ref', textWidth=200)
76
76
        sizer.AddMany([ (self.labelRef, 0, wx.ALIGN_CENTER_VERTICAL),
343
343
        topSizer = wx.BoxSizer(wx.HORIZONTAL)
344
344
        # Events on the left
345
345
        leftSizer = wx.BoxSizer(wx.VERTICAL)
346
 
        sizer = wx.GridSizer(len(events), 1, 0, 5)
 
346
        sizer = wx.GridSizer(cols=1, vgap=0, hgap=5)
347
347
        label = wx.StaticText(self, label='Events')
348
348
        label.SetFont(g.labelFont())
349
349
        sizer.Add(label, 0, wx.LEFT, 20)
354
354
        leftSizer.Add(sizer)
355
355
        # Additional comboboxes
356
356
        self.extra = []
357
 
        self.eventSizer = wx.FlexGridSizer(1, 2, 0, 0)
 
357
        self.eventSizer = wx.FlexGridSizer(cols=2)
358
358
        leftSizer.Add(self.eventSizer)
359
359
        topSizer.Add(leftSizer)
360
360
        # Right sizer