diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2015-11-18 17:38:43 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2015-11-25 18:44:59 +0300 |
| commit | d6cc04b01e811783cfa64d7893f239d5f9840599 (patch) | |
| tree | 7faf679bb7223d73943b3e215f9c6d412b22639b /main/src/addins/MonoDevelop.GtkCore | |
| parent | 74881948086cfe253d389d074d44d12f9149fc60 (diff) | |
ViewContent now creates Controls instead of GTK widgets
Diffstat (limited to 'main/src/addins/MonoDevelop.GtkCore')
| -rw-r--r-- | main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index ad1b5a8310..65dc06e292 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -272,7 +272,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.OnGetContent (type); } +<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1 public override Control Control { +======= + public override Components.Control Control { +>>>>>>> ViewContent now creates Controls instead of GTK widgets get { return content; } |