From b509cf7549403bd22ba841d8ad917f14d6b5fad8 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Sun, 19 Jun 2016 00:06:27 +0100 Subject: [PATCH 1/5] Allow building on case-sensitive file systems. rename file case to match project file listing --- .../System.Windows.Forms/{Control.Cocoa.cs => Control.cocoa.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MonoMac.Windows.Forms/System.Windows.Forms/{Control.Cocoa.cs => Control.cocoa.cs} (100%) diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Control.Cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Control.cocoa.cs similarity index 100% rename from MonoMac.Windows.Forms/System.Windows.Forms/Control.Cocoa.cs rename to MonoMac.Windows.Forms/System.Windows.Forms/Control.cocoa.cs From 746f92486d559929cf8a7efeed8e3b1c7b84d430 Mon Sep 17 00:00:00 2001 From: sbaer Date: Mon, 17 Dec 2012 15:49:42 -0800 Subject: [PATCH 2/5] Minor tweaks to fix build --- MonoMac.Windows.Forms/System.Windows.Forms/Cursor.cs | 6 +++--- .../System.Windows.Forms/ToolStripItem.cocoa.cs | 3 ++- MonoMac.Windows.Forms/System.Windows.Forms/ToolTip.cs | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Cursor.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Cursor.cs index d7b276d..4ee04f5 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Cursor.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Cursor.cs @@ -169,10 +169,10 @@ public Cursor (string fileName) #region Public Static Properties public static Rectangle Clip { get { - IntPtr handle; + IntPtr handle=IntPtr.Zero; bool confined; - Rectangle rect; - Size size; + Rectangle rect = Rectangle.Empty; + Size size = Size.Empty; //XplatUI.GrabInfo (out handle, out confined, out rect); if (handle != IntPtr.Zero) { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs index afc07ff..bf2536d 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs @@ -184,7 +184,8 @@ internal virtual Size CalculatePreferredSize (Size constrainingSize) internal void CalculateTextAndImageRectangles (Rectangle contentRectangle, out Rectangle text_rect, out Rectangle image_rect) { - + text_rect = System.Drawing.Rectangle.Empty; + image_rect = text_rect; } diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ToolTip.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ToolTip.cs index 3baa7d1..6f2de65 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ToolTip.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ToolTip.cs @@ -217,7 +217,9 @@ public void Present (Control control, string text) return; Size display_size; + //XplatUI.GetDisplaySize (out display_size); + display_size = new System.Drawing.Size(200,40); associated_control = control; From 5161a042190417c853e0f3229ddfce8c2c8e15cc Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Sun, 19 Jun 2016 23:40:19 +0100 Subject: [PATCH 3/5] Monodevelop does not like the xmlns="" declaration in the project files. Remove them. find * -type f -name "*.csproj" -exec grep -l 'xmlns=""' {} \; | xargs perl -pi -e s'( xmlns="")()' --- BasicMenu/BasicMenu.csproj | 4 ++-- ListboxSample/ListboxSample.csproj | 2 +- MouseEvent/MouseEvent.csproj | 2 +- PhysicalDrag/PhysicalDrag.csproj | 2 +- PictureBox/PictureBox.csproj | 2 +- Python/Python.csproj | 2 +- RhinoTester/RhinoTester.csproj | 2 +- SwfMainMenu/SwfMainMenu.csproj | 4 ++-- TabcontrolSample/TabcontrolSample.csproj | 2 +- TestLoad/TestLoad.csproj | 2 +- TextboxSample/TextboxSample.csproj | 2 +- WinformsTest/WinformsTest.csproj | 2 +- checkbox/checkbox.csproj | 2 +- toolstrip20/toolstrip20.csproj | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/BasicMenu/BasicMenu.csproj b/BasicMenu/BasicMenu.csproj index 0f10cdf..c5b709b 100644 --- a/BasicMenu/BasicMenu.csproj +++ b/BasicMenu/BasicMenu.csproj @@ -57,8 +57,8 @@ - - + + diff --git a/ListboxSample/ListboxSample.csproj b/ListboxSample/ListboxSample.csproj index eff2621..6fdd926 100644 --- a/ListboxSample/ListboxSample.csproj +++ b/ListboxSample/ListboxSample.csproj @@ -50,7 +50,7 @@ - + diff --git a/MouseEvent/MouseEvent.csproj b/MouseEvent/MouseEvent.csproj index 4bf6e0a..e7ced20 100644 --- a/MouseEvent/MouseEvent.csproj +++ b/MouseEvent/MouseEvent.csproj @@ -50,7 +50,7 @@ - + diff --git a/PhysicalDrag/PhysicalDrag.csproj b/PhysicalDrag/PhysicalDrag.csproj index 07e18af..5c953d4 100644 --- a/PhysicalDrag/PhysicalDrag.csproj +++ b/PhysicalDrag/PhysicalDrag.csproj @@ -55,7 +55,7 @@ - + diff --git a/PictureBox/PictureBox.csproj b/PictureBox/PictureBox.csproj index b832bf6..56ce2f8 100644 --- a/PictureBox/PictureBox.csproj +++ b/PictureBox/PictureBox.csproj @@ -49,7 +49,7 @@ - + diff --git a/Python/Python.csproj b/Python/Python.csproj index 2e3ca10..98463df 100644 --- a/Python/Python.csproj +++ b/Python/Python.csproj @@ -168,7 +168,7 @@ - + diff --git a/RhinoTester/RhinoTester.csproj b/RhinoTester/RhinoTester.csproj index 596d355..350038c 100644 --- a/RhinoTester/RhinoTester.csproj +++ b/RhinoTester/RhinoTester.csproj @@ -65,7 +65,7 @@ - + diff --git a/SwfMainMenu/SwfMainMenu.csproj b/SwfMainMenu/SwfMainMenu.csproj index c8c3de4..d336655 100644 --- a/SwfMainMenu/SwfMainMenu.csproj +++ b/SwfMainMenu/SwfMainMenu.csproj @@ -57,8 +57,8 @@ - - + + diff --git a/TabcontrolSample/TabcontrolSample.csproj b/TabcontrolSample/TabcontrolSample.csproj index d6c7e3e..2b277fc 100644 --- a/TabcontrolSample/TabcontrolSample.csproj +++ b/TabcontrolSample/TabcontrolSample.csproj @@ -50,7 +50,7 @@ - + diff --git a/TestLoad/TestLoad.csproj b/TestLoad/TestLoad.csproj index e3f4d9c..e9f6bfd 100644 --- a/TestLoad/TestLoad.csproj +++ b/TestLoad/TestLoad.csproj @@ -60,6 +60,6 @@ - + \ No newline at end of file diff --git a/TextboxSample/TextboxSample.csproj b/TextboxSample/TextboxSample.csproj index 948a4b7..60b3033 100644 --- a/TextboxSample/TextboxSample.csproj +++ b/TextboxSample/TextboxSample.csproj @@ -51,7 +51,7 @@ - + diff --git a/WinformsTest/WinformsTest.csproj b/WinformsTest/WinformsTest.csproj index 51265b6..0526317 100644 --- a/WinformsTest/WinformsTest.csproj +++ b/WinformsTest/WinformsTest.csproj @@ -64,7 +64,7 @@ - + diff --git a/checkbox/checkbox.csproj b/checkbox/checkbox.csproj index 9c43f90..f26d2b7 100644 --- a/checkbox/checkbox.csproj +++ b/checkbox/checkbox.csproj @@ -48,7 +48,7 @@ - + diff --git a/toolstrip20/toolstrip20.csproj b/toolstrip20/toolstrip20.csproj index 07919ef..f0aa01b 100644 --- a/toolstrip20/toolstrip20.csproj +++ b/toolstrip20/toolstrip20.csproj @@ -70,6 +70,6 @@ - + \ No newline at end of file From bd14fe7f5dac0b7c0d33b98ddd7c92f19217f037 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Mon, 20 Jun 2016 00:55:21 +0100 Subject: [PATCH 4/5] Change reference to Xamarin.Mac.dll correct reference path change to Xamarin.Mac.dll --- MonoMac.Windows.Forms/System.Windows.Forms.csproj | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MonoMac.Windows.Forms/System.Windows.Forms.csproj b/MonoMac.Windows.Forms/System.Windows.Forms.csproj index 2aa5367..f10dd4a 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms.csproj +++ b/MonoMac.Windows.Forms/System.Windows.Forms.csproj @@ -49,9 +49,8 @@ - - False - monodevelop-core-mac-addins + + ..\References\Xamarin.Mac.dll @@ -462,4 +461,4 @@ - \ No newline at end of file + From 85ea88920337b3d8ab6322799828d2d2881c5c65 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Mon, 20 Jun 2016 02:18:51 +0100 Subject: [PATCH 5/5] Use Xamarin.Mac's unified API grep -R -l 'MonoMac.Foundation' MonoMac.Windows.Forms | xargs perl -pi -e 's(MonoMac.Foundation)(Foundation)g' grep -l -R 'using MonoMac' MonoMac.Windows.Forms | xargs perl -pi -e 's(using MonoMac.)(using )' --- MonoMac.Windows.Forms/CocoaHelpers/ComboBoxHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/ContextMenuHelper.cs | 4 ++-- MonoMac.Windows.Forms/CocoaHelpers/FileDialogHelper.cs | 4 ++-- MonoMac.Windows.Forms/CocoaHelpers/FlippedView.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/FolderDialogHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/GroupBoxHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/MenuItemHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/TabViewHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/TabViewItemHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/TableViewHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs | 4 ++-- MonoMac.Windows.Forms/CocoaHelpers/ToolBarHelper.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinner.cs | 2 +- MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinnerHelper.cs | 6 +++--- MonoMac.Windows.Forms/CocoaHelpers/ViewHelper.cs | 2 +- MonoMac.Windows.Forms/EventArgs/KeyEventArgs.cs | 2 +- MonoMac.Windows.Forms/Extenders/ColorExtenders.cs | 2 +- MonoMac.Windows.Forms/Extenders/FontExtender.cs | 2 +- MonoMac.Windows.Forms/Extenders/ImageExtenders.cs | 2 +- MonoMac.Windows.Forms/Extenders/MiscExtenders.cs | 2 +- MonoMac.Windows.Forms/Extenders/NSIndexSetExtender.cs | 2 +- MonoMac.Windows.Forms/Extenders/NSViewExtender.cs | 2 +- MonoMac.Windows.Forms/Interfaces/IViewHelper.cs | 2 +- MonoMac.Windows.Forms/MainWindow.xib.designer.cs | 4 ++-- MonoMac.Windows.Forms/System.Windows.Forms/Application.cs | 6 +++--- .../System.Windows.Forms/ApplicationContext.cs | 8 ++++---- .../System.Windows.Forms/Button.cocoa.cs | 6 +++--- .../System.Windows.Forms/ButtonBase.cocoa.cs | 2 +- .../System.Windows.Forms/CheckBox.cocoa.cs | 2 +- .../System.Windows.Forms/CheckedListBox.cocoa.cs | 2 +- .../System.Windows.Forms/ComboBox.cocoa.cs | 4 ++-- .../System.Windows.Forms/ContainerControl.cocoa.cs | 4 ++-- .../System.Windows.Forms/ContextMenu.cocoa.cs | 2 +- .../System.Windows.Forms/Control.cocoa.cs | 2 +- .../System.Windows.Forms/ControlCollection.cs | 2 +- .../System.Windows.Forms/DataGridViewButtonCell.cs | 4 ++-- .../System.Windows.Forms/DataGridViewButtonColumn.cs | 4 ++-- .../System.Windows.Forms/DataGridViewCheckBoxCell.cs | 2 +- .../System.Windows.Forms/DataGridViewCheckBoxColumn.cs | 4 ++-- .../System.Windows.Forms/FolderBrowserDialog.cocoa.cs | 2 +- MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs | 6 +++--- .../System.Windows.Forms/GroupBox.cocoa.cs | 2 +- MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs | 2 +- .../System.Windows.Forms/ListBox.cocoa.cs | 4 ++-- MonoMac.Windows.Forms/System.Windows.Forms/Menu.cocoa.cs | 2 +- .../System.Windows.Forms/MenuItem.cocoa.cs | 2 +- .../System.Windows.Forms/MessageBox.cocoa.cs | 2 +- MonoMac.Windows.Forms/System.Windows.Forms/Panel.cocoa.cs | 4 ++-- .../System.Windows.Forms/PictureBox.cocoa.cs | 2 +- .../System.Windows.Forms/ScrollBar.cocoa.cs | 2 +- .../System.Windows.Forms/ScrollableControl.cocoa.cs | 2 +- .../System.Windows.Forms/TabControl.cocoa.cs | 2 +- .../System.Windows.Forms/TabPage.cocoa.cs | 2 +- .../System.Windows.Forms/TextBox.cocoa.cs | 6 +++--- .../System.Windows.Forms/TextBoxBase.cocoa.cs | 4 ++-- MonoMac.Windows.Forms/System.Windows.Forms/Timer.cocoa.cs | 4 ++-- .../System.Windows.Forms/ToolStrip.cocoa.cs | 2 +- .../System.Windows.Forms/ToolStripButton.cocoa.cs | 2 +- .../System.Windows.Forms/ToolStripItem.cocoa.cs | 2 +- .../System.Windows.Forms/TrackBar.cocoa.cs | 2 +- .../System.Windows.Forms/UserControl.cocoa.cs | 4 ++-- MonoMac.Windows.Forms/Templates/DataGridColumn.tt | 4 ++-- MonoMac.Windows.Forms/Templates/DrawingTemplate.g.cs | 4 ++-- MonoMac.Windows.Forms/Templates/DrawingTemplate.tt | 4 ++-- .../Templates/KeyPressEventsTemplate.g.cs | 4 ++-- MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.tt | 4 ++-- MonoMac.Windows.Forms/Templates/MouseTemplate.g.cs | 4 ++-- MonoMac.Windows.Forms/Templates/MouseTemplate.tt | 4 ++-- MonoMac.Windows.Forms/Utils/KeyUtil.cs | 2 +- MonoMac.Windows.Forms/Utils/Util.cs | 6 +++--- 70 files changed, 106 insertions(+), 106 deletions(-) diff --git a/MonoMac.Windows.Forms/CocoaHelpers/ComboBoxHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/ComboBoxHelper.cs index 0140e5d..6b90be7 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/ComboBoxHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/ComboBoxHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/CocoaHelpers/ContextMenuHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/ContextMenuHelper.cs index e15a5af..3758cd9 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/ContextMenuHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/ContextMenuHelper.cs @@ -12,8 +12,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; -using MonoMac.ObjCRuntime; +using AppKit; +using ObjCRuntime; namespace System.Windows.Forms { internal class ContextMenuHelper : NSMenu diff --git a/MonoMac.Windows.Forms/CocoaHelpers/FileDialogHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/FileDialogHelper.cs index ac7198a..03125d0 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/FileDialogHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/FileDialogHelper.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. using System; -using MonoMac.AppKit; +using AppKit; using System.Threading; namespace System.Windows.Forms { @@ -27,7 +27,7 @@ public FileDialogHelper (CommonDialog host) this.CanChooseFiles = true; this.CanChooseDirectories = false; } - public override void Cancel (MonoMac.Foundation.NSObject sender) + public override void Cancel (Foundation.NSObject sender) { if(CancelEvent != null) CancelEvent(this,null); diff --git a/MonoMac.Windows.Forms/CocoaHelpers/FlippedView.cs b/MonoMac.Windows.Forms/CocoaHelpers/FlippedView.cs index b5e4592..28fd707 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/FlippedView.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/FlippedView.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/CocoaHelpers/FolderDialogHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/FolderDialogHelper.cs index 23cc269..e29cd5e 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/FolderDialogHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/FolderDialogHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { internal class FolderDialogHelper : FileDialogHelper diff --git a/MonoMac.Windows.Forms/CocoaHelpers/GroupBoxHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/GroupBoxHelper.cs index a3b93d5..0d3f964 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/GroupBoxHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/GroupBoxHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/CocoaHelpers/MenuItemHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/MenuItemHelper.cs index 386cd4f..1be9a11 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/MenuItemHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/MenuItemHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public class MenuItemHelper : NSMenuItem diff --git a/MonoMac.Windows.Forms/CocoaHelpers/TabViewHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/TabViewHelper.cs index c6c9e68..02b87a7 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/TabViewHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/TabViewHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { internal class TabViewHelper : NSTabView , IViewHelper diff --git a/MonoMac.Windows.Forms/CocoaHelpers/TabViewItemHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/TabViewItemHelper.cs index d3b879d..9c67570 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/TabViewItemHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/TabViewItemHelper.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Windows.Forms; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/CocoaHelpers/TableViewHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/TableViewHelper.cs index 1ae141d..4498e6f 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/TableViewHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/TableViewHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs index ba6cdbd..d41c481 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs @@ -12,8 +12,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/CocoaHelpers/ToolBarHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/ToolBarHelper.cs index c11afb4..2295384 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/ToolBarHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/ToolBarHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Linq; using System.Collections.Generic; using System.Collections; diff --git a/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinner.cs b/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinner.cs index 5405fba..c5f4b10 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinner.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinner.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { internal sealed class UpDownSpinner : Control diff --git a/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinnerHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinnerHelper.cs index d61530f..8d4d327 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinnerHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinnerHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { internal class UpDownSpinnerHelper: NSStepper, IViewHelper @@ -20,7 +20,7 @@ internal class UpDownSpinnerHelper: NSStepper, IViewHelper public UpDownSpinnerHelper () { } - public override void DidChange (MonoMac.Foundation.NSKeyValueChange changeKind, MonoMac.Foundation.NSIndexSet indexes, MonoMac.Foundation.NSString forKey) + public override void DidChange (Foundation.NSKeyValueChange changeKind, Foundation.NSIndexSet indexes, Foundation.NSString forKey) { base.DidChange (changeKind, indexes, forKey); } @@ -28,7 +28,7 @@ public override void DidChangeValue (string forKey) { base.DidChangeValue (forKey); } - public override void DidChange (MonoMac.Foundation.NSString forKey, MonoMac.Foundation.NSKeyValueSetMutationKind mutationKind, MonoMac.Foundation.NSSet objects) + public override void DidChange (Foundation.NSString forKey, Foundation.NSKeyValueSetMutationKind mutationKind, Foundation.NSSet objects) { base.DidChange (forKey, mutationKind, objects); } diff --git a/MonoMac.Windows.Forms/CocoaHelpers/ViewHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/ViewHelper.cs index 1936dbf..c6d5cdf 100644 --- a/MonoMac.Windows.Forms/CocoaHelpers/ViewHelper.cs +++ b/MonoMac.Windows.Forms/CocoaHelpers/ViewHelper.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/EventArgs/KeyEventArgs.cs b/MonoMac.Windows.Forms/EventArgs/KeyEventArgs.cs index 9bdf191..547c5b4 100644 --- a/MonoMac.Windows.Forms/EventArgs/KeyEventArgs.cs +++ b/MonoMac.Windows.Forms/EventArgs/KeyEventArgs.cs @@ -1,4 +1,4 @@ -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { using System; diff --git a/MonoMac.Windows.Forms/Extenders/ColorExtenders.cs b/MonoMac.Windows.Forms/Extenders/ColorExtenders.cs index 925ccdc..d6de6dd 100644 --- a/MonoMac.Windows.Forms/Extenders/ColorExtenders.cs +++ b/MonoMac.Windows.Forms/Extenders/ColorExtenders.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public static class ColorExtenders diff --git a/MonoMac.Windows.Forms/Extenders/FontExtender.cs b/MonoMac.Windows.Forms/Extenders/FontExtender.cs index f19b564..6161473 100644 --- a/MonoMac.Windows.Forms/Extenders/FontExtender.cs +++ b/MonoMac.Windows.Forms/Extenders/FontExtender.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public static class FontExtender diff --git a/MonoMac.Windows.Forms/Extenders/ImageExtenders.cs b/MonoMac.Windows.Forms/Extenders/ImageExtenders.cs index 2216eb2..7113503 100644 --- a/MonoMac.Windows.Forms/Extenders/ImageExtenders.cs +++ b/MonoMac.Windows.Forms/Extenders/ImageExtenders.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; using System.Drawing.Imaging; diff --git a/MonoMac.Windows.Forms/Extenders/MiscExtenders.cs b/MonoMac.Windows.Forms/Extenders/MiscExtenders.cs index 447a3d2..91122e8 100644 --- a/MonoMac.Windows.Forms/Extenders/MiscExtenders.cs +++ b/MonoMac.Windows.Forms/Extenders/MiscExtenders.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public static class MiscExtenders diff --git a/MonoMac.Windows.Forms/Extenders/NSIndexSetExtender.cs b/MonoMac.Windows.Forms/Extenders/NSIndexSetExtender.cs index 99e21df..e72b8dc 100644 --- a/MonoMac.Windows.Forms/Extenders/NSIndexSetExtender.cs +++ b/MonoMac.Windows.Forms/Extenders/NSIndexSetExtender.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.Foundation; +using Foundation; using System.Collections.Generic; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/Extenders/NSViewExtender.cs b/MonoMac.Windows.Forms/Extenders/NSViewExtender.cs index 794a988..fbadc66 100644 --- a/MonoMac.Windows.Forms/Extenders/NSViewExtender.cs +++ b/MonoMac.Windows.Forms/Extenders/NSViewExtender.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Linq; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/Interfaces/IViewHelper.cs b/MonoMac.Windows.Forms/Interfaces/IViewHelper.cs index 2dcad65..124446a 100644 --- a/MonoMac.Windows.Forms/Interfaces/IViewHelper.cs +++ b/MonoMac.Windows.Forms/Interfaces/IViewHelper.cs @@ -1,5 +1,5 @@ using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public interface IViewHelper diff --git a/MonoMac.Windows.Forms/MainWindow.xib.designer.cs b/MonoMac.Windows.Forms/MainWindow.xib.designer.cs index 2b6475d..0e109b6 100644 --- a/MonoMac.Windows.Forms/MainWindow.xib.designer.cs +++ b/MonoMac.Windows.Forms/MainWindow.xib.designer.cs @@ -12,12 +12,12 @@ namespace MonomacTestConversion { // Should subclass MonoMac.AppKit.NSWindow - [MonoMac.Foundation.Register("MainWindow")] + [Foundation.Register("MainWindow")] public partial class MainWindow { } // Should subclass MonoMac.AppKit.NSWindowController - [MonoMac.Foundation.Register("MainWindowController")] + [Foundation.Register("MainWindowController")] public partial class MainWindowController { } } diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Application.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Application.cs index b358ea9..4cdfa98 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Application.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Application.cs @@ -1,11 +1,11 @@ using System; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; using System.IO; namespace System.Windows.Forms { - [MonoMac.Foundation.Register("Form")] + [Foundation.Register("Form")] public partial class Application : NSApplication { static ApplicationContext context; diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ApplicationContext.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ApplicationContext.cs index c98546e..98db798 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ApplicationContext.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ApplicationContext.cs @@ -1,10 +1,10 @@ using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { - [MonoMac.Foundation.Register("AppDelegate")] + [Foundation.Register("AppDelegate")] public class ApplicationContext : NSApplicationDelegate { Form main_form; @@ -18,7 +18,7 @@ public ApplicationContext (Func
mainForm) : base() mainFormFunc = mainForm; } - public override void FinishedLaunching (MonoMac.Foundation.NSObject notification) + public override void FinishedLaunching (Foundation.NSObject notification) { if (mainFormFunc != null) main_form = mainFormFunc (); @@ -59,7 +59,7 @@ protected virtual void Dispose (bool disposing) { MainForm = null; } - public override void WillTerminate (MonoMac.Foundation.NSNotification notification) + public override void WillTerminate (Foundation.NSNotification notification) { OnMainFormClosed (notification.Object, new EventArgs ()); //base.WillTerminate (notification); diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Button.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Button.cocoa.cs index 83fd882..ef702fb 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Button.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Button.cocoa.cs @@ -1,7 +1,7 @@ using System; -using MonoMac.AppKit; -using MonoMac.ObjCRuntime; -using MonoMac.Foundation; +using AppKit; +using ObjCRuntime; +using Foundation; using System.Drawing; using System.Collections.Generic; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ButtonBase.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ButtonBase.cocoa.cs index fc7acce..16cf5e0 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ButtonBase.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ButtonBase.cocoa.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Drawing.Text; using System.Runtime.InteropServices; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public abstract partial class ButtonBase diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/CheckBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/CheckBox.cocoa.cs index c0499af..f2ecd2f 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/CheckBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/CheckBox.cocoa.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Drawing; using System.Runtime.InteropServices; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public partial class CheckBox diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/CheckedListBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/CheckedListBox.cocoa.cs index 9351cda..bdb1a52 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/CheckedListBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/CheckedListBox.cocoa.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { //TODO: Create diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs index 9d3e82b..0745861 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs @@ -20,8 +20,8 @@ using System.Globalization; using System.Reflection; using System.Runtime.InteropServices; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; using System.Linq; using System.Collections.Generic; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ContainerControl.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ContainerControl.cocoa.cs index f59de79..5833ce1 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ContainerControl.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ContainerControl.cocoa.cs @@ -12,8 +12,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; using System.Collections; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ContextMenu.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ContextMenu.cocoa.cs index 624b81d..79e686d 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ContextMenu.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ContextMenu.cocoa.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Control.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Control.cocoa.cs index dd20590..a5f55fb 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Control.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Control.cocoa.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; using System.Security; using System.Threading; -using MonoMac.AppKit; +using AppKit; using System.Linq; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ControlCollection.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ControlCollection.cs index c997865..08e3c40 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ControlCollection.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ControlCollection.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public class ControlCollection diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonCell.cs b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonCell.cs index be32f46..589b415 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonCell.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonCell.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { public class DataGridViewButtonCell : NSButtonCell diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs index a0ad595..5144e09 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewButtonColumn.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxCell.cs b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxCell.cs index 8199e15..c60be9f 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxCell.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxCell.cs @@ -1,5 +1,5 @@ using System; -using MonoMac.AppKit; +using AppKit; using System.Runtime.InteropServices; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs index f495817..17fe86d 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/DataGridViewCheckBoxColumn.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cocoa.cs index 5d7eed2..899f68d 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cocoa.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { public partial class FolderBrowserDialog : CommonDialog diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs index 498a697..ad48700 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs @@ -6,13 +6,13 @@ using System.Collections; using System.Runtime.InteropServices; using System.Threading; -using MonoMac.AppKit; +using AppKit; using System.Linq; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { - [MonoMac.Foundation.Register("FormHelper")] + [Foundation.Register("FormHelper")] class FormHelper : NSWindow { Form m_parent; diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/GroupBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/GroupBox.cocoa.cs index d396252..5c2b6ca 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/GroupBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/GroupBox.cocoa.cs @@ -1,6 +1,6 @@ using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; using System.ComponentModel; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs index cf6e28b..6661f23 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.ComponentModel; using System.ComponentModel.Design; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public partial class Label diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ListBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ListBox.cocoa.cs index ebbd062..6488f1f 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ListBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ListBox.cocoa.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; using System.Collections; using System.Reflection; using System.Collections.Generic; diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Menu.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Menu.cocoa.cs index 0a5e7ad..fbeeefe 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Menu.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Menu.cocoa.cs @@ -1,5 +1,5 @@ using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public abstract partial class Menu diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/MenuItem.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/MenuItem.cocoa.cs index e688d48..7fbb90d 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/MenuItem.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/MenuItem.cocoa.cs @@ -1,5 +1,5 @@ using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public partial class MenuItem diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/MessageBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/MessageBox.cocoa.cs index 7521f12..38aaadc 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/MessageBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/MessageBox.cocoa.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Panel.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Panel.cocoa.cs index 25cc3b0..e40ceb6 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Panel.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Panel.cocoa.cs @@ -1,7 +1,7 @@ using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { public partial class Panel : ScrollableControl // : PanelMouseView diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/PictureBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/PictureBox.cocoa.cs index b7438ea..9979b7a 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/PictureBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/PictureBox.cocoa.cs @@ -1,6 +1,6 @@ using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public partial class PictureBox :Control diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ScrollBar.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ScrollBar.cocoa.cs index 945aaa9..979a929 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ScrollBar.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ScrollBar.cocoa.cs @@ -17,7 +17,7 @@ using System.Drawing.Drawing2D; using System.ComponentModel; using System.Runtime.InteropServices; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public partial class ScrollBar : Control diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ScrollableControl.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ScrollableControl.cocoa.cs index 7d86921..bc1f86b 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ScrollableControl.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ScrollableControl.cocoa.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Drawing; -using MonoMac.AppKit; +using AppKit; using System.ComponentModel; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/TabControl.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/TabControl.cocoa.cs index 4346aee..fe9bc50 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/TabControl.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/TabControl.cocoa.cs @@ -1,7 +1,7 @@ using System; using System.Drawing; using System.ComponentModel; -using MonoMac.AppKit; +using AppKit; using System.Runtime.InteropServices; using System.Collections; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/TabPage.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/TabPage.cocoa.cs index c76cdad..5f42ce2 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/TabPage.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/TabPage.cocoa.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/TextBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/TextBox.cocoa.cs index d2ecdd2..e649360 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/TextBox.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/TextBox.cocoa.cs @@ -12,12 +12,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { - [MonoMac.Foundation.Register("TextBox")] + [Foundation.Register("TextBox")] public partial class TextBox : TextBoxBase // : TextBoxMouseView, IControl //NSTextField { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/TextBoxBase.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/TextBoxBase.cocoa.cs index 41fc940..a265d63 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/TextBoxBase.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/TextBoxBase.cocoa.cs @@ -18,8 +18,8 @@ using System.Text; using System.Runtime.InteropServices; using System.Collections; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; using System.ComponentModel; namespace System.Windows.Forms diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Timer.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Timer.cocoa.cs index 069554d..366fecc 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/Timer.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/Timer.cocoa.cs @@ -1,8 +1,8 @@ using System; using System.Threading; using System.ComponentModel; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; namespace System.Windows.Forms { public partial class Timer diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStrip.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStrip.cocoa.cs index 185a683..51d886d 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStrip.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStrip.cocoa.cs @@ -14,7 +14,7 @@ // limitations under the License.using System; using System.Drawing; using System.ComponentModel; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripButton.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripButton.cocoa.cs index 1f55d19..366e8c3 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripButton.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripButton.cocoa.cs @@ -1,5 +1,5 @@ using System; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { public partial class ToolStripButton diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs index bf2536d..f7b0837 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/ToolStripItem.cocoa.cs @@ -14,7 +14,7 @@ // limitations under the License.using System; using System.Drawing; using System.ComponentModel; -using MonoMac.AppKit; +using AppKit; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/TrackBar.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/TrackBar.cocoa.cs index e107f29..60c0e05 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/TrackBar.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/TrackBar.cocoa.cs @@ -12,7 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License.using System; -using MonoMac.AppKit; +using AppKit; using System.Drawing; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/UserControl.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/UserControl.cocoa.cs index de55403..603220f 100644 --- a/MonoMac.Windows.Forms/System.Windows.Forms/UserControl.cocoa.cs +++ b/MonoMac.Windows.Forms/System.Windows.Forms/UserControl.cocoa.cs @@ -14,9 +14,9 @@ // limitations under the License.using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { internal partial class InternalUserControl : UserControlMouseView , IControl diff --git a/MonoMac.Windows.Forms/Templates/DataGridColumn.tt b/MonoMac.Windows.Forms/Templates/DataGridColumn.tt index 062e3ee..72d25d0 100644 --- a/MonoMac.Windows.Forms/Templates/DataGridColumn.tt +++ b/MonoMac.Windows.Forms/Templates/DataGridColumn.tt @@ -9,9 +9,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { <# diff --git a/MonoMac.Windows.Forms/Templates/DrawingTemplate.g.cs b/MonoMac.Windows.Forms/Templates/DrawingTemplate.g.cs index f4ea68f..326e80e 100644 --- a/MonoMac.Windows.Forms/Templates/DrawingTemplate.g.cs +++ b/MonoMac.Windows.Forms/Templates/DrawingTemplate.g.cs @@ -1,9 +1,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { internal partial class InternalUserControl diff --git a/MonoMac.Windows.Forms/Templates/DrawingTemplate.tt b/MonoMac.Windows.Forms/Templates/DrawingTemplate.tt index 4f8e021..e23043c 100644 --- a/MonoMac.Windows.Forms/Templates/DrawingTemplate.tt +++ b/MonoMac.Windows.Forms/Templates/DrawingTemplate.tt @@ -9,9 +9,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { <# diff --git a/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.g.cs b/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.g.cs index 5ed80bd..8cd58ba 100644 --- a/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.g.cs +++ b/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.g.cs @@ -1,9 +1,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { public partial class TextBox diff --git a/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.tt b/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.tt index cd9f15e..ae61ca8 100644 --- a/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.tt +++ b/MonoMac.Windows.Forms/Templates/KeyPressEventsTemplate.tt @@ -9,9 +9,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { <# diff --git a/MonoMac.Windows.Forms/Templates/MouseTemplate.g.cs b/MonoMac.Windows.Forms/Templates/MouseTemplate.g.cs index 3973b2b..c592d3a 100644 --- a/MonoMac.Windows.Forms/Templates/MouseTemplate.g.cs +++ b/MonoMac.Windows.Forms/Templates/MouseTemplate.g.cs @@ -1,9 +1,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { internal partial class ButtonHelper : NSButton , IViewHelper diff --git a/MonoMac.Windows.Forms/Templates/MouseTemplate.tt b/MonoMac.Windows.Forms/Templates/MouseTemplate.tt index 84cd80c..8048ee8 100644 --- a/MonoMac.Windows.Forms/Templates/MouseTemplate.tt +++ b/MonoMac.Windows.Forms/Templates/MouseTemplate.tt @@ -9,9 +9,9 @@ using System; using System.Collections; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Drawing; -using MonoMac.Foundation; +using Foundation; namespace System.Windows.Forms { <# diff --git a/MonoMac.Windows.Forms/Utils/KeyUtil.cs b/MonoMac.Windows.Forms/Utils/KeyUtil.cs index 963e792..caeec2b 100644 --- a/MonoMac.Windows.Forms/Utils/KeyUtil.cs +++ b/MonoMac.Windows.Forms/Utils/KeyUtil.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License.using System; using System.Linq; -using MonoMac.AppKit; +using AppKit; using System.Collections; namespace System.Windows.Forms { diff --git a/MonoMac.Windows.Forms/Utils/Util.cs b/MonoMac.Windows.Forms/Utils/Util.cs index 59d0f88..a7725c3 100644 --- a/MonoMac.Windows.Forms/Utils/Util.cs +++ b/MonoMac.Windows.Forms/Utils/Util.cs @@ -15,10 +15,10 @@ using System.Linq; using System.Reflection; using System.Drawing; -using MonoMac.CoreGraphics; +using CoreGraphics; using System.Runtime.InteropServices; -using MonoMac.AppKit; -using MonoMac.Foundation; +using AppKit; +using Foundation; namespace System.Windows.Forms {