[GRASS-SVN] r49874 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-23 01:32:17 -0800 (Fri, 23 Dec 2011)
New Revision: 49874

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/dbm_dialogs.py
Log:
wxGUI/dbmgr: fix ModifyTableRecord? on Windows (don't use wx.Panel for wx.Dialogs) (merge r49873 from devbr6)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/dbm_dialogs.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/dbm_dialogs.py	2011-12-23 09:22:43 UTC (rev 49873)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/dbm_dialogs.py	2011-12-23 09:32:17 UTC (rev 49874)
@@ -541,18 +541,16 @@
         self.CenterOnParent()
         
         self.keyId = keyEditable[0]
-        
-        self.panel = wx.Panel(parent = self, id = wx.ID_ANY)
-        
-        box = wx.StaticBox(parent = self.panel, id = wx.ID_ANY)
+                
+        box = wx.StaticBox(parent = self, id = wx.ID_ANY)
         box.Hide()
-        self.dataPanel = scrolled.ScrolledPanel(parent = self.panel, id = wx.ID_ANY,
+        self.dataPanel = scrolled.ScrolledPanel(parent = self, id = wx.ID_ANY,
                                                 style = wx.TAB_TRAVERSAL)
         self.dataPanel.SetupScrolling(scroll_x = False)
         
         # buttons
-        self.btnCancel = wx.Button(self.panel, wx.ID_CANCEL)
-        self.btnSubmit = wx.Button(self.panel, wx.ID_OK, _("&Submit"))
+        self.btnCancel = wx.Button(self, wx.ID_CANCEL)
+        self.btnSubmit = wx.Button(self, wx.ID_OK, _("&Submit"))
         self.btnSubmit.SetDefault()
         
         # data area
@@ -628,13 +626,11 @@
                   flag = wx.EXPAND | wx.ALL, border = 5)
         
         framewidth = self.GetSize()[0]
-        self.SetMinSize((framewidth,150))
-        self.SetMaxSize((framewidth,300))
+        self.SetMinSize((framewidth,250))
         
-        # sizer.SetSizeHints(self.panel)
-        self.panel.SetAutoLayout(True)
-        self.panel.SetSizer(sizer)
-        sizer.Fit(self.panel)
+        self.SetAutoLayout(True)
+        self.SetSizer(sizer)
+        sizer.Fit(self)
         
         self.Layout()