--- nfo/projects/netfraggle/bin/fraggleViewport.py	2004/08/25 19:54:07	1.5
+++ nfo/projects/netfraggle/bin/fraggleViewport.py	2004/08/25 21:40:54	1.6
@@ -17,18 +17,14 @@
 class fraggleViewport(wxMDIParentFrame):
     def _init_coll_menu1_Items(self, parent):
         # generated method, don't edit
+        
+        parent.Append(helpString='Configure Netfraggle',
+              id=wxID_FRAGGLEVIEWPORTMENU1FPREFS, item='Preferences',
+              kind=wxITEM_NORMAL)
+        parent.Append(helpString='Exit Netfraggle',
+              id=wxID_FRAGGLEVIEWPORTMENU1ITEMS1, item='Exit',
+              kind=wxITEM_NORMAL)
 
-        if os.name == "posix":
-            parent.Append(helpString='Configure Netfraggle',
-                  id=wxID_FRAGGLEVIEWPORTMENU1FPREFS, item='Preferences',
-                  kind=wxITEM_NORMAL)
-            parent.Append(helpString='Exit Netfraggle',
-                  id=wxID_FRAGGLEVIEWPORTMENU1ITEMS1, item='Exit',
-                  kind=wxITEM_NORMAL)
-        elif os.name == "nt":
-            parent.Append(wxID_FRAGGLEVIEWPORTMENU1FPREFS, 'Configure Netfraggle', "", wxITEM_NORMAL)
-            parent.Append(wxID_FRAGGLEVIEWPORTMENU1FPREFS, 'Exit Netfraggle', "", wxITEM_NORMAL)
-            
         EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FPREFS, self.OnMenu1items0Menu)
         EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, self.OnMenu1items1Menu)
 
@@ -61,6 +57,8 @@
     def __init_preferences__(self):
         self.preferencesCtl = fraggleCtlPreferences.create(self)
         self.dialogPrefs = fraggleDialogPrefs.create(self)
+        self.dialogPrefs.loadConfig()
+        self.dialogPrefs.updateConfig()
         
     def __init__(self, parent):
         self._init_ctrls(parent)
@@ -71,7 +69,7 @@
         try:
             self.dialogPrefs.ShowModal()
         finally:
-            self.dialogPrefs.Destroy()
+            pass
         event.Skip()
 
     def OnMenu1items1Menu(self, event):