wxGUI: move AddGrowableCol after adding items

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@55014 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/dbmgr/base.py

@@ -1059,7 +1059,6 @@ class DbMgrBrowsePage(DbMgrNotebookBase):
 
         # Simple tab layout
         simpleSqlSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        simpleSqlSizer.AddGrowableCol(1)
 
         sqlSimpleWhereSizer= wx.BoxSizer(wx.HORIZONTAL)
 
@@ -1079,6 +1078,7 @@ class DbMgrBrowsePage(DbMgrNotebookBase):
                            flag = wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.EXPAND)     
         simpleSqlSizer.Add(item = btnApply, border = 5, pos = (0, 2),
                            flag = wx.ALIGN_CENTER_VERTICAL | wx.TOP)
+        simpleSqlSizer.AddGrowableCol(1)
 
         simpleSqlPanel.SetSizer(simpleSqlSizer)
 
@@ -2709,7 +2709,6 @@ class LayerBook(wx.Notebook):
                 
         # data area
         dataSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        dataSizer.AddGrowableCol(1)
         row = 0
         for key in ('layer', 'driver', 'database', 'table', 'key', 'addCat'):
             label, value = self.addLayerWidgets[key]
@@ -2735,6 +2734,7 @@ class LayerBook(wx.Notebook):
             
             row += 1
         
+        dataSizer.AddGrowableCol(1)
         layerSizer.Add(item = dataSizer,
                        proportion = 1,
                        flag = wx.ALL | wx.EXPAND,

gui/wxpython/gcp/manager.py

@@ -2412,7 +2412,6 @@ class GrSettingsDialog(wx.Dialog):
         sizer = wx.BoxSizer(wx.VERTICAL)
 
         rmsgridSizer = wx.GridBagSizer(vgap=5, hgap=5)
-        rmsgridSizer.AddGrowableCol(1)
 
         # highlight only highest forward RMS error
         self.highlighthighest = wx.CheckBox(parent=panel, id=wx.ID_ANY,
@@ -2436,13 +2435,13 @@ class GrSettingsDialog(wx.Dialog):
 
         self.symbol['sdfactor'] = self.rmsWin.GetId()
         rmsgridSizer.Add(item=self.rmsWin, flag=wx.ALIGN_RIGHT, pos=(1, 1))
+        rmsgridSizer.AddGrowableCol(1)
         sizer.Add(item=rmsgridSizer, flag=wx.EXPAND | wx.ALL, border=5)
 
         box = wx.StaticBox(parent=panel, id=wx.ID_ANY,
                            label=" %s " % _("Symbol settings"))
         boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(vgap=5, hgap=5)
-        gridSizer.AddGrowableCol(1)
 
         #
         # general symbol color
@@ -2549,6 +2548,7 @@ class GrSettingsDialog(wx.Dialog):
         gridSizer.Add(item=widWin,
                       flag=wx.ALIGN_RIGHT,
                       pos=(row, 1))
+        gridSizer.AddGrowableCol(1)
         
         boxSizer.Add(item=gridSizer, flag=wx.EXPAND)
         sizer.Add(item=boxSizer, flag=wx.EXPAND | wx.ALL, border=5)

gui/wxpython/gmodeler/frame.py

@@ -1366,7 +1366,6 @@ class VariablePanel(wx.Panel):
         
         addSizer = wx.StaticBoxSizer(self.addBox, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridSizer.AddGrowableCol(1)
         gridSizer.Add(item = wx.StaticText(parent = self, id = wx.ID_ANY,
                                            label = "%s:" % _("Name")),
                       flag = wx.ALIGN_CENTER_VERTICAL,
@@ -1394,6 +1393,7 @@ class VariablePanel(wx.Panel):
         gridSizer.Add(item = self.desc,
                       pos = (2, 1), span = (1, 3),
                       flag = wx.EXPAND)
+        gridSizer.AddGrowableCol(1)
         addSizer.Add(item = gridSizer,
                      flag = wx.EXPAND)
         addSizer.Add(item = self.btnAdd, proportion = 0,

gui/wxpython/gmodeler/preferences.py

@@ -51,7 +51,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -70,6 +69,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
 
@@ -89,7 +89,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -142,6 +141,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -151,7 +151,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap=3, vgap=3)
-        gridSizer.AddGrowableCol(0)
 
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -189,6 +188,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item=gridSizer, proportion=1, flag=wx.ALL | wx.EXPAND, border=5)
         border.Add(item=sizer, proportion=0, flag=wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border=3)
                 
@@ -208,7 +208,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -261,6 +260,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
 
@@ -270,7 +270,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap=3, vgap=3)
-        gridSizer.AddGrowableCol(0)
         
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -308,6 +307,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item=gridSizer, proportion=1, flag=wx.ALL | wx.EXPAND, border=5)
         border.Add(item=sizer, proportion=0, flag=wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border=3)
         
@@ -327,7 +327,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -346,6 +345,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -355,7 +355,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap=3, vgap=3)
-        gridSizer.AddGrowableCol(0)
 
         row = 0
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -393,6 +392,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item=gridSizer, proportion=1, flag=wx.ALL | wx.EXPAND, border=5)
         border.Add(item=sizer, proportion=0, flag=wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border=3)
                 
@@ -458,8 +458,6 @@ class PropertiesDialog(wx.Dialog):
     def _layout(self):
         metaSizer = wx.StaticBoxSizer(self.metaBox, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(1)
-        gridSizer.AddGrowableRow(1)
         gridSizer.Add(item = wx.StaticText(parent = self, id = wx.ID_ANY,
                                          label = _("Name:")),
                       flag = wx.ALIGN_LEFT |
@@ -487,6 +485,8 @@ class PropertiesDialog(wx.Dialog):
                       flag = wx.ALIGN_LEFT |
                       wx.ALIGN_CENTER_VERTICAL | wx.EXPAND,
                       pos = (2, 1))
+        gridSizer.AddGrowableCol(1)
+        gridSizer.AddGrowableRow(1)
         metaSizer.Add(item = gridSizer, proportion = 1, flag = wx.EXPAND)
         
         cmdSizer = wx.StaticBoxSizer(self.cmdBox, wx.VERTICAL)

gui/wxpython/gui_core/ghelp.py

@@ -99,8 +99,6 @@ class AboutWindow(wx.Frame):
         infoTxt.SetupScrolling()
         infoSizer = wx.BoxSizer(wx.VERTICAL)
         infoGridSizer = wx.GridBagSizer(vgap = 5, hgap = 5)
-        infoGridSizer.AddGrowableCol(0)
-        infoGridSizer.AddGrowableCol(1)
         logo = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass-64x64.png")
         logoBitmap = wx.StaticBitmap(parent = infoTxt, id = wx.ID_ANY,
                                      bitmap = wx.Bitmap(name = logo,
@@ -183,6 +181,8 @@ class AboutWindow(wx.Frame):
                           pos = (row, 1),
                           flag = wx.ALIGN_LEFT)
         
+        infoGridSizer.AddGrowableCol(0)
+        infoGridSizer.AddGrowableCol(1)
         infoSizer.Add(item = infoGridSizer,
                       proportion = 1,
                       flag = wx.EXPAND | wx.ALIGN_CENTER | wx.ALIGN_CENTER_VERTICAL)

gui/wxpython/gui_core/gselect.py

@@ -1361,7 +1361,6 @@ class GdalSelect(wx.Panel):
         inputSizer = wx.StaticBoxSizer(self.inputBox, wx.HORIZONTAL)
         
         self.dsnSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
-        self.dsnSizer.AddGrowableCol(3)
         
         row = 0
         self.dsnSizer.Add(item = wx.StaticText(parent = self, id = wx.ID_ANY,
@@ -1395,6 +1394,7 @@ class GdalSelect(wx.Panel):
                               pos = (row, 1), span = (1, 3))
             row += 1
         
+        self.dsnSizer.AddGrowableCol(3)
         inputSizer.Add(item=self.dsnSizer, proportion = 1,
                        flag=wx.EXPAND | wx.BOTTOM, border = 10)
         

gui/wxpython/gui_core/preferences.py

@@ -288,7 +288,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         #
         # ask when removing map layer from layer tree
@@ -346,6 +345,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         gridSizer.Add(item = copySelectedTextToClipboard,
                       pos = (row, 0), span = (1, 2))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
         
@@ -356,7 +356,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         row = 0
         posDisplay = wx.CheckBox(parent = panel, id = wx.ID_ANY,
@@ -393,6 +392,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         gridSizer.Add(item = defaultPos,
                       pos = (row, 0), span = (1, 2))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
         
@@ -412,7 +412,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
 
         #
         # font settings
@@ -431,6 +430,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         gridSizer.Add(item = outfontButton,
                       flag = wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
+        gridSizer.AddGrowableCol(0)
 
         #
         # languages
@@ -439,7 +439,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)        
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
 
@@ -464,6 +463,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       flag = wx.ALIGN_RIGHT |
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
+        gridSizer.AddGrowableCol(0)
         #
         # appearence
         #
@@ -471,7 +471,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer  =  wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
 
         #
         # element list
@@ -585,6 +584,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
 
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -608,7 +608,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
 
         #
         # font settings
@@ -626,6 +625,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
 
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
 
@@ -636,8 +636,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
-
         
         #
         # display driver
@@ -784,6 +782,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       flag = wx.ALIGN_RIGHT,
                       pos = (row, 1))
 
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -809,7 +808,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         #
         # command dialog settings
@@ -871,6 +869,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         gridSizer.Add(item = verbosity,
                       pos = (row, 1), flag = wx.ALIGN_RIGHT)
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
         
@@ -892,7 +891,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         #
         # raster overlay
@@ -930,6 +928,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         gridSizer.Add(item = rasterCTName,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -958,8 +957,6 @@ class PreferencesDialog(PreferencesBaseDialog):
 
         row = col = 0
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
-        gridSizer.AddGrowableCol(3)
 
         # feature color
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -1042,6 +1039,8 @@ class PreferencesDialog(PreferencesBaseDialog):
         bb.Bind(wx.EVT_BUTTON, self.OnSetSymbol)
         gridSizer.Add(item = bb, pos = (row, col + 2))
 
+        gridSizer.AddGrowableCol(0)
+        gridSizer.AddGrowableCol(3)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -1208,7 +1207,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(1)
 
         # epsg
         row = 0
@@ -1274,6 +1272,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       flag = wx.ALIGN_RIGHT,
                       pos = (row, 1))
         
+        gridSizer.AddGrowableCol(1)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 3)
 
@@ -1284,7 +1283,6 @@ class PreferencesDialog(PreferencesBaseDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridSizer = wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(2)
 
         row = 0
         # ll format
@@ -1317,6 +1315,7 @@ class PreferencesDialog(PreferencesBaseDialog):
                       pos = (row, 2))
         
         
+        gridSizer.AddGrowableCol(2)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         
@@ -1504,7 +1503,6 @@ class DefaultFontDialog(wx.Dialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridSizer.AddGrowableCol(0)
 
         label = wx.StaticText(parent = panel, id = wx.ID_ANY,
                               label = _("Select font:"))
@@ -1569,6 +1567,7 @@ class DefaultFontDialog(wx.Dialog):
         if self.font:
             self.fontlb.SetStringSelection(self.font, True)
 
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1,
                   flag = wx.EXPAND | wx.ALL,
                   border = 5)

gui/wxpython/iclass/dialogs.py

@@ -153,8 +153,6 @@ class IClassCategoryManagerDialog(wx.Dialog):
                            label = " %s " % _("Classes"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridSizer.AddGrowableCol(0)
-        gridSizer.AddGrowableRow(2)
         self.catList = CategoryListCtrl(panel, mapwindow = parent, statistics = parent.statisticsDict,
                                          statisticsList = parent.statisticsList)
         addButton = wx.Button(panel, id = wx.ID_ADD)
@@ -164,6 +162,8 @@ class IClassCategoryManagerDialog(wx.Dialog):
         gridSizer.Add(item = addButton, pos = (0, 1), flag = wx.EXPAND)
         gridSizer.Add(item = deleteButton, pos = (1, 1), flag = wx.EXPAND)
                 
+        gridSizer.AddGrowableCol(0)
+        gridSizer.AddGrowableRow(2)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.EXPAND | wx.ALL, border = 5)
         mainSizer.Add(item = sizer, proportion = 1, flag = wx.EXPAND | wx.ALL, border = 5)
         

gui/wxpython/modules/colorrules.py

@@ -424,7 +424,6 @@ class ColorTable(wx.Frame):
         
         # layout
         gridSizer =  wx.GridBagSizer(hgap = 2, vgap = 2)
-        gridSizer.AddGrowableCol(1)
         
         gridSizer.Add(item = wx.StaticText(parent, label = _("Load color table:")),
                       pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
@@ -437,6 +436,7 @@ class ColorTable(wx.Frame):
                       pos = (2, 0), flag = wx.ALIGN_CENTER_VERTICAL)
         gridSizer.Add(item = self.saveRules, pos = (2, 1), span = (1, 2), flag = wx.EXPAND)
         
+        gridSizer.AddGrowableCol(1)
         inputSizer.Add(gridSizer, proportion = 1, flag = wx.EXPAND | wx.ALL,
                        border = 5)
         

gui/wxpython/nviz/preferences.py

@@ -171,7 +171,6 @@ class NvizPreferencesDialog(PreferencesBaseDialog):
                            label = " %s " % (_("Image Appearance")))
         boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         # background color
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -186,6 +185,7 @@ class NvizPreferencesDialog(PreferencesBaseDialog):
         self.winId['nviz:view:background:color'] = color.GetId()
         gridSizer.Add(item = color, pos = (0, 1))
         
+        gridSizer.AddGrowableCol(0)
         boxSizer.Add(item = gridSizer, proportion = 1,
                   flag = wx.ALL | wx.EXPAND, border = 5)
         pageSizer.Add(item = boxSizer, proportion = 0,
@@ -208,7 +208,6 @@ class NvizPreferencesDialog(PreferencesBaseDialog):
                            label = " %s " % (_("Fly-through mode")))
         boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
-        gridSizer.AddGrowableCol(0)
         
         # move exag
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -234,6 +233,7 @@ class NvizPreferencesDialog(PreferencesBaseDialog):
         self.winId['nviz:fly:exag:turn'] = turnExag.GetId()
         gridSizer.Add(item = turnExag, pos = (1, 1))
         
+        gridSizer.AddGrowableCol(0)
         boxSizer.Add(item = gridSizer, proportion = 1,
                   flag = wx.ALL | wx.EXPAND, border = 5)
         pageSizer.Add(item = boxSizer, proportion = 0,

gui/wxpython/psmap/dialogs.py

@@ -231,8 +231,6 @@ class PsmapDialog(wx.Dialog):
         box1   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = "")
         sizerP = wx.StaticBoxSizer(box1, wx.VERTICAL)
         self.gridBagSizerP = wx.GridBagSizer (hgap = 5, vgap = 5)
-        self.gridBagSizerP.AddGrowableCol(1)
-        self.gridBagSizerP.AddGrowableRow(3)
         
         self.AddPosition(parent = panel, dialogDict = dialogDict)
         panel.position['comment'].SetLabel(_("Position from the top left\nedge of the paper"))
@@ -245,6 +243,8 @@ class PsmapDialog(wx.Dialog):
         self.gridBagSizerP.Add(panel.position['yCtrl'], pos = (2,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         self.gridBagSizerP.Add(panel.position['comment'], pos = (3,0), span = (1,2), flag = wx.ALIGN_BOTTOM, border = 0)
         
+        self.gridBagSizerP.AddGrowableCol(1)
+        self.gridBagSizerP.AddGrowableRow(3)
         sizerP.Add(self.gridBagSizerP, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         gridBagSizer.Add(sizerP, pos = (2,0),span = (1,1), flag = wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND, border = 0)
         
@@ -252,8 +252,6 @@ class PsmapDialog(wx.Dialog):
         box2   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = "")
         sizerM = wx.StaticBoxSizer(box2, wx.VERTICAL)
         self.gridBagSizerM = wx.GridBagSizer (hgap = 5, vgap = 5)
-        self.gridBagSizerM.AddGrowableCol(0)
-        self.gridBagSizerM.AddGrowableCol(1)
         
         eastingLabel  = wx.StaticText(panel, id = wx.ID_ANY, label = "E:")
         northingLabel  = wx.StaticText(panel, id = wx.ID_ANY, label = "N:")
@@ -268,6 +266,8 @@ class PsmapDialog(wx.Dialog):
         self.gridBagSizerM.Add(panel.position['eCtrl'], pos = (0,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         self.gridBagSizerM.Add(panel.position['nCtrl'], pos = (1,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         
+        self.gridBagSizerM.AddGrowableCol(0)
+        self.gridBagSizerM.AddGrowableCol(1)
         sizerM.Add(self.gridBagSizerM, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         gridBagSizer.Add(sizerM, pos = (2,1), flag = wx.ALIGN_LEFT|wx.EXPAND, border = 0)
         
@@ -1304,8 +1304,6 @@ class VectorPanel(wx.Panel):
         box   = wx.StaticBox (parent = self, id = wx.ID_ANY, label = " %s " % _("Manage vector maps"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridBagSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(0,2)
-        gridBagSizer.AddGrowableCol(1,1)
 
         
         
@@ -1326,6 +1324,8 @@ class VectorPanel(wx.Panel):
         gridBagSizer.Add(self.btnDel, pos = (3,1), flag = wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, border = 0)
         gridBagSizer.Add(self.btnProp, pos = (4,1), flag = wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, border = 0)
         
+        gridBagSizer.AddGrowableCol(0,2)
+        gridBagSizer.AddGrowableCol(1,1)
         sizer.Add(gridBagSizer, proportion = 0, flag = wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -1953,7 +1953,6 @@ class VPropertiesDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Symbology"))        
         sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
     
         self.symbolRadio = wx.RadioButton(panel, id = wx.ID_ANY, label = _("symbol:"), style = wx.RB_GROUP)
         self.symbolRadio.SetValue(bool(self.vPropertiesDict['symbol']))
@@ -1976,13 +1975,14 @@ class VPropertiesDialog(PsmapDialog):
         else: #eps chosen
             self.epsFileCtrl.SetValue(self.vPropertiesDict['eps'])
             
-        gridBagSizer.AddGrowableCol(2)
         gridBagSizer.Add(self.symbolRadio, pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(self.symbolName, pos = (0, 1), flag = wx.ALIGN_CENTER_VERTICAL | wx.LEFT, border = 10)
         gridBagSizer.Add(self.symbolButton, pos = (0, 2), flag = wx.ALIGN_RIGHT , border = 0)
         gridBagSizer.Add(self.epsRadio, pos = (1, 0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(self.epsFileCtrl, pos = (1, 1), span = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, border = 0)
         
+        gridBagSizer.AddGrowableCol(1)
+        gridBagSizer.AddGrowableCol(2)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -1995,7 +1995,6 @@ class VPropertiesDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Size"))
         sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(0)
         
         self.sizeRadio = wx.RadioButton(panel, id = wx.ID_ANY, label = _("size:"), style = wx.RB_GROUP)
         self.sizeSpin = wx.SpinCtrl(panel, id = wx.ID_ANY, min = 1, max = 50, initial = 1)
@@ -2026,6 +2025,7 @@ class VPropertiesDialog(PsmapDialog):
         gridBagSizer.Add(self.scaleText, pos = (2, 0), flag = wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, border = 0)
         gridBagSizer.Add(self.scaleSpin, pos = (2, 1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         
+        gridBagSizer.AddGrowableCol(0)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -2036,7 +2036,6 @@ class VPropertiesDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Rotation"))
         sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
 
         
         self.rotateCheck = wx.CheckBox(panel, id = wx.ID_ANY, label = _("rotate symbols:"))
@@ -2063,6 +2062,7 @@ class VPropertiesDialog(PsmapDialog):
         gridBagSizer.Add(self.rotatecolumnRadio, pos = (2, 1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(self.rotateColChoice, pos = (2, 2), flag = wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, border = 0)
         
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -2153,7 +2153,6 @@ class VPropertiesDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Pattern"))
         sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
         
         self.patternCheck = wx.CheckBox(panel, id = wx.ID_ANY, label = _("use pattern:"))
         self.patFileCtrl = filebrowse.FileBrowseButton(panel, id = wx.ID_ANY, labelText = _("Choose pattern file:"),
@@ -2179,6 +2178,7 @@ class VPropertiesDialog(PsmapDialog):
         gridBagSizer.Add(self.patScaleSpin, pos = (3, 1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         
         
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -2608,8 +2608,6 @@ class LegendDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Source vector maps"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridBagSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(0,3)
-        gridBagSizer.AddGrowableCol(1,1)
         
         vectorText = wx.StaticText(panel, id = wx.ID_ANY, label = _("Choose vector maps and their order in legend"))
 
@@ -2643,6 +2641,8 @@ class LegendDialog(PsmapDialog):
         gridBagSizer.Add(self.btnDown, pos = (2,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(self.btnLabel, pos = (3,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         
+        gridBagSizer.AddGrowableCol(0,3)
+        gridBagSizer.AddGrowableCol(1,1)
         sizer.Add(gridBagSizer, proportion = 0, flag = wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, border = 0)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -2706,7 +2706,6 @@ class LegendDialog(PsmapDialog):
         sizeBox = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Size"))
         sizeSizer = wx.StaticBoxSizer(sizeBox, wx.VERTICAL) 
         posGridBagSizer = wx.GridBagSizer(hgap = 10, vgap = 5)
-        posGridBagSizer.AddGrowableRow(2)
         
         #position
         self.AddPosition(parent = panel, dialogDict = legendDict)
@@ -2716,6 +2715,7 @@ class LegendDialog(PsmapDialog):
         posGridBagSizer.Add(panel.position['yLabel'], pos = (1,0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         posGridBagSizer.Add(panel.position['yCtrl'], pos = (1,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         posGridBagSizer.Add(panel.position['comment'], pos = (2,0), span = (1,2), flag =wx.ALIGN_BOTTOM, border = 0)
+        posGridBagSizer.AddGrowableRow(2)
         posSizer.Add(posGridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         
         #size
@@ -2769,13 +2769,13 @@ class LegendDialog(PsmapDialog):
                 panel.spanRadio.SetValue(False)
                 
             self.vSizeGBSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-            self.vSizeGBSizer.AddGrowableCol(1)
             self.vSizeGBSizer.Add(width, pos = (0,0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
             self.vSizeGBSizer.Add(panel.widthCtrl, pos = (0,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
             self.vSizeGBSizer.Add(cols, pos = (1,0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
             self.vSizeGBSizer.Add(panel.colsCtrl, pos = (1,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
             self.vSizeGBSizer.Add(panel.spanRadio, pos = (2,0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
             self.vSizeGBSizer.Add(panel.spanTextCtrl, pos = (2,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
+            self.vSizeGBSizer.AddGrowableCol(1)
             sizeSizer.Add(self.vSizeGBSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)        
         
         hBox.Add(posSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 3)
@@ -3246,7 +3246,6 @@ class MapinfoDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Position"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridBagSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
         
         self.AddPosition(parent = panel, dialogDict = self.mapinfoDict)
         self.AddUnits(parent = panel, dialogDict = self.mapinfoDict)
@@ -3258,6 +3257,7 @@ class MapinfoDialog(PsmapDialog):
         gridBagSizer.Add(panel.position['yCtrl'], pos = (2,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(panel.position['comment'], pos = (3,0), span = (1,2), flag =wx.ALIGN_BOTTOM, border = 0)
         
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -3265,7 +3265,6 @@ class MapinfoDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Font settings"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridBagSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
         
         self.AddFont(parent = panel, dialogDict = self.mapinfoDict)#creates font color too, used below
         
@@ -3276,6 +3275,7 @@ class MapinfoDialog(PsmapDialog):
         gridBagSizer.Add(panel.font['colorLabel'], pos = (2,0), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)        
         gridBagSizer.Add(panel.font['colorCtrl'], pos = (2,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(item = gridBagSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 1)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -3441,7 +3441,6 @@ class ScalebarDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Position"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridBagSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
         
         self.AddUnits(parent = panel, dialogDict = self.scalebarDict)
         self.AddPosition(parent = panel, dialogDict = self.scalebarDict)
@@ -3463,6 +3462,7 @@ class ScalebarDialog(PsmapDialog):
         gridBagSizer.Add(panel.position['yCtrl'], pos = (2,1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(panel.position['comment'], pos = (3,0), span = (1,2), flag =wx.ALIGN_BOTTOM, border = 0)
         
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         #
@@ -3471,7 +3471,6 @@ class ScalebarDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Size"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridBagSizer = wx.GridBagSizer (hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(1)
         
         lengthText = wx.StaticText(panel, id = wx.ID_ANY, label = _("Length:"))
         heightText = wx.StaticText(panel, id = wx.ID_ANY, label = _("Height:"))
@@ -3516,6 +3515,7 @@ class ScalebarDialog(PsmapDialog):
         gridBagSizer.Add(self.heightTextCtrl, pos = (1, 1), flag = wx.ALIGN_CENTER_VERTICAL, border = 0)
         gridBagSizer.Add(self.unitsHeight, pos = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, border = 0)
       
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.EXPAND|wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         #
@@ -3819,11 +3819,11 @@ class TextDialog(PsmapDialog):
         box   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " % _("Position"))
         sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(0)
-        gridBagSizer.AddGrowableCol(1)
         
         #Position
         self.AddExtendedPosition(panel, gridBagSizer, self.textDict)
+        gridBagSizer.AddGrowableCol(0)
+        gridBagSizer.AddGrowableCol(1)
         
         #offset
         box3   = wx.StaticBox (parent = panel, id = wx.ID_ANY, label = " %s " %_("Offset"))
@@ -4227,8 +4227,6 @@ class ImageDialog(PsmapDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(0)
-        gridBagSizer.AddGrowableCol(1)
         
         self.AddExtendedPosition(panel, gridBagSizer, self.imageDict)
         
@@ -4236,6 +4234,8 @@ class ImageDialog(PsmapDialog):
         self.Bind(wx.EVT_RADIOBUTTON, self.OnPositionType, panel.position['toMap'])
         
         
+        gridBagSizer.AddGrowableCol(0)
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.ALIGN_CENTER_VERTICAL| wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         
@@ -4561,7 +4561,6 @@ class PointDialog(PsmapDialog):
         sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
         
         gridSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridSizer.AddGrowableCol(1)
 
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY, label = _("Select symbol:")),
                       pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
@@ -4581,6 +4580,7 @@ class PointDialog(PsmapDialog):
                                                  "in draft mode (only in preview mode)"))
         gridSizer.Add(self.noteLabel, pos = (1, 0), span = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL)
 
+        gridSizer.AddGrowableCol(1)
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.EXPAND | wx.ALL, border = 5)
         
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
@@ -4681,8 +4681,6 @@ class PointDialog(PsmapDialog):
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         
         gridBagSizer = wx.GridBagSizer(hgap = 5, vgap = 5)
-        gridBagSizer.AddGrowableCol(0)
-        gridBagSizer.AddGrowableCol(1)
         
         self.AddExtendedPosition(panel, gridBagSizer, self.pointDict)
         
@@ -4690,6 +4688,8 @@ class PointDialog(PsmapDialog):
         self.Bind(wx.EVT_RADIOBUTTON, self.OnPositionType, panel.position['toMap'])
         
         
+        gridBagSizer.AddGrowableCol(0)
+        gridBagSizer.AddGrowableCol(1)
         sizer.Add(gridBagSizer, proportion = 1, flag = wx.ALIGN_CENTER_VERTICAL| wx.ALL, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.ALL | wx.EXPAND, border = 5)
         

gui/wxpython/scripts/vkrige.py

@@ -117,7 +117,6 @@ class KrigingPanel(wx.Panel):
         OutputSizer = wx.StaticBoxSizer(wx.StaticBox(self, id = wx.ID_ANY, label = _("Output")), wx.HORIZONTAL)
         
         OutputParameters = wx.GridBagSizer(hgap = 5, vgap = 5)
-        OutputParameters.AddGrowableCol(1)
         OutputParameters.Add(item = wx.StaticText(self, id = wx.ID_ANY, label = _("Name for the output raster map:")),
                              flag = wx.ALIGN_CENTER_VERTICAL,
                              pos = (0, 0))
@@ -144,6 +143,7 @@ class KrigingPanel(wx.Panel):
         OutputParameters.Add(item = self.OverwriteCheckBox,
                              pos = (2, 0), span = (1, 2))
         
+        OutputParameters.AddGrowableCol(1)
         OutputSizer.Add(OutputParameters, proportion = 0, flag = wx.EXPAND | wx.ALL, border = self.border)
         
         #    4. Run Button and Quit Button

gui/wxpython/vdigit/preferences.py

@@ -427,7 +427,6 @@ class VDigitSettingsDialog(wx.Dialog):
                               label = " %s " % _("Geometry attributes"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
         self.geomAttrb = { 'length' : { 'label' : _('length') },
                            'area' : { 'label' : _('area') },
                            'perimeter' : { 'label' : _('perimeter') } }
@@ -506,6 +505,7 @@ class VDigitSettingsDialog(wx.Dialog):
                                            label = note),
                       pos = (3, 0), span = (1, 3))
                       
+        gridSizer.AddGrowableCol(0)
         sizer.Add(item = gridSizer, proportion = 1,
                   flag = wx.ALL | wx.EXPAND, border = 1)
         border.Add(item = sizer, proportion = 0,

gui/wxpython/vnet/dialogs.py

@@ -2123,7 +2123,6 @@ class SettingsDialog(wx.Dialog):
         styleBoxSizer = wx.StaticBoxSizer(styleBox, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer(vgap = 1, hgap = 1)
-        gridSizer.AddGrowableCol(1)
 
         row = 0
         gridSizer.Add(item =  settsLabels["line_color"], flag = wx.ALIGN_CENTER_VERTICAL, pos =(row, 0))
@@ -2145,6 +2144,7 @@ class SettingsDialog(wx.Dialog):
         row += 1
         gridSizer.Add(item = self.settings["invert_colors"], flag=wx.ALIGN_CENTER_VERTICAL, pos=(row, 0))
 
+        gridSizer.AddGrowableCol(1)
         styleBoxSizer.Add(item = gridSizer, flag = wx.EXPAND)
 
         # Point style layout
@@ -2153,7 +2153,6 @@ class SettingsDialog(wx.Dialog):
         ptsStyleBoxSizer = wx.StaticBoxSizer(ptsStyleBox, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer(vgap = 1, hgap = 1)
-        gridSizer.AddGrowableCol(1)
 
         row = 0
         setts = dict(self.colorsSetts.items() + self.sizeSetts.items())
@@ -2167,6 +2166,7 @@ class SettingsDialog(wx.Dialog):
                           pos =(row, 1))  
             row += 1
 
+        gridSizer.AddGrowableCol(1)
         ptsStyleBoxSizer.Add(item = gridSizer, flag = wx.EXPAND)
 
         # Other settings layout
@@ -2175,7 +2175,6 @@ class SettingsDialog(wx.Dialog):
         otherBoxSizer = wx.StaticBoxSizer(otherBox, wx.VERTICAL)
 
         gridSizer = wx.GridBagSizer(vgap = 1, hgap = 1)
-        gridSizer.AddGrowableCol(1)
 
         row = 0 
         for otherSettName in ["snap_tresh", "max_hist_steps"]:
@@ -2185,6 +2184,7 @@ class SettingsDialog(wx.Dialog):
                           pos = (row, 1))
             row += 1
 
+        gridSizer.AddGrowableCol(1)
         otherBoxSizer.Add(item = gridSizer, flag = wx.EXPAND)
 
         btnSizer = wx.BoxSizer(wx.HORIZONTAL)

gui/wxpython/web_services/widgets.py

@@ -274,7 +274,6 @@ class WSPanel(wx.Panel):
 
             boxSizer = wx.StaticBoxSizer(labels['l_order'], wx.VERTICAL)
             gridSizer  =  wx.GridBagSizer (hgap = 3, vgap = 3)
-            gridSizer.AddGrowableCol(0)
 
             gridSizer.Add(self.l_odrder_list, 
                           pos = (0,0), 
@@ -292,6 +291,7 @@ class WSPanel(wx.Panel):
                           flag = wx.ALIGN_CENTER_VERTICAL,
                           border = 0)
         
+            gridSizer.AddGrowableCol(0)
             boxSizer.Add(gridSizer,
                          flag = wx.EXPAND | wx.ALL,
                          border = 5)
@@ -301,7 +301,6 @@ class WSPanel(wx.Panel):
                        border = 5)
 
         gridSizer  =  wx.GridBagSizer (hgap = 3, vgap = 3)
-        gridSizer.AddGrowableCol(0)
 
         row = 0
         for k in ['method', 'maxcols', 'maxrows', 'o', 'bgcolor']:
@@ -332,6 +331,7 @@ class WSPanel(wx.Panel):
                               pos = (row, 1))
             row += 1
 
+        gridSizer.AddGrowableCol(0)
         border.Add(item = gridSizer,
                    flag = wx.LEFT | wx.RIGHT | wx.TOP | wx.EXPAND, 
                    border = 5)

gui/wxpython/wxplot/dialogs.py

@@ -619,7 +619,6 @@ class TextDialog(wx.Dialog):
                            label = " %s " % _("Font settings"))
         boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         gridSizer = wx.GridBagSizer(vgap = 5, hgap = 5)
-        gridSizer.AddGrowableCol(1)
 
         #
         # font family
@@ -664,6 +663,7 @@ class TextDialog(wx.Dialog):
 
         gridSizer.Add(item = self.fwtcb, pos = (2, 1), flag = wx.ALIGN_RIGHT)
                       
+        gridSizer.AddGrowableCol(1)
         boxSizer.Add(item = gridSizer, flag = wx.EXPAND)
         sizer.Add(item = boxSizer, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)