--- a/dialogs/PouDialog.py	Fri Jun 15 18:03:25 2012 +0200
+++ b/dialogs/PouDialog.py	Mon Jun 25 20:03:53 2012 +0200
@@ -50,47 +50,35 @@
         
         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)
         
-        pouname_label = wx.StaticText(id=-1, parent=self,
-              label=_('POU Name:'), name='pouname_label', 
-              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
-        infos_sizer.AddWindow(pouname_label, 0, border=4, 
-                              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
+        pouname_label = wx.StaticText(self, label=_('POU Name:'))
+        infos_sizer.AddWindow(pouname_label, border=4, 
+              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
         
-        self.PouName = wx.TextCtrl(id=-1, parent=self, 
-              name='POUName', pos=wx.Point(0, 0), 
-              size=wx.Size(0, 24), style=0)
-        infos_sizer.AddWindow(self.PouName, 0, border=0, flag=wx.GROW)
+        self.PouName = wx.TextCtrl(self)
+        infos_sizer.AddWindow(self.PouName, flag=wx.GROW)
         
-        poutype_label = wx.StaticText(id=-1, parent=self,
-              label=_('POU Type:'), name='poutype_label', 
-              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
-        infos_sizer.AddWindow(poutype_label, 0, border=4, 
-                              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
+        poutype_label = wx.StaticText(self, label=_('POU Type:'))
+        infos_sizer.AddWindow(poutype_label, border=4, 
+              flag=wx.ALIGN_CENTER_VERTICAL|wx.TOP)
         
-        self.PouType = wx.ComboBox(id=-1, parent=self, 
-              name='POUType', pos=wx.Point(0, 0),
-              size=wx.Size(0, 28), style=wx.CB_READONLY)
-        self.Bind(wx.EVT_COMBOBOX, self.OnTypeChanged, id=self.PouType.GetId())
-        infos_sizer.AddWindow(self.PouType, 0, border=0, flag=wx.GROW)
+        self.PouType = wx.ComboBox(self, style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnTypeChanged, self.PouType)
+        infos_sizer.AddWindow(self.PouType, 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)
         
@@ -181,5 +169,3 @@
         values["pouType"] = POU_TYPES_DICT[self.PouType.GetStringSelection()]
         values["language"] = POU_LANGUAGES_DICT[self.Language.GetStringSelection()]
         return values
-
-