-

Ram Rachum · Ram Rachum · commit 3249fb842157 · 2010-01-27T07:39:40.000+02:00
diff --git a/garlicsim.wpu b/garlicsim.wpu
diff --git a/garlicsim_wx/garlicsim_wx/frame/frame.py b/garlicsim_wx/garlicsim_wx/frame/frame.py
@@ -126,6 +126,7 @@ def __init__(self, *args, **keywords):
         
 
         
+        self.aui_manager.Update()
         
         self.Show()
         
diff --git a/garlicsim_wx/garlicsim_wx/general_misc/junk/aui.py b/garlicsim_wx/garlicsim_wx/general_misc/junk/aui.py
@@ -9,11 +9,12 @@ def __init__(self, parent, id=-1, title="AUI Test", pos=wx.DefaultPosition,
 
         wx.Frame.__init__(self, parent, id, title, pos, size, style)
 
-        self._mgr = aui.AuiManager()
+        self.aui_manager = aui.AuiManager()
         
         # notify AUI which frame to use
-        self._mgr.SetManagedWindow(self)
-
+        self.aui_manager.SetManagedWindow(self)
+        
+        
         # create several text controls
         text1 = wx.TextCtrl(self, -1, "Pane 1 - sample text",
                             wx.DefaultPosition, wx.Size(200,150),
@@ -28,20 +29,21 @@ def __init__(self, parent, id=-1, title="AUI Test", pos=wx.DefaultPosition,
                             wx.NO_BORDER | wx.TE_MULTILINE)
         
         # add the panes to the manager
-        self._mgr.AddPane(text1, AuiPaneInfo().Left().Caption("Pane Number One"))
-        self._mgr.AddPane(text2, AuiPaneInfo().Bottom().Caption("Pane Number Two"))
-        self._mgr.AddPane(text3, AuiPaneInfo().CenterPane())
-                              
+        self.aui_manager.AddPane(text1, AuiPaneInfo().Left().Caption("Pane Number One"))
+        self.aui_manager.AddPane(text2, AuiPaneInfo().Bottom().Caption("Pane Number Two"))
+        self.aui_manager.AddPane(text3, AuiPaneInfo().CenterPane())
+
         # tell the manager to "commit" all the changes just made
-        self._mgr.Update()
+        self.aui_manager.Update()
+        
 
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
 
     def OnClose(self, event):
 
         # deinitialize the frame manager
-        self._mgr.UnInit()
+        self.aui_manager.UnInit()
 
         self.Destroy()        
         event.Skip()        
diff --git a/garlicsim_wx/garlicsim_wx/general_misc/junk/aui_test.py b/garlicsim_wx/garlicsim_wx/general_misc/junk/aui_test.py
diff --git a/garlicsim_wx/garlicsim_wx/widgets/workspace_widget.py b/garlicsim_wx/garlicsim_wx/widgets/workspace_widget.py
@@ -1,6 +1,6 @@
 #tododoc
 
-import wx.lib.agw.aui
+from garlicsim_wx.general_misc.third_party import aui
 
 from garlicsim.general_misc.third_party import abc
 
@@ -16,7 +16,7 @@ def __init__(self, frame):
         
         frame.aui_manager.AddPane(
             self,
-            wx.lib.agw.aui.AuiPaneInfo().Left().Caption(type(self).__name__)
+            aui.AuiPaneInfo().Caption(type(self).__name__)
         )
                              
         frame.aui_manager.Update()
diff --git a/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/seek_bar.py b/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/seek_bar.py
@@ -26,7 +26,7 @@ class SeekBar(wx.Panel, WorkspaceWidget):
     '''
     def __init__(self, frame):
         
-        wx.Panel.__init__(self, frame, style=wx.SUNKEN_BORDER)
+        wx.Panel.__init__(self, frame, size=(100, 100), style=wx.SUNKEN_BORDER)
         WorkspaceWidget.__init__(self, frame)
         
         self.Bind(wx.EVT_PAINT, self.on_paint)
diff --git a/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/shell.py b/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/shell.py
@@ -19,6 +19,7 @@ def __init__(self, frame):
             'garlicsim': garlicsim,
             'garlicsim_wx': garlicsim_wx,
         }
-        wx.py.shell.Shell.__init__(self, frame, locals=locals_for_shell)
+        wx.py.shell.Shell.__init__(self, frame, size=(100, 100),
+                                   locals=locals_for_shell)
         WorkspaceWidget.__init__(self, frame)
     
diff --git a/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/state_repr_shower.py b/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/state_repr_shower.py
@@ -11,7 +11,8 @@
 
 class StateReprShower(wx.TextCtrl, WorkspaceWidget):#tododoc
     def __init__(self, frame):
-        wx.TextCtrl.__init__(self, frame, style=wx.TE_MULTILINE)
+        wx.TextCtrl.__init__(self, frame, size=(100, 100),
+                             style=wx.TE_MULTILINE)
         WorkspaceWidget.__init__(self, frame)
         self.Bind(wx.EVT_PAINT, self.on_paint)
         font = wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.BOLD, False,
diff --git a/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py b/garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py
@@ -29,7 +29,8 @@ class TreeBrowser(ScrolledPanel, WorkspaceWidget):
     A widget for browsing a garlicsim.data_structures.Tree.
     '''
     def __init__(self, frame):
-        ScrolledPanel.__init__(self, frame, style=wx.SUNKEN_BORDER)
+        ScrolledPanel.__init__(self, frame, size=(100, 100),
+                               style=wx.SUNKEN_BORDER)
         WorkspaceWidget.__init__(self, frame)
         
         self.SetupScrolling()

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ def __init__(self, args, *keywords):`
`126`	`126`
`127`	`127`
`128`	`128`
	`129`	`+ self.aui_manager.Update()`
`129`	`130`
`130`	`131`	`self.Show()`
`131`	`132`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ def __init__(self, frame):`
`19`	`19`	`'garlicsim': garlicsim,`
`20`	`20`	`'garlicsim_wx': garlicsim_wx,`
`21`	`21`	`}`
`22`		`- wx.py.shell.Shell.__init__(self, frame, locals=locals_for_shell)`
	`22`	`+ wx.py.shell.Shell.__init__(self, frame, size=(100, 100),`
	`23`	`+ locals=locals_for_shell)`
`23`	`24`	`WorkspaceWidget.__init__(self, frame)`
`24`	`25`