bh: thuban/Thuban/UI tableview.py, 1.34, 1.35 projdialog.py, 1.41, 1.42 dbdialog.py, 1.7, 1.8 classifier.py, 1.72, 1.73

[cvs@intevation.de]

Author: bh

Update of /thubanrepository/thuban/Thuban/UI
In directory doto:/tmp/cvs-serv9618/Thuban/UI

Modified Files:
	tableview.py projdialog.py dbdialog.py classifier.py 
Log Message:
More wxPython 2.5 changes.  This time taken from a patch from
Daniel Calvelo Aros.

* Thuban/UI/tableview.py (QueryTableFrame.__init__)
(QueryTableFrame.__init__): Pass the size of a spacer as a single
item.

* Thuban/UI/projdialog.py (ProjFrame.build_dialog)
(ProjFrame.build_dialog): Pass the size of a spacer as a single
item.

* Thuban/UI/dbdialog.py (ChooseDBTableDialog.__init__): Pass the
size of a spacer as a single item.

* Thuban/UI/classifier.py (Classifier.dialog_layout): Pass the
size of a spacer as a single item.


Index: tableview.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/tableview.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- tableview.py	22 Dec 2003 14:54:47 -0000	1.34
+++ tableview.py	8 Feb 2005 20:34:29 -0000	1.35
@@ -408,7 +408,7 @@
         sizer.Add(self.combo_value, 1, wxEXPAND|wxALL, 4)
         sizer.Add(self.choice_action, 0, wxALL, 4)
         sizer.Add(button_query, 0, wxALL | wxALIGN_CENTER_VERTICAL, 4)
-        sizer.Add(40, 20, 0, wxALL, 4)
+        sizer.Add( (40, 20), 0, wxALL, 4)
 
         topBox.Add(sizer, 0, wxEXPAND|wxALL, 4)
         topBox.Add(self.grid, 1, wxEXPAND|wxALL, 0)
@@ -416,7 +416,7 @@
         sizer = wxBoxSizer(wxHORIZONTAL)
         sizer.Add(button_export, 0, wxALL, 4)
         sizer.Add(button_exportSel, 0, wxALL, 4)
-        sizer.Add(60, 20, 1, wxALL|wxEXPAND, 4)
+        sizer.Add( (60, 20), 1, wxALL|wxEXPAND, 4)
         sizer.Add(button_close, 0, wxALL|wxALIGN_RIGHT, 4)
         topBox.Add(sizer, 0, wxALL | wxEXPAND, 4)
 

Index: projdialog.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/projdialog.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- projdialog.py	23 Dec 2004 15:10:41 -0000	1.41
+++ projdialog.py	8 Feb 2005 20:34:29 -0000	1.42
@@ -113,12 +113,12 @@
         self.button_export = wxButton(self, ID_PROJ_EXPORT, _("Export..."))
         EVT_BUTTON(self, ID_PROJ_EXPORT, self._OnExport)
         buttons.Add(self.button_export, 1, wxALL|wxEXPAND, 4)
-        buttons.Add(20, 20, 0, wxEXPAND, 0)
+        buttons.Add( (20, 20), 0, wxEXPAND, 0)
         self.button_remove = wxButton(self, ID_PROJ_REMOVE, _("Remove"))
         EVT_BUTTON(self, ID_PROJ_REMOVE, self._OnRemove)
         buttons.Add(self.button_remove, 1, wxALL|wxEXPAND, 4)
 
-        buttons.Add(20, 20, 0, wxEXPAND, 0)
+        buttons.Add( (20, 20), 0, wxEXPAND, 0)
         label = wxStaticText(self, -1, _("Show EPSG:"))
         buttons.Add(label, 0, wxLEFT|wxRIGHT|wxTOP, 4)
         self.check_epsg = wxCheckBox(self, -1, _("Normal"))
@@ -186,7 +186,7 @@
         self.button_add = wxButton(self, ID_PROJ_ADDTOLIST, _("Add to List"))
         EVT_BUTTON(self, ID_PROJ_ADDTOLIST, self._OnAddToList)
         buttons.Add(self.button_add, 0, wxEXPAND|wxALL, 4)
-        buttons.Add(20, 20, 0, wxEXPAND, 0)
+        buttons.Add( (20, 20), 0, wxEXPAND, 0)
         self.button_save = wxButton(self, ID_PROJ_SAVE,_("Update"))
         EVT_BUTTON(self, ID_PROJ_SAVE, self._OnSave)
         buttons.Add(self.button_save, 0, wxEXPAND|wxALL|wxALIGN_BOTTOM, 4)

Index: dbdialog.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/dbdialog.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dbdialog.py	11 Mar 2004 21:04:30 -0000	1.7
+++ dbdialog.py	8 Feb 2005 20:34:29 -0000	1.8
@@ -70,12 +70,12 @@
         # The button box between the connections list box and the table
         # list box
         buttons = wxFlexGridSizer(3, 1, 0, 0)
-        buttons.Add(20, 80, 0, wxEXPAND, 0)
+        buttons.Add( (20, 80), 0, wxEXPAND, 0)
         retrieve_button = wxButton(self, ID_DBCHOOSE_RETRIEVE, _("Retrieve"))
         EVT_BUTTON(self, ID_DBCHOOSE_RETRIEVE, self.OnRetrieve)
         buttons.Add(retrieve_button, 0, wxALL
                     |wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 4)
-        buttons.Add(20, 80, 0, wxEXPAND, 0)
+        buttons.Add( (20, 80), 0, wxEXPAND, 0)
         main_sizer.Add(buttons, 0, wxEXPAND, 0)
 
         # The list box with the tables

Index: classifier.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/classifier.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- classifier.py	8 Feb 2005 20:25:22 -0000	1.72
+++ classifier.py	8 Feb 2005 20:34:29 -0000	1.73
@@ -790,7 +790,7 @@
             controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
             controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
             controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
-            controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
+            controlButtonBox.Add( (60, 20), 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
             controlButtonBox.Add(button_remove, 0, 
                                  wxGROW|wxALL|wxALIGN_BOTTOM, 4)