[GRASS-SVN] r65388 - grass/branches/releasebranch_7_0/gui/wxpython/dbmgr

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-06-06 07:31:06 -0700 (Sat, 06 Jun 2015)
New Revision: 65388

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/sqlbuilder.py
Log:
wxGUI: sqlbuilder: verify button
       (merge r65130, r65386-7 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/sqlbuilder.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/sqlbuilder.py	2015-06-06 14:25:06 UTC (rev 65387)
+++ grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/sqlbuilder.py	2015-06-06 14:31:06 UTC (rev 65388)
@@ -74,6 +74,14 @@
         
         self._doLayout(modeChoices)
 
+        self.panel.SetAutoLayout(True)
+        self.panel.SetSizer(self.pagesizer)
+        self.pagesizer.Fit(self.panel)
+        
+        self.SetMinSize((400, 600))
+        self.SetClientSize(self.panel.GetSize())
+        self.CenterOnParent()
+                
     def _doLayout(self, modeChoices):
         """Do dialog layout"""
         
@@ -274,15 +282,6 @@
         self.goto.Bind(wx.EVT_TEXT,              self.OnGoTo)
         self.goto.Bind(wx.EVT_TEXT_ENTER,        self.OnAddValue)
 
-        self.panel.SetAutoLayout(True)
-        self.panel.SetSizer(self.pagesizer)
-        self.pagesizer.Fit(self.panel)
-        
-        self.Layout()
-        self.SetMinSize((400, 600))
-        self.SetClientSize(self.panel.GetSize())
-        self.CenterOnParent()
-   
     def OnUniqueValues(self, event, justsample = False):
         """Get unique values"""
         vals = []
@@ -422,7 +421,7 @@
         self.btn_verify.SetToolTipString(_("Verify SQL statement"))
 
         self.buttonsizer.Insert(item = self.btn_verify, before = 1)
-
+        
         self.text_sql.Bind(wx.EVT_TEXT, self.OnText)
         self.btn_verify.Bind(wx.EVT_BUTTON,      self.OnVerify)