Merging r11186:11273 from grc branch.

Fixes, features, and reorganization for grc.
Minor fixes and features for wxgui forms.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11274 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 48 insertions, 0 deletions

diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
new file mode 100644
index 000000000..a32b0209f
--- /dev/null
+++ b/grc/gui/Platform.py
@@ -0,0 +1,48 @@
+"""
+Copyright 2008 Free Software Foundation, Inc.
+This file is part of GNU Radio
+
+GNU Radio Companion is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+GNU Radio Companion is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+"""
+
+from FlowGraph import FlowGraph
+from Connection import Connection
+from Block import Block
+from Port import Port
+from Param import Param
+
+def conjoin_classes(name, c1, c2):
+	exec("""
+class %s(c1, c2):
+	def __init__(self, *args, **kwargs):
+		c1.__init__(self, *args, **kwargs)
+		c2.__init__(self, *args, **kwargs)
+"""%name, locals())
+	return locals()[name]
+
+def Platform(platform):
+	#combine with gui class
+	for attr, value in (
+		('FlowGraph', FlowGraph),
+		('Connection', Connection),
+		('Block', Block),
+		('Source', Port),
+		('Sink', Port),
+		('Param', Param),
+	):
+		old_value = getattr(platform, attr)
+		c = conjoin_classes(attr, old_value, value)
+		setattr(platform, attr, c)
+	return platform