[Commit-gnuradio] r8068 - gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python

[michaelld]

Author: michaelld
Date: 2008-03-21 18:16:09 -0600 (Fri, 21 Mar 2008)
New Revision: 8068

Modified:
   gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py
Log:
Corrected names of arguments.



Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py
===================================================================
--- gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py 
2008-03-21 04:27:20 UTC (rev 8067)
+++ gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py 
2008-03-22 00:16:09 UTC (rev 8068)
@@ -156,13 +156,13 @@
             print "stdframe::do_setup() Returning."
 
 class stdpanel (wx.Panel):
-    def __init__ (self, parent, top_block_maker, usage, debug):
+    def __init__ (self, frame, top_block_maker, usage, debug):
         # save parameters
         self._debug = debug
-        self._parent = parent
+        self._frame = frame
 
         # init this panel
-        wx.Panel.__init__ (self, parent, -1)
+        wx.Panel.__init__ (self, frame, -1)
 
         # create a vertical (auto) sizer box for placing GUI items
         vbox = wx.BoxSizer (wx.VERTICAL)
@@ -173,13 +173,13 @@
             # "new" method
             if debug:
                 print "stdpanel::__init__: Using new method to create 
top_block"
-            self.top_block = top_block_maker (parent, self, vbox, sys.argv,
+            self.top_block = top_block_maker (frame, self, vbox, sys.argv,
                                               usage, debug)
         else:
             # "old" method
             if debug:
                 print "stdpanel::__init__: Using old method to create 
top_block"
-            self.top_block = top_block_maker (parent, self, vbox, sys.argv)
+            self.top_block = top_block_maker (frame, self, vbox, sys.argv)
 
         self.SetSizer (vbox)
         self.SetAutoLayout (True)
@@ -219,7 +219,7 @@
         """
         Set the status text for bar # 'which' to the provided text.
         """
-        self._parent.set_status_text (text, which)
+        self._frame.set_status_text (text, which)
 
 class std_top_block (gr.top_block):
     def __init__ (self, frame, panel, vbox, argv, usage='', debug=False):
@@ -227,9 +227,8 @@
         # and outputs - they have to be added by the user's App.
         gr.top_block.__init__ (self, "std_top_block")
 
-        # save some parameters
-        self._parent = panel
-        self._debug = debug
+        # save the frame for use elsewhere
+        self._frame = frame
 
     def do_close (self):
         # overload for the specific user's app
@@ -243,4 +242,4 @@
         """
         Set the status text for bar # 'which' to the provided text.
         """
-        self._parent.set_status_text (text, which)
+        self._frame.set_status_text (text, which)