Changeset 8239 for branches

Timestamp:

25/11/11 18:30:54 (6 months ago)

Author:

westram

Message:

• short->bool

Location:

branches/e4fix/EDIT4

Files:

• ED4_manager.cxx (modified) (5 diffs)
• ED4_terminal.cxx (modified) (3 diffs)
• ed4_class.hxx (modified) (3 diffs)

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -788 +788 @@
 }
 
-short ED4_manager::calc_bounding_box() {
-    // calculates the smallest rectangle containing the object and
-    // gives information if something has changed
+bool ED4_manager::calc_bounding_box() {
+    // calculates the smallest rectangle containing the object.
+    // returns true if bounding box has changed.
     AW_pos         sum_width  = 0;
     AW_pos         sum_height = 0;
@@ -797 +797 @@
     AW_pos         dummy      = 0;
     ED4_index      i          = 0;
-    short          bb_changed = 0;
+    bool           bb_changed = false;
     ED4_list_elem *current_list_elem;
     ED4_base      *child, *object;
@@ -824 +824 @@
         if (int(extension.size[WIDTH]) != int(max_x)) { // because compares between floats fail sometimes (AW_pos==float)
             extension.size[WIDTH] = max_x;
-            bb_changed = 1;
+            bb_changed = true;
         }
 
         if (int(extension.size[HEIGHT]) != int(sum_height)) {
             extension.size[HEIGHT] = sum_height;
-            bb_changed = 1;
+            bb_changed = true;
         }
     }
@@ -836 +836 @@
         if (int(extension.size[WIDTH]) != int(sum_width)) {
             extension.size[WIDTH] = sum_width;
-            bb_changed = 1;
+            bb_changed = true;
         }
         if (int(extension.size[HEIGHT]) != int(max_y)) {
             extension.size[HEIGHT] = max_y;
-            bb_changed = 1;
+            bb_changed = true;
         }
     }
 
     if (bb_changed) { // tell linked objects about our change of bounding box
-
         current_list_elem = linked_objects.first();
         while (current_list_elem) {
@@ -856 +855 @@
         }
     }
-    return (bb_changed);
+    return bb_changed;
 }
 

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -712 +712 @@
 }
 
-short ED4_terminal::calc_bounding_box()
-{
-    short            bb_changed = 0;
-    ED4_list_elem   *current_list_elem;
-    ED4_base        *object;
+bool ED4_terminal::calc_bounding_box() {
+    // calculates the smallest rectangle containing the object.
+    // requests refresh and returns true if bounding box has changed.
+    
+    bool           bb_changed = false;
+    ED4_list_elem *current_list_elem;
+    ED4_base      *object;
 
     if (width_link) {
         if (extension.size[WIDTH] != width_link->extension.size[WIDTH]) {   // all bounding Boxes have the same size !!!
             extension.size[WIDTH] = width_link->extension.size[WIDTH];
-            bb_changed = 1;
+            bb_changed = true;
         }
     }
@@ -728 +730 @@
         if (extension.size[HEIGHT] != height_link->extension.size[HEIGHT]) {
             extension.size[HEIGHT] = height_link->extension.size[HEIGHT];
-            bb_changed = 1;
+            bb_changed = true;
         }
     }
@@ -749 +751 @@
     }
 
-    return (bb_changed);
+    return bb_changed;
 }
 

branches/e4fix/EDIT4/ed4_class.hxx

@@ -1030 +1030 @@
     virtual ED4_returncode  Show(int refresh_all=0, int is_cleared=0) = 0;
     virtual ED4_returncode  Resize()                                  = 0;
+    virtual bool calc_bounding_box()                                  = 0;
+
     virtual ED4_returncode  clear_background(int color=0);
-    virtual short calc_bounding_box()                                 = 0;
 
     ED4_returncode clear_whole_background();       // clear AW_MIDDLE_AREA
@@ -1216 +1217 @@
     virtual ED4_returncode  Show(int refresh_all=0, int is_cleared=0);
     virtual ED4_returncode  Resize();
-    virtual short       calc_bounding_box();
+    virtual bool calc_bounding_box();
     virtual ED4_returncode  distribute_children();
 
@@ -1317 +1318 @@
     virtual ED4_returncode draw() = 0;
 
-    virtual int   adjust_clipping_rectangle();
-    virtual short calc_bounding_box();
+    virtual int  adjust_clipping_rectangle();
+    virtual bool calc_bounding_box();
     virtual ED4_returncode  calc_size_requested_by_parent();