# HG changeset patch
# User laurent
# Date 1260867961 -3600
# Node ID 022e034bd4b844b6336a04ec20ef52ab1c78a33d
# Parent  d36a89dcd21ced49e4d444312b982223411992c8# Parent  36aeab46f27d918d708d125464eba4a42291aa8c
Changes merged

diff -r 36aeab46f27d -r 022e034bd4b8 Beremiz.py
--- a/Beremiz.py	Mon Dec 14 21:05:10 2009 +0100
+++ b/Beremiz.py	Tue Dec 15 10:06:01 2009 +0100
@@ -386,6 +386,7 @@
                   size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2)
         self.LogConsole.Bind(wx.EVT_LEFT_DCLICK, self.OnLogConsoleDClick)
         self.BottomNoteBook.AddPage(self.LogConsole, _("Log Console"))
+        self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogConsole), wx.RIGHT)
         
         self._init_beremiz_sizers()
 
@@ -432,11 +433,7 @@
         self._Refresh(TITLE, TOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
 
     def RiseLogConsole(self):
-        for idx in xrange(self.BottomNoteBook.GetPageCount()):
-            window = self.BottomNoteBook.GetPage(idx)
-            if window == self.LogConsole:
-                self.BottomNoteBook.SetSelection(idx)
-                break
+        self.BottomNoteBook.SetSelection(self.BottomNoteBook.GetPageIndex(self.LogConsole))
         
     def RefreshTitle(self):
         name = _("Beremiz")
diff -r 36aeab46f27d -r 022e034bd4b8 LPCBeremiz.py
--- a/LPCBeremiz.py	Mon Dec 14 21:05:10 2009 +0100
+++ b/LPCBeremiz.py	Tue Dec 15 10:06:01 2009 +0100
@@ -991,9 +991,15 @@
                 self.CollapseLocation(locations_infos, "root")
 
 frame = None
+app = None
+
+def GetApp():
+    global app
+    return app
+wx.GetApp = GetApp
 
 def BeremizStartProc(plugin_root):
-    global frame
+    global frame, app
 
     app = wx.PySimpleApp()
     app.SetAppName('beremiz')
@@ -1025,6 +1031,7 @@
     app.MainLoop()
 
     frame = None
+    app = None
 
 class StdoutPseudoFile:
     """ Base class for file like objects to facilitate StdOut for the Shell."""