Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/19/10 00:09:19 (14 years ago)
Author:
mkommend
Message:

enhanced viewHost (forwarding of view events, activeView property,...) (ticket #972)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/SingleDocumentMainForm.cs

    r3398 r3403  
    4545    }
    4646
    47     protected override void Show(IView view, bool firstTimeShown) {
    48       if (InvokeRequired) Invoke((Action<IView, bool>)Show, view, firstTimeShown);
     47    protected override void ShowView(IView view, bool firstTimeShown) {
     48      if (InvokeRequired) Invoke((Action<IView, bool>)ShowView, view, firstTimeShown);
    4949      else {
    50         base.Show(view, firstTimeShown);
     50        base.ShowView(view, firstTimeShown);
    5151        if (firstTimeShown)
    5252          this.GetForm(view).Show(this);
     
    6262      else {
    6363        base.Hide(view);
    64         this.GetForm(view).Hide();
     64        Form form = this.GetForm(view);
     65        if (form != null) {
     66          form.Hide();
     67        }
    6568      }
    6669    }
     
    7275        ViewHost viewHost = new ViewHost(contentView);
    7376        form = new DocumentForm(viewHost);
    74       } else
     77        this.AddViewFormCombination(viewHost, form);
     78      } else {
    7579        form = new DocumentForm(view);
     80        this.AddViewFormCombination(view, form);
     81      }
    7682
    7783      form.ShowInTaskbar = true;
Note: See TracChangeset for help on using the changeset viewer.