--- a/dialogs/PouNameDialog.py	Fri Jun 15 18:03:25 2012 +0200
+++ b/dialogs/PouNameDialog.py	Mon Jun 25 20:03:53 2012 +0200
@@ -29,49 +29,33 @@
 
 class PouNameDialog(wx.TextEntryDialog):
 
-    if wx.VERSION < (2, 6, 0):
-        def Bind(self, event, function, id = None):
-            if id is not None:
-                event(self, id, function)
-            else:
-                event(self, function)
-    
-
     def __init__(self, parent, message, caption = "Please enter text", defaultValue = "", 
                        style = wx.OK|wx.CANCEL|wx.CENTRE, pos = wx.DefaultPosition):
         wx.TextEntryDialog.__init__(self, parent, message, caption, defaultValue, style, pos)
         
         self.PouNames = []
-        if wx.VERSION >= (2, 8, 0):
-            self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.GetSizer().GetItem(2).GetSizer().GetItem(1).GetSizer().GetAffirmativeButton().GetId())
-        elif wx.VERSION >= (2, 6, 0):
-            self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.GetSizer().GetItem(3).GetSizer().GetAffirmativeButton().GetId())
-        else:
-            self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.GetSizer().GetItem(3).GetSizer().GetChildren()[0].GetSizer().GetChildren()[0].GetWindow().GetId())
-    
+        
+        self.Bind(wx.EVT_BUTTON, self.OnOK, 
+              self.GetSizer().GetItem(2).GetSizer().GetItem(1).GetSizer().GetAffirmativeButton())
+        
     def OnOK(self, event):
+        message = None
         step_name = self.GetSizer().GetItem(1).GetWindow().GetValue()
         if step_name == "":
-            message = wx.MessageDialog(self, _("You must type a name!"), _("Error"), wx.OK|wx.ICON_ERROR)
-            message.ShowModal()
-            message.Destroy()
+            message = _("You must type a name!")
         elif not TestIdentifier(step_name):
-            message = wx.MessageDialog(self, _("\"%s\" is not a valid identifier!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
-            message.ShowModal()
-            message.Destroy()
+            message = _("\"%s\" is not a valid identifier!") % step_name
         elif step_name.upper() in IEC_KEYWORDS:
-            message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
-            message.ShowModal()
-            message.Destroy()
+            message = _("\"%s\" is a keyword. It can't be used!") % step_name
         elif step_name.upper() in self.PouNames:
-            message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
-            message.ShowModal()
-            message.Destroy()
+            message = _("A POU named \"%s\" already exists!") % step_name
+        if message is not None:
+            dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
+            dialog.ShowModal()
+            dialog.Destroy()
         else:
             self.EndModal(wx.ID_OK)
 
     def SetPouNames(self, pou_names):
         self.PouNames = [pou_name.upper() for pou_name in pou_names]
 
-    def GetValue(self):
-        return self.GetSizer().GetItem(1).GetWindow().GetValue()