diff options
Diffstat (limited to 'alf')
| -rw-r--r-- | alf/alf.cpp | 7 | ||||
| -rw-r--r-- | alf/alf.h | 6 | ||||
| -rw-r--r-- | alf/alfbutton.cpp | 4 | ||||
| -rw-r--r-- | alf/alfedit.cpp | 4 | ||||
| -rw-r--r-- | alf/alflabel.cpp | 4 |
5 files changed, 13 insertions, 12 deletions
diff --git a/alf/alf.cpp b/alf/alf.cpp index fbc7822..ae6c8f9 100644 --- a/alf/alf.cpp +++ b/alf/alf.cpp @@ -70,7 +70,7 @@ ALF_UpdateFontsPriv(HWND win, ALFWindowPriv *priv) ZeroMemory(&priv->fonts.lfMessageFont, sizeof(priv->fonts.lfMessageFont)); priv->fonts.lfMessageFont.lfHeight = -MulDiv(8, priv->fonts.dpi, 72); - lstrcpyW(priv->fonts.lfMessageFont.lfFaceName, L"MS Shell Dlg"); + lstrcpy(priv->fonts.lfMessageFont.lfFaceName, TEXT("MS Shell Dlg")); } if (priv->fonts.hMessageFont) { @@ -567,7 +567,8 @@ ALF_RegisterWindowClass(ALFAPP app, const ALFWindowClassParams *params) ALFWindowVTable *pvtbl = (ALFWindowVTable*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY|HEAP_GENERATE_EXCEPTIONS, sizeof(ALFWindowVTable)); *pvtbl = params->vtbl; - HWND tmp = CreateWindowEx(0, MAKEINTATOM(classatom), TEXT("dummy"), 0, 0, 0, 0, 0, HWND_MESSAGE, 0, app->hInstance, 0); + // XXX: This could have been a HWND_MESSAGE window, but Win95 doesn't support these + HWND tmp = CreateWindowEx(0, MAKEINTATOM(classatom), TEXT("dummy"), 0, 0, 0, 0, 0, NULL, 0, app->hInstance, 0); SetClassLongPtr(tmp, 0, (LONG_PTR)pvtbl); SetClassLongPtr(tmp, sizeof(void*), (LONG_PTR)app); SetClassLongPtr(tmp, GCLP_WNDPROC, (LONG_PTR)ALF_WindowProc); @@ -580,7 +581,7 @@ HWND ALF_InstantiateWindow(ALFAPP app, LPCTSTR className, HWND hwndParent, void { return CreateWindowEx(0, className, - L"Window", + TEXT("Window"), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, 300, 100, //FIXME @@ -98,13 +98,13 @@ LRESULT ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); HWND -ALF_AddLabel(HWND win, WORD id, UINT x, UINT y, const WCHAR *text); +ALF_AddLabel(HWND win, WORD id, UINT x, UINT y, const TCHAR *text); HWND -ALF_AddEdit(HWND win, WORD id, UINT x, UINT y, const WCHAR *text); +ALF_AddEdit(HWND win, WORD id, UINT x, UINT y, const TCHAR *text); HWND -ALF_AddButton(HWND win, WORD id, UINT x, UINT y, const WCHAR *text); +ALF_AddButton(HWND win, WORD id, UINT x, UINT y, const TCHAR *text); void ALF_SetDefaultButton(HWND win, WORD id); diff --git a/alf/alfbutton.cpp b/alf/alfbutton.cpp index 0723563..c46693e 100644 --- a/alf/alfbutton.cpp +++ b/alf/alfbutton.cpp @@ -71,10 +71,10 @@ ALF__ButtonSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT } HWND -ALF_AddButton(HWND win, WORD id, UINT x, UINT y, const WCHAR *text) +ALF_AddButton(HWND win, WORD id, UINT x, UINT y, const TCHAR *text) { HWND hwndButton = CreateWindowEx(0, - L"BUTTON", + TEXT("BUTTON"), text, WS_CHILD | WS_TABSTOP | WS_VISIBLE | BS_PUSHBUTTON | BS_MULTILINE, 0, 0, 100, 100, diff --git a/alf/alfedit.cpp b/alf/alfedit.cpp index df902e9..7c247b1 100644 --- a/alf/alfedit.cpp +++ b/alf/alfedit.cpp @@ -52,10 +52,10 @@ ALF__EditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_P } HWND -ALF_AddEdit(HWND win, WORD id, UINT x, UINT y, const WCHAR *text) +ALF_AddEdit(HWND win, WORD id, UINT x, UINT y, const TCHAR *text) { HWND hwndEdit = CreateWindowEx(WS_EX_CLIENTEDGE, - L"EDIT", + TEXT("EDIT"), text, WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, 100, 100, diff --git a/alf/alflabel.cpp b/alf/alflabel.cpp index 7402ecd..283b99a 100644 --- a/alf/alflabel.cpp +++ b/alf/alflabel.cpp @@ -74,9 +74,9 @@ ALF__LabelSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ } HWND -ALF_AddLabel(HWND win, WORD id, UINT x, UINT y, const WCHAR *text) +ALF_AddLabel(HWND win, WORD id, UINT x, UINT y, const TCHAR *text) { - HWND hwndLabel = CreateWindow(L"STATIC", + HWND hwndLabel = CreateWindow(TEXT("STATIC"), text, WS_CHILD | WS_VISIBLE | SS_LEFTNOWORDWRAP, 0, 0, 100, 100, |