Imported Upstream version 20090110

[ion3.git] / mod_statusbar / statusbar.c

diff --git a/mod_statusbar/statusbar.c b/mod_statusbar/statusbar.c
index e4adc770a9d6c4707d123754023915e66acb3a2b..06fa6973bc3a889df6f1c2c4ff61e0c62c7cf67c 100644 (file)
--- a/mod_statusbar/statusbar.c
+++ b/mod_statusbar/statusbar.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/statusbar.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -76,8 +76,6 @@ bool statusbar_init(WStatusBar *p, WWindow *parent, const WFitParams *fp)
 
     region_add_bindmap((WRegion*)p, mod_statusbar_statusbar_bindmap);
     
-    ((WRegion*)p)->flags|=REGION_SKIP_FOCUS;
-
     LINK_ITEM(statusbars, p, sb_next, sb_prev);
     
     return TRUE;
@@ -637,7 +635,8 @@ bool statusbar_fitrep(WStatusBar *sb, WWindow *par, const WFitParams *fp)
     bool wchg=(REGION_GEOM(sb).w!=fp->g.w);
     bool hchg=(REGION_GEOM(sb).h!=fp->g.h);
     
-    window_do_fitrep(&(sb->wwin), par, &(fp->g));
+    if(!window_fitrep(&(sb->wwin), par, fp))
+        return FALSE;
     
     if(wchg || hchg){
         statusbar_calculate_xs(sb);