[Greater-commits] r3654 - in branches/3.0.0-all-models/GREAT-ER: . Greater/UI

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 15:44:32 +0200 (Mon, 25 Jul 2011)
New Revision: 3654

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/UI/mainwindow.py
Log:
Merged revisions 333 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r333 | aheinecke | 2011-06-30 15:07:57 +0200 (Thu, 30 Jun 2011) | 4 lines
  
  Allow extra args for the mainwindows update_status_bar
  those extra args will be ignored but this is neccessary to provide
  the same interface as the base implementation update_status_bar in thuban
........



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

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:42:41 UTC (rev 3653)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:44:32 UTC (rev 3654)
@@ -20,6 +20,9 @@
 	* Greater/Dialogs/showpicture.py: 
 		- Use wxSize to correctly add the spacer between the buttons
 		  using ints caused an assertion in wxwidgets
+	* Greater/UI/mainwindow.py:
+		- Allow extra args for the mainwindow update_status_bar
+		  function to provide the same interface as thubans update_status_bar.
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py	2011-07-25 13:42:41 UTC (rev 3653)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py	2011-07-25 13:44:32 UTC (rev 3654)
@@ -207,7 +207,7 @@
             title = "GREAT-ER"
         self.SetTitle(title)
 
-    def update_status_bar(self):
+    def update_status_bar(self, *args):
         """Update the status bar with the status of the session. 
 
         Set the two rightmost fields of the status bar to the database