diff orpg/mapper/map.py @ 14:0b8b7e3ed78d traipse_dev

Adding fixes from OpenRPG 1.8.0 Includes GUI patch for Linux users, init2 plugin, cherrypy XML refrence Completely removes approot from the startup process and creates a software cleanup process as well.
author sirebral
date Mon, 20 Jul 2009 21:25:13 -0500
parents 4385a7d0efd1
children 78407d627cba
line wrap: on
line diff
--- a/orpg/mapper/map.py	Sat Jul 18 11:08:53 2009 -0500
+++ b/orpg/mapper/map.py	Mon Jul 20 21:25:13 2009 -0500
@@ -892,15 +892,25 @@
         self.layer_handlers.append(map_handler(self.layer_tabs,-1,self.canvas))
         self.layer_tabs.AddPage(self.layer_handlers[5],"General")
         self.layer_tabs.SetSelection(2)
+
+        self.sizer = wx.BoxSizer(wx.VERTICAL)
+        self.sizer.Add(self.canvas, 1, wx.EXPAND)
+        self.sizer.Add(self.layer_tabs, 0, wx.EXPAND)
+        self.SetSizer(self.sizer)
+
         self.Bind(FNB.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.on_layer_change)
-        self.Bind(wx.EVT_SIZE, self.on_size)
+        #self.Bind(wx.EVT_SIZE, self.on_size)
         self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave)
         self.load_default()
+
+        """
         # size of tabs is diffrent on windows and linux :(
         if wx.Platform == '__WXMSW__':
             self.toolbar_height = 50
         else:
             self.toolbar_height = 55
+        """
+
         self.log.log("Exit map_wnd", ORPG_DEBUG)
 
     def OnLeave(self, evt):
@@ -1123,9 +1133,11 @@
         self.log.log("Exit map_wnd->get_hot_keys(self)", ORPG_DEBUG)
         return []
 
+    """
     def on_size(self, evt):
         self.log.log("Enter map_wnd->on_size(self, evt)", ORPG_DEBUG)
         s = self.GetClientSizeTuple()
         self.canvas.SetDimensions(0,0,s[0],s[1]-self.toolbar_height)
         self.layer_tabs.SetDimensions(0,s[1]-self.toolbar_height,s[0],self.toolbar_height)
         self.log.log("Exit map_wnd->on_size(self, evt)", ORPG_DEBUG)
+    """