Changeset 8296

Timestamp:

10/12/11 14:50:42 (6 months ago)

Author:

westram

Message:

• added special class ED4_WinContextFree
  • denies access to global context for derived classes
• declared ED4_window and ED4_cursor as ED4_WinContextFree (the window is their explicit context)
  • replaced invalid references to global context by uses of explicit context (get_device() + window())

Location:

branches/e4fix/EDIT4

Files:

• ED4_cursor.cxx (modified) (1 diff)
• ED4_window.cxx (modified) (3 diffs)
• ed4_class.hxx (modified) (3 diffs)

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -1337 +1337 @@
     }
 
-    target_terminal->scroll_into_view(current_ed4w());
+    target_terminal->scroll_into_view(window());
 
     AW_pos termw_x, termw_y;

branches/e4fix/EDIT4/ED4_window.cxx

@@ -187 +187 @@
     scrolled_rect.link(x_link, y_link, width_link, height_link);
 
-    const AW_screen_area& area_size = current_device()->get_area_size();
+    const AW_screen_area& area_size = get_device()->get_area_size();
 
     AW::Rectangle rect = scrolled_rect.get_world_rect();
@@ -305 +305 @@
     AW_pos topbottom_y = toptop_y + coords.top_area_height - 1;
 
-    current_device()->push_clip_scale();
+    get_device()->push_clip_scale();
 
     // main area
@@ -326 +326 @@
     }
 
-    current_device()->pop_clip_scale();
+    get_device()->pop_clip_scale();
 
     return (ED4_R_OK);

branches/e4fix/EDIT4/ed4_class.hxx

@@ -604 +604 @@
 typedef bool (*ED4_TerminalTest)(ED4_base *terminal, int seqPos);
 
-class ED4_cursor : virtual Noncopyable {
+class ED4_WinContextFree { // denies usage of the following functions in classes derived from this
+    AW_device   *current_device();
+    ED4_window  *current_ed4w();
+    AW_window   *current_aww();
+    ED4_cursor&  current_cursor();
+public:
+    void avoid_warning() {}
+};
+
+class ED4_cursor : virtual Noncopyable, virtual ED4_WinContextFree {
     ED4_window                *win;
     ED4_index                  cursor_abs_x;    // absolute (to terminal) x-position of cursor (absolute world coordinate of edit window)
@@ -672 +681 @@
 };
 
-class ED4_window : public ED4_foldable { // derived from Noncopyable
+class ED4_window : public ED4_foldable, virtual ED4_WinContextFree { // derived from Noncopyable
     ED4_window(const ED4_window&); // copy-constructor not allowed
 public:
@@ -1416 +1425 @@
 };
 
-
+// accessors for current context (see also ED4_WinContextFree)
 inline AW_device *current_device() { return ED4_WinContext::get_current_context().get_device(); }
 inline ED4_window *current_ed4w() { return ED4_WinContext::get_current_context().get_ed4w(); }