Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
diff --git a/controls/widgets.c b/controls/widgets.c
index fc409af..f93207e 100644
--- a/controls/widgets.c
+++ b/controls/widgets.c
@@ -19,64 +19,64 @@
/* Window procedures */
-extern LRESULT WINAPI EditWndProc( HWND32 hwnd, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI ComboWndProc( HWND32 hwnd, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI ComboLBWndProc( HWND32 hwnd, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI ListBoxWndProc( HWND32 hwnd, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI PopupMenuWndProc( HWND32 hwnd, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam );
-extern LRESULT WINAPI IconTitleWndProc( HWND32 hwnd, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam );
+extern LRESULT WINAPI EditWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI ComboWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI ComboLBWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI ListBoxWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam );
+extern LRESULT WINAPI IconTitleWndProc( HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam );
/* Built-in classes */
-static WNDCLASS32A WIDGETS_BuiltinClasses[BIC32_NB_CLASSES] =
+static WNDCLASSA WIDGETS_BuiltinClasses[BIC32_NB_CLASSES] =
{
/* BIC32_BUTTON */
{ CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC,
ButtonWndProc, 0, sizeof(BUTTONINFO), 0, 0,
- (HCURSOR32)IDC_ARROW32A, 0, 0, "Button" },
+ (HCURSOR)IDC_ARROWA, 0, 0, "Button" },
/* BIC32_EDIT */
{ CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/,
EditWndProc, 0, sizeof(void *), 0, 0,
- (HCURSOR32)IDC_IBEAM32A, 0, 0, "Edit" },
+ (HCURSOR)IDC_IBEAMA, 0, 0, "Edit" },
/* BIC32_LISTBOX */
{ CS_GLOBALCLASS | CS_DBLCLKS /*| CS_PARENTDC*/,
ListBoxWndProc, 0, sizeof(void *), 0, 0,
- (HCURSOR32)IDC_ARROW32A, 0, 0, "ListBox" },
+ (HCURSOR)IDC_ARROWA, 0, 0, "ListBox" },
/* BIC32_COMBO */
{ CS_GLOBALCLASS | CS_PARENTDC | CS_DBLCLKS,
ComboWndProc, 0, sizeof(void *), 0, 0,
- (HCURSOR32)IDC_ARROW32A, 0, 0, "ComboBox" },
+ (HCURSOR)IDC_ARROWA, 0, 0, "ComboBox" },
/* BIC32_COMBOLB */
{ CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS, ComboLBWndProc,
- 0, sizeof(void *), 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, "ComboLBox" },
+ 0, sizeof(void *), 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, "ComboLBox" },
/* BIC32_POPUPMENU */
- { CS_GLOBALCLASS | CS_SAVEBITS, PopupMenuWndProc, 0, sizeof(HMENU32),
- 0, 0, (HCURSOR32)IDC_ARROW32A, NULL_BRUSH, 0, POPUPMENU_CLASS_NAME },
+ { CS_GLOBALCLASS | CS_SAVEBITS, PopupMenuWndProc, 0, sizeof(HMENU),
+ 0, 0, (HCURSOR)IDC_ARROWA, NULL_BRUSH, 0, POPUPMENU_CLASS_NAME },
/* BIC32_STATIC */
{ CS_GLOBALCLASS | CS_PARENTDC, StaticWndProc,
- 0, sizeof(STATICINFO), 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, "Static" },
+ 0, sizeof(STATICINFO), 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, "Static" },
/* BIC32_SCROLL */
{ CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC,
ScrollBarWndProc, 0, sizeof(SCROLLBAR_INFO), 0, 0,
- (HCURSOR32)IDC_ARROW32A, 0, 0, "ScrollBar"},
+ (HCURSOR)IDC_ARROWA, 0, 0, "ScrollBar"},
/* BIC32_MDICLIENT */
{ CS_GLOBALCLASS, MDIClientWndProc,
0, sizeof(MDICLIENTINFO), 0, 0, 0, STOCK_LTGRAY_BRUSH, 0, "MDIClient" },
/* BIC32_DESKTOP */
{ CS_GLOBALCLASS, DesktopWndProc, 0, sizeof(DESKTOP),
- 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, DESKTOP_CLASS_NAME },
+ 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, DESKTOP_CLASS_NAME },
/* BIC32_DIALOG */
- { CS_GLOBALCLASS | CS_SAVEBITS, DefDlgProc32A, 0, DLGWINDOWEXTRA,
- 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, DIALOG_CLASS_NAME },
+ { CS_GLOBALCLASS | CS_SAVEBITS, DefDlgProcA, 0, DLGWINDOWEXTRA,
+ 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, DIALOG_CLASS_NAME },
/* BIC32_ICONTITLE */
{ CS_GLOBALCLASS, IconTitleWndProc, 0, 0,
- 0, 0, (HCURSOR32)IDC_ARROW32A, 0, 0, ICONTITLE_CLASS_NAME }
+ 0, 0, (HCURSOR)IDC_ARROWA, 0, 0, ICONTITLE_CLASS_NAME }
};
static ATOM bicAtomTable[BIC32_NB_CLASSES];
@@ -86,10 +86,10 @@
*
* Initialize the built-in window classes.
*/
-BOOL32 WIDGETS_Init(void)
+BOOL WIDGETS_Init(void)
{
int i;
- WNDCLASS32A *cls = WIDGETS_BuiltinClasses;
+ WNDCLASSA *cls = WIDGETS_BuiltinClasses;
/* Create builtin classes */
@@ -99,8 +99,8 @@
/* Just to make sure the string is > 0x10000 */
strcpy( name, (char *)cls->lpszClassName );
cls->lpszClassName = name;
- cls->hCursor = LoadCursor32A( 0, (LPCSTR)cls->hCursor );
- if (!(bicAtomTable[i] = RegisterClass32A( cls ))) return FALSE;
+ cls->hCursor = LoadCursorA( 0, (LPCSTR)cls->hCursor );
+ if (!(bicAtomTable[i] = RegisterClassA( cls ))) return FALSE;
}
return TRUE;
@@ -112,7 +112,7 @@
*
* Check whether pWnd is a built-in control or not.
*/
-BOOL32 WIDGETS_IsControl32( WND* pWnd, BUILTIN_CLASS32 cls )
+BOOL WIDGETS_IsControl( WND* pWnd, BUILTIN_CLASS32 cls )
{
assert( cls < BIC32_NB_CLASSES );
return (pWnd->class->atomName == bicAtomTable[cls]);
