← Back to branch summary

~ubuntu-branches/ubuntu/quantal/monodevelop/quantal

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Mitchell
  • Date: 2011-06-29 06:56:25 UTC
  • mfrom: (1.8.1 upstream) (1.3.11 experimental)
  • Revision ID: james.westby@ubuntu.com-20110629065625-7xx19c4vb95j65pl
Tags: 2.5.92+dfsg-1ubuntu1
* Merge from Debian experimental:
 - Dropped patches & changes to debian/control for Moonlight
   + debian/patches/remove_support_for_moonlight.patch,
   + debian/patches/dont_add_moonlight_to_core_addins.patch,
 - Remaining patches:
   + debian/patches/no_appmenu:

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
56
56
                        IdeApp.Workbench.ActiveDocumentChanged += new EventHandler (OnActiveDocumentChanged);
57
57
                }
58
58
                
 
59
                public override string TabPageLabel {
 
60
                        get {
 
61
                                return content.TabPageLabel;
 
62
                        }
 
63
                }
 
64
                
59
65
                public Gtk.Widget TopBar {
60
66
                        get {
61
67
                                return topBar;
102
108
                        content.Load (fileName);
103
109
                }
104
110
                
 
111
                public override void LoadNew (System.IO.Stream content, string mimeType)
 
112
                {
 
113
                        this.content.LoadNew (content, mimeType);
 
114
                }
 
115
                
105
116
                public override Gtk.Widget Control {
106
117
                        get { return contentBox; }
107
118
                }
153
164
                {
154
165
                }
155
166
                
156
 
                public override object GetContent (Type contentType)
 
167
                public override T GetContent<T> ()
157
168
                {
158
 
                        object ob = base.GetContent (contentType);
159
 
                        if (ob != null)
160
 
                                return ob;
161
 
                        else
162
 
                                return content.GetContent (contentType);
 
169
                        return base.GetContent<T> () ?? content.GetContent<T> ();
163
170
                }
164
171
        }
165
172
}