[Greater-commits] r3653 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Dialogs

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 15:42:41 +0200 (Mon, 25 Jul 2011)
New Revision: 3653

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/showpicture.py
Log:
Merged revisions 327 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r327 | aheinecke | 2011-06-30 12:53:10 +0200 (Thu, 30 Jun 2011) | 3 lines
  
  Use wxSize to correctly add the spacer between the buttons,
  using ints caused an assertion in wxwidgets
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:38:30 UTC (rev 3652)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:42:41 UTC (rev 3653)
@@ -17,6 +17,9 @@
 	* Greater/Dialogs/editsubstance.py: Add encoding line
 	* Greater/Dialogs/editenvironment.py: Add encoding line
 	* Greater/Dialogs/openparablock.py: Add encoding line
+	* Greater/Dialogs/showpicture.py: 
+		- Use wxSize to correctly add the spacer between the buttons
+		  using ints caused an assertion in wxwidgets
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/showpicture.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/showpicture.py	2011-07-25 13:38:30 UTC (rev 3652)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/showpicture.py	2011-07-25 13:42:41 UTC (rev 3653)
@@ -84,7 +84,7 @@
         button.SetDefault()
         button.SetFocus()
         bs.Add(button, 0, wxLEFT | wxRIGHT)
-        bs.Add(60, 20, 0, wxLEFT | wxRIGHT)
+        bs.Add(wxSize(60, 20), 0, wxLEFT | wxRIGHT)
         button = wxButton(self, ID_SAVEAS, "Save As...")
         bs.Add(button, 0, wxLEFT | wxRIGHT)