Changeset 8289 for branches

Show
Ignore:
Timestamp:
09/12/11 11:00:22 (6 months ago)
Author:
westram
Message:
  • missing context in ED4_set_iupac (edit IUPAC field)
  • dump backtrace on missing context
Location:
branches/e4fix/EDIT4
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/e4fix/EDIT4/ED4_no_class.cxx

    r8276 r8289  
    764764} 
    765765 
    766 void ED4_set_iupac(AW_window * /* aww */, char *awar_name, bool /* callback_flag */) 
    767 { 
     766void ED4_set_iupac(AW_window *aww, char *awar_name, bool /* callback_flag */) { 
     767    ED4_LocalWinContext uses(aww); 
    768768    ED4_cursor *cursor = &current_cursor(); 
    769769 
    … …  
    786786 
    787787            seq[seq_pos] = new_char; 
    788             cursor->owner_of_cursor->write_sequence(seq, len); 
     788            cursor->owner_of_cursor->to_terminal()->write_sequence(seq, len); 
    789789 
    790790            free(iupac); 

  • branches/e4fix/EDIT4/ED4_root.cxx

    r8286 r8289  
    4646 
    4747ED4_WinContext ED4_WinContext::current_context; 
     48 
     49void ED4_WinContext::warn_missing_context() const { 
     50    e4_assert(0); 
     51    GBK_dump_backtrace(stderr, "Missing context"); 
     52    aw_message("Missing context - please send information from console to devel@arb-home.de"); 
     53} 
    4854 
    4955ED4_returncode ED4_root::refresh_window_simple(int redraw) 

  • branches/e4fix/EDIT4/ED4_terminal.cxx

    r8286 r8289  
    276276} 
    277277 
    278 static ARB_ERROR ed4_remove_species_manager_callbacks(ED4_base *base) { 
     278static ARB_ERROR ed4_remove_species_manager_callbacks(ED4_base *base) { // @@@ unused since [8286] 
    279279    if (base->is_species_manager()) { 
    280280        base->to_species_manager()->remove_all_callbacks(); 

  • branches/e4fix/EDIT4/ed4_class.hxx

    r8288 r8289  
    13961396    } 
    13971397 
     1398    void warn_missing_context() const; 
     1399    void expect_context() const { if (!have_context()) warn_missing_context(); } 
     1400 
    13981401protected: 
    13991402    ED4_WinContext() : ed4w(0), device(0) {} 
    … …  
    14041407    ED4_WinContext(ED4_window *ed4w_) { init(ed4w_); } 
    14051408 
    1406     AW_device *get_device() const { e4_assert(have_context()); return device; } 
    1407     ED4_window *get_ed4w() const { e4_assert(have_context()); return ed4w; } 
     1409    AW_device *get_device() const { expect_context(); return device; } 
     1410    ED4_window *get_ed4w() const { expect_context(); return ed4w; } 
    14081411 
    14091412    static const ED4_WinContext& get_current_context() { return current_context; }