[GRASS-SVN] r39719 - grass-addons/gui/wxpython/data_catalog

[svn_grass at osgeo.org]

Author: rashadkm
Date: 2009-11-13 12:50:35 -0500 (Fri, 13 Nov 2009)
New Revision: 39719

Modified:
   grass-addons/gui/wxpython/data_catalog/catalog.py
Log:
fixed display problem for maps n other mapsets

Modified: grass-addons/gui/wxpython/data_catalog/catalog.py
===================================================================
--- grass-addons/gui/wxpython/data_catalog/catalog.py	2009-11-13 17:48:13 UTC (rev 39718)
+++ grass-addons/gui/wxpython/data_catalog/catalog.py	2009-11-13 17:50:35 UTC (rev 39719)
@@ -78,31 +78,6 @@
 		#populate location combobox
 		self.loclist = self.GetLocations()
 
-<<<<<<< .mine
-		#setting splitter window
-		self.win = wx.SplitterWindow(self)
-		self.pLeft = wx.Panel(self.win, style=wx.SUNKEN_BORDER)
-		self.pRight = wx.Panel(self.win, style=wx.SUNKEN_BORDER)
-		self.cmbPanel = wx.Panel(self)
-		self.pRight.SetBackgroundColour("white")
-		self.pLeft.Hide()
-		self.pRight.Hide()
-		self.win.Initialize(self.pLeft)
-		self.win.SplitVertically(self.pLeft, self.pRight, 310)
-=======
-        #setting splitter window
-        self.win = wx.SplitterWindow(self)
-        self.pLeft = wx.Panel(self.win, style=wx.SUNKEN_BORDER)
-        self.pRight = wx.Panel(self.win, style=wx.SUNKEN_BORDER)
-        self.cmbPanel = wx.Panel(self)
-        self.pRight.SetBackgroundColour("white")
-        self.pLeft.Hide()
-        self.pRight.Hide()
-        self.win.Initialize(self.pLeft)
-        self.win.SplitVertically(self.pLeft, self.pRight, 310)
->>>>>>> .r39717
-
-
 		#creating controls
 		self.mInfo = wx.TextCtrl(self.pRight, wx.ID_ANY, style = wx.TE_MULTILINE|wx.HSCROLL|wx.TE_READONLY)
 		self.chkInfo = wx.CheckBox(self.cmbPanel, wx.ID_ANY,"Display Info", wx.DefaultPosition, wx.DefaultSize)