--- a/dialogs/PouTransitionDialog.py	Fri Jun 15 18:03:25 2012 +0200
+++ b/dialogs/PouTransitionDialog.py	Mon Jun 25 20:03:53 2012 +0200
@@ -26,6 +26,10 @@
 
 from plcopen.structures import TestIdentifier, IEC_KEYWORDS
 
+#-------------------------------------------------------------------------------
+#                                POU Transition Dialog
+#-------------------------------------------------------------------------------
+
 def GetTransitionLanguages():
     _ = lambda x : x
     return [_("IL"), _("ST"), _("LD"), _("FBD")]
@@ -34,10 +38,8 @@
 class PouTransitionDialog(wx.Dialog):
     
     def __init__(self, parent):
-        wx.Dialog.__init__(self, id=-1, parent=parent,
-              name='PouTransitionDialog', title=_('Create a new transition'),
-              size=wx.Size(350, 200), style=wx.DEFAULT_DIALOG_STYLE)
-        self.SetClientSize(wx.Size(350, 160))
+        wx.Dialog.__init__(self, parent, size=wx.Size(350, 160),
+              title=_('Create a new transition'))
         
         main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
         main_sizer.AddGrowableCol(0)
@@ -45,35 +47,27 @@
         
         infos_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=3, vgap=15)
         infos_sizer.AddGrowableCol(1)
-        main_sizer.AddSizer(infos_sizer, 0, border=20, 
-                            flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        main_sizer.AddSizer(infos_sizer, border=20, 
+              flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
         
-        transitionname_label = wx.StaticText(id=-1, parent=self, 
-              label=_('Transition Name:'), name='transitionname_label', 
-              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
-        infos_sizer.AddWindow(transitionname_label, 0, border=4, 
-                              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
+        transitionname_label = wx.StaticText(self, label=_('Transition Name:'))
+        infos_sizer.AddWindow(transitionname_label, border=4, 
+              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
 
-        self.TransitionName = wx.TextCtrl(id=-1, parent=self, 
-              name='TransitionName', pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=0)
-        infos_sizer.AddWindow(self.TransitionName, 0, border=0, flag=wx.GROW)
+        self.TransitionName = wx.TextCtrl(self)
+        infos_sizer.AddWindow(self.TransitionName, flag=wx.GROW)
 
-        language_label = wx.StaticText(id=-1, parent=self, 
-              label=_('Language:'), name='language_label', 
-              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
-        infos_sizer.AddWindow(language_label, 0, border=4, 
-                              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
+        language_label = wx.StaticText(self, label=_('Language:'))
+        infos_sizer.AddWindow(language_label, border=4, 
+              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
         
-        self.Language = wx.ComboBox(id=-1, parent=self, 
-              name='Language', pos=wx.Point(0, 0), 
-              size=wx.Size(0, 28), style=wx.CB_READONLY)
-        infos_sizer.AddWindow(self.Language, 0, border=0, flag=wx.GROW)
+        self.Language = wx.ComboBox(self, style=wx.CB_READONLY)
+        infos_sizer.AddWindow(self.Language, flag=wx.GROW)
         
-        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
-        self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
-        main_sizer.AddSizer(self.ButtonSizer, 0, border=20, 
-                            flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+        button_sizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, button_sizer.GetAffirmativeButton())
+        main_sizer.AddSizer(button_sizer, border=20, 
+              flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
         
         self.SetSizer(main_sizer)