diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2016-01-15 14:24:01 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2016-01-15 14:24:01 +0300 |
| commit | fd387b94d12cda4244df09e2f85e2606e1c0e2d6 (patch) | |
| tree | bcf2c04d08ce33678c33b2a1a2b443730063ca1e /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage | |
| parent | 4ebeb70f0cdd9e9724080d327e6a8f6168af1e90 (diff) | |
| parent | cea70d807fd207467097b7c10d86a6260a6a6958 (diff) | |
Merge remote-tracking branch 'origin/master' into roslyn-dark-skin
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage')
3 files changed, 6 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs index 7966655f10..5d37b2d7d2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs @@ -29,7 +29,7 @@ using Gtk; namespace MonoDevelop.Ide.WelcomePage { - public class DefaultWelcomePage: WelcomePageWidget + class DefaultWelcomePage: WelcomePageWidget { protected override void BuildContent (Container parent) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/IWelcomePageProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/IWelcomePageProvider.cs index 5ac8884424..541b690441 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/IWelcomePageProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/IWelcomePageProvider.cs @@ -25,13 +25,14 @@ // THE SOFTWARE. using System; using Mono.Addins; +using MonoDevelop.Components; namespace MonoDevelop.Ide.WelcomePage { [TypeExtensionPoint] public interface IWelcomePageProvider { - Gtk.Widget CreateWidget (); + Control CreateWidget (); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageOptionPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageOptionPanel.cs index 26a87546f1..9640eda8d9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageOptionPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageOptionPanel.cs @@ -27,18 +27,19 @@ using Gtk; +using MonoDevelop.Components; using MonoDevelop.Core; using MonoDevelop.Ide.Gui.Dialogs; namespace MonoDevelop.Ide.WelcomePage { - public class WelcomePageOptionPanel : OptionsPanel + class WelcomePageOptionPanel : OptionsPanel { CheckButton showOnStartCheckButton = new CheckButton (); CheckButton internetUpdateCheckButton = new CheckButton (); CheckButton closeOnOpenSlnCheckButton = new CheckButton (); - public override Widget CreatePanelWidget () + public override Control CreatePanelWidget () { VBox vbox = new VBox(); showOnStartCheckButton.Label = GettextCatalog.GetString ("Show welcome page on startup"); |