Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Hayes <dennis@mono-cvs.ximian.com>2002-11-26 05:10:57 +0300
committerDennis Hayes <dennis@mono-cvs.ximian.com>2002-11-26 05:10:57 +0300
commit1fce2977b3fe34dd4171623ec2ff5e6ad5403a84 (patch)
tree25464e8e817b12070a28f6fb55a76f2a58fbdeb1
parentef47bde937365ac9b59b9ef766f753d883f2ba23 (diff)
tweaked win32 defs for regclass and reg windows
svn path=/trunk/mcs/; revision=9190
-rw-r--r--mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs4
-rw-r--r--mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs2
-rw-r--r--mcs/class/System.Windows.Forms/System.Windows.Forms/win32functions.cs8
3 files changed, 7 insertions, 7 deletions
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs
index 41f430bbfab..d673a05dbf3 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs
@@ -81,7 +81,7 @@ namespace System.Windows.Forms {
wndClass.lpszMenuName = "";
wndClass.lpszClassName = "mono_native_window";
- if (Win32.RegisterClassA(ref wndClass) != 0) {
+ if (Win32.RegisterClass(ref wndClass) != 0) {
registeredClass = true;
} else {
windowHandle = (IntPtr)0;
@@ -89,7 +89,7 @@ namespace System.Windows.Forms {
}
}
- windowHandle = Win32.CreateWindowExA (
+ windowHandle = Win32.CreateWindowEx (
(uint) cp.ExStyle, cp.ClassName,
cp.Caption,(uint) cp.Style,
cp.X, cp.Y, cp.Width, cp.Height,
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs
index f82169ac03c..7445d0941ce 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs
@@ -106,7 +106,7 @@ namespace System.Windows.Forms {
wndClass.lpszMenuName = "";
wndClass.lpszClassName = "mono_scrollable_control";
- if (Win32.RegisterClassA(ref wndClass) != 0)
+ if (Win32.RegisterClass(ref wndClass) != 0)
classRegistered = true;
}
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/win32functions.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/win32functions.cs
index d87b658b6d2..fd6a1527456 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/win32functions.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/win32functions.cs
@@ -552,8 +552,8 @@ namespace System.Windows.Forms{
[DllImport ("user32.dll",
CallingConvention = CallingConvention.StdCall,
- CharSet = CharSet.Auto)]
- internal static extern uint RegisterClassA(ref WNDCLASS wndClass);
+ CharSet = CharSet.Ansi, EntryPoint = "RegisterClassA")]
+ internal static extern uint RegisterClass(ref WNDCLASS wndClass);
#region Added by Dennis hayes 10-20-2002
//correct?
@@ -575,8 +575,8 @@ namespace System.Windows.Forms{
[DllImport ("user32.dll",
CallingConvention = CallingConvention.StdCall,
- CharSet = CharSet.Auto)]
- internal static extern IntPtr CreateWindowExA (
+ CharSet = CharSet.Ansi, EntryPoint = "CreateWindowExA")]
+ internal static extern IntPtr CreateWindowEx (
uint dwExStyle, string lpClassName,
string lpWindowName, uint dwStyle,
int x, int y, int nWidth, int nHeight,