--- nfo/projects/netfraggle/bin/fraggleViewport.py	2004/08/25 13:53:48	1.1
+++ nfo/projects/netfraggle/bin/fraggleViewport.py	2004/08/25 16:56:59	1.2
@@ -1,31 +1,30 @@
-#Boa:MDIParent:wxMDIParentFrame1
+#Boa:MDIParent:fraggleViewport
 
 from wxPython.wx import *
 
 import fraggleDialogPrefs
+import fraggleCtlPreferences
 
 def create(parent):
-    return wxMDIParentFrame1(parent)
+    return fraggleViewport(parent)
 
-[wxID_WXMDIPARENTFRAME1] = map(lambda _init_ctrls: wxNewId(), range(1))
+[wxID_FRAGGLEVIEWPORT] = map(lambda _init_ctrls: wxNewId(), range(1))
 
-[wxID_WXMDIPARENTFRAME1MENU1FPREFS, wxID_WXMDIPARENTFRAME1MENU1ITEMS1, 
+[wxID_FRAGGLEVIEWPORTMENU1FPREFS, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, 
 ] = map(lambda _init_coll_menu1_Items: wxNewId(), range(2))
 
-class wxMDIParentFrame1(wxMDIParentFrame):
+class fraggleViewport(wxMDIParentFrame):
     def _init_coll_menu1_Items(self, parent):
         # generated method, don't edit
 
         parent.Append(helpString='Configure Netfraggle',
-              id=wxID_WXMDIPARENTFRAME1MENU1FPREFS, item='Preferences',
+              id=wxID_FRAGGLEVIEWPORTMENU1FPREFS, item='Preferences',
               kind=wxITEM_NORMAL)
         parent.Append(helpString='Exit Netfraggle',
-              id=wxID_WXMDIPARENTFRAME1MENU1ITEMS1, item='Exit',
+              id=wxID_FRAGGLEVIEWPORTMENU1ITEMS1, item='Exit',
               kind=wxITEM_NORMAL)
-        EVT_MENU(self, wxID_WXMDIPARENTFRAME1MENU1FPREFS,
-              self.OnMenu1items0Menu)
-        EVT_MENU(self, wxID_WXMDIPARENTFRAME1MENU1ITEMS1,
-              self.OnMenu1items1Menu)
+        EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FPREFS, self.OnMenu1items0Menu)
+        EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, self.OnMenu1items1Menu)
 
     def _init_coll_menuBar1_Menus(self, parent):
         # generated method, don't edit
@@ -44,20 +43,25 @@
 
     def _init_ctrls(self, prnt):
         # generated method, don't edit
-        wxMDIParentFrame.__init__(self, id=wxID_WXMDIPARENTFRAME1, name='',
-              parent=prnt, pos=wxPoint(277, 313), size=wxSize(683, 330),
+        wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT,
+              name='fraggleViewport', parent=prnt, pos=wxPoint(277, 313),
+              size=wxSize(683, 307),
               style=wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
               title='wxMDIParentFrame1')
         self._init_utils()
-        self.SetClientSize(wxSize(683, 307))
+        self.SetClientSize(wxSize(683, 284))
         self.SetMenuBar(self.menuBar1)
 
+    def __init_preferences__(self):
+        self.preferencesCtl = fraggleCtlPreferences.create(self)
+        self.dialogPrefs = fraggleDialogPrefs.create(self)
+        
     def __init__(self, parent):
         self._init_ctrls(parent)
-
+        self.__init_preferences__()
+        
 
     def OnMenu1items0Menu(self, event):
-        self.dialogPrefs = fraggleDialogPrefs.wxDialog1(self)
         try:
             self.dialogPrefs.ShowModal()
         finally: