--- nfo/projects/netfraggle/bin/fraggleViewport.py	2004/09/05 00:21:10	1.19
+++ nfo/projects/netfraggle/bin/fraggleViewport.py	2004/09/05 10:09:26	1.20
@@ -1,7 +1,12 @@
 #Boa:MDIParent:fraggleViewport
 
-# $Id: fraggleViewport.py,v 1.19 2004/09/05 00:21:10 xabbu Exp $
+# $Id: fraggleViewport.py,v 1.20 2004/09/05 10:09:26 xabbu Exp $
 # $Log: fraggleViewport.py,v $
+# Revision 1.20  2004/09/05 10:09:26  xabbu
+# + Bug that menues where displayed incorrectly on nt like os resolved.
+# + Removed OS dependend menu creation in faggleMain -> moved to fraggleViewPort
+# + Modules configuration dialog can be displayed by selecting Files->Modules now
+#
 # Revision 1.19  2004/09/05 00:21:10  xabbu
 # +Fixed File Menu Modules item on Posix system. Gotta do testing on Windows with it.
 #
@@ -123,24 +128,24 @@
     def _init_utils(self):
         # generated method, don't edit
         self.menuBar1 = wxMenuBar()
-        self.menuBar1.SetAutoLayout(1)
+        self.menuBar1.SetAutoLayout(0)
 
         self.menu1 = wxMenu(title='')
-        self._init_coll_menu1_Items(self.menu1)
 
         self.menu2 = wxMenu(title='')
-        self._init_coll_menu2_Items(self.menu2)
 
         self.FraggleTaskBarMenu = wxMenu(title=u'NetFraggle')
-        self._init_coll_FraggleTaskBarMenu_Items(self.FraggleTaskBarMenu)
 
         self._init_coll_menuBar1_Menus(self.menuBar1)
+        self._init_coll_menu1_Items(self.menu1)
+        self._init_coll_menu2_Items(self.menu2)
+        self._init_coll_FraggleTaskBarMenu_Items(self.FraggleTaskBarMenu)
 
     def _init_ctrls(self, prnt):
         # generated method, don't edit
         wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT,
               name='fraggleViewport', parent=prnt, pos=wxPoint(335, 382),
-              size=wxSize(427, 246),
+              size=wxSize(435, 250),
               style=wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
               title='NetFraggle 0.0.1')
         self._init_utils()
@@ -202,12 +207,12 @@
         event.Skip()
 
 
-    def OnMenu2items0Menu(self, event):
-        try:
-            self.dialogPrefs.ShowModal()
-        finally:
-            pass
-        event.Skip()
+    #def OnMenu2items0Menu(self, event):
+     #   try:
+      #      self.dialogPrefs.ShowModal()
+     #   finally:
+      #      pass
+      #  event.Skip()
 
     def OnMenu2items1Menu(self, event):
         """Show about screen"""
@@ -241,8 +246,13 @@
         event.Skip()
 
     def OnMenu1FprefsMenu(self, event):
+        try:
+         self.dialogPrefs.ShowModal()
+        finally:
+          pass
         event.Skip()
 
     def OnMenu1Items1Menu(self, event):
+        self.Destroy()
         event.Skip()