Removed the A/W constants for builtin cursors, icons and resource
types since they don't exist on Windows, and added typecasts
everywhere instead.
diff --git a/controls/button.c b/controls/button.c
index 1368599..2ffa0b9 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -108,7 +108,7 @@
ButtonWndProcA, /* procA */
ButtonWndProcW, /* procW */
NB_EXTRA_BYTES, /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
diff --git a/controls/combo.c b/controls/combo.c
index 6b2d6a4..3a2d000 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -85,7 +85,7 @@
ComboWndProcA, /* procA */
ComboWndProcW, /* procW */
sizeof(HEADCOMBO *), /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
diff --git a/controls/desktop.c b/controls/desktop.c
index 8ee0acc..10fc475 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -52,7 +52,7 @@
NULL, /* procA (winproc is Unicode only) */
DesktopWndProc, /* procW */
0, /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
(HBRUSH)(COLOR_BACKGROUND+1) /* brush */
};
diff --git a/controls/edit.c b/controls/edit.c
index c6e991a..d67ab35 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -289,7 +289,7 @@
EditWndProcA, /* procA */
EditWndProcW, /* procW */
sizeof(EDITSTATE *), /* extra */
- IDC_IBEAMA, /* cursor */
+ IDC_IBEAM, /* cursor */
0 /* brush */
};
diff --git a/controls/icontitle.c b/controls/icontitle.c
index 53bd8f8..44173cd 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -51,7 +51,7 @@
NULL, /* procA (winproc is Unicode only) */
IconTitleWndProc, /* procW */
0, /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
diff --git a/controls/listbox.c b/controls/listbox.c
index 0bbaa76..b6ddb38 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -143,7 +143,7 @@
ListBoxWndProcA, /* procA */
ListBoxWndProcW, /* procW */
sizeof(LB_DESCR *), /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
@@ -158,7 +158,7 @@
ComboLBWndProcA, /* procA */
ComboLBWndProcW, /* procW */
sizeof(LB_DESCR *), /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
diff --git a/controls/menu.c b/controls/menu.c
index 16af97a..fa663cd 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -191,7 +191,7 @@
NULL, /* procA (winproc is Unicode only) */
PopupMenuWndProc, /* procW */
sizeof(HMENU), /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
(HBRUSH)(COLOR_MENU+1) /* brush */
};
@@ -3937,7 +3937,7 @@
if (!name) return 0;
instance = GetExePtr( instance );
- if (!(hRsrc = FindResource16( instance, name, RT_MENUA ))) return 0;
+ if (!(hRsrc = FindResource16( instance, name, (LPSTR)RT_MENU ))) return 0;
if (!(handle = LoadResource16( instance, hRsrc ))) return 0;
hMenu = LoadMenuIndirect16(LockResource16(handle));
FreeResource16( handle );
@@ -3950,7 +3950,7 @@
*/
HMENU WINAPI LoadMenuA( HINSTANCE instance, LPCSTR name )
{
- HRSRC hrsrc = FindResourceA( instance, name, RT_MENUA );
+ HRSRC hrsrc = FindResourceA( instance, name, (LPSTR)RT_MENU );
if (!hrsrc) return 0;
return LoadMenuIndirectA( (LPCVOID)LoadResource( instance, hrsrc ));
}
@@ -3961,7 +3961,7 @@
*/
HMENU WINAPI LoadMenuW( HINSTANCE instance, LPCWSTR name )
{
- HRSRC hrsrc = FindResourceW( instance, name, RT_MENUW );
+ HRSRC hrsrc = FindResourceW( instance, name, (LPWSTR)RT_MENU );
if (!hrsrc) return 0;
return LoadMenuIndirectW( (LPCVOID)LoadResource( instance, hrsrc ));
}
diff --git a/controls/scroll.c b/controls/scroll.c
index fc10e28..ac1553c 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -136,7 +136,7 @@
NULL, /* procA (winproc is Unicode only) */
ScrollBarWndProc, /* procW */
sizeof(SCROLLBAR_INFO), /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
diff --git a/controls/static.c b/controls/static.c
index 43216e8..c020d4c 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -84,7 +84,7 @@
StaticWndProcA, /* procA */
StaticWndProcW, /* procW */
STATIC_EXTRA_BYTES, /* extra */
- IDC_ARROWA, /* cursor */
+ IDC_ARROW, /* cursor */
0 /* brush */
};
