Changeset 8290 for branches

Timestamp:

09/12/11 11:33:11 (6 months ago)

Author:

westram

Message:

• minor changes

Location:

branches/e4fix/EDIT4

Files:

• ED4_base.cxx (modified) (3 diffs)
• ED4_no_class.cxx (modified) (1 diff)
• ED4_text_terminals.cxx (modified) (1 diff)

branches/e4fix/EDIT4/ED4_base.cxx

@@ -1282 +1282 @@
 
 ED4_returncode ED4_base::clear_background(int color) {
-    if (current_device()) { // @@@ should clear be done for all windows ? 
+    if (current_device()) { // @@@ should clear be done for all windows?
         AW_pos x, y;
         calc_world_coords(&x, &y);
@@ -1304 +1304 @@
 ED4_returncode ED4_base::clear_whole_background() {
     // clear AW_MIDDLE_AREA
-    if (current_device()) {
+    if (current_device()) { // @@@ should clear be done for all windows?
         current_device()->push_clip_scale();
         current_device()->clear(AW_ALL_DEVICES);
@@ -1313 +1313 @@
 }
 
-void ED4_base::draw_bb(int color)
-{
+void ED4_base::draw_bb(int color) {
     if (current_device()) {
         current_device()->push_clip_scale();

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -853 +853 @@
 
 void ED4_refresh_window(AW_window *aww) {
-    GB_transaction      dummy(GLOBAL_gb_main); // @@@ move down ?
-    ED4_LocalWinContext uses(aww); // @@@ move down ?
-
     ED4_main_manager *mainman = ED4_ROOT->main_manager;
-    if (mainman) { // avoids a crash durin startup
+    if (mainman) { // during startup we have no mainman
+        GB_transaction      ta(GLOBAL_gb_main);
+        ED4_LocalWinContext uses(aww);
+
         if (mainman->update_info.delete_requested) {
             mainman->delete_requested_children();

branches/e4fix/EDIT4/ED4_text_terminals.cxx

@@ -271 +271 @@
         if ((iDisplayMode == PV_AA_CODE) || (iDisplayMode == PV_AA_BOX)) {
             AW_pos     width        = ED4_ROOT->font_group.get_width(ED4_G_HELIX);
-            const int  real_left    = index_range.start(); // @@@ inline
+            const int  real_left    = index_range.start();
             const int  real_right   = index_range.end();
             AW_pos     x2           = text_x + width*real_left;