X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=1112acc229ad2c7d710019d1fb8f310b3de98650;hp=9fe152e63a43829278ae3566a35f4b1e4d065361;hb=e033f9e84abb3c12d92f1580425877aa58e9af30;hpb=adc24190c47d42d5fa02f074516fc331950d8c5c;ds=sidebyside

diff --git a/iramuteq.py b/iramuteq.py
index 9fe152e..1112acc 100644
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -101,10 +101,11 @@ ID_SimiTxt = wx.NewId()
 ##########################################################
 #encodage
 if sys.platform == 'darwin' :
-    sys.setdefaultencoding('utf-8')
-    wx.SetDefaultPyEncoding('utf-8')
+    sys.setdefaultencoding('UTF-8')
+    wx.SetDefaultPyEncoding('UTF-8')
 else :
     sys.setdefaultencoding(locale.getpreferredencoding())
+
 #chemin de l'application
 AppliPath = os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0])))
 #chemin des images
@@ -148,7 +149,6 @@ sys.stdout = printer()
 
 ConfigPath = ConstructConfigPath(UserConfigPath)
 
-
 langues = {'french' : wx.LANGUAGE_FRENCH,
             'english' : wx.LANGUAGE_ENGLISH,}
 #####################################################################
@@ -441,6 +441,7 @@ class IraFrame(wx.Frame):
             self.pref.read(self.ConfigPath['preferences'])
             if IsNew(self) :
                 UpgradeConf(self)
+                self.pref.read(self.ConfigPath['preferences'])
                 New = True
             else :
                 CopyConf(self)
@@ -508,7 +509,7 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
     def OnVerif(self, evt) :
         pack = CheckRPackages(self)
         if pack :
-            dlg = wx.MessageDialog(self, u"Installation OK", u"Installation", wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION)
+            dlg = wx.MessageDialog(self, u"Installation OK", u"Installation", wx.OK | wx.ICON_INFORMATION)
             dlg.CenterOnParent()
             if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]:
                  evt.Veto()