You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/03 10:22:27 UTC
svn commit: r1814158 - in /commons/proper/daemon/trunk/src/native/windows:
include/gui.h src/gui.c
Author: markt
Date: Fri Nov 3 10:22:27 2017
New Revision: 1814158
URL: http://svn.apache.org/viewvc?rev=1814158&view=rev
Log:
Unicode clean-up. Remove unused code.
Modified:
commons/proper/daemon/trunk/src/native/windows/include/gui.h
commons/proper/daemon/trunk/src/native/windows/src/gui.c
Modified: commons/proper/daemon/trunk/src/native/windows/include/gui.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/gui.h?rev=1814158&r1=1814157&r2=1814158&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/gui.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/include/gui.h Fri Nov 3 10:22:27 2017
@@ -141,14 +141,6 @@ BOOL apxYesNoMessage(LPCTSTR szTi
BOOL apxCalcStringEllipsis(HDC hDC, LPTSTR szString,
int cchMax, UINT uColWidth);
-LPWSTR apxGetDlgTextW(APXHANDLE hPool, HWND hDlg, int nIDDlgItem);
-LPSTR apxGetDlgTextA(APXHANDLE hPool, HWND hDlg, int nIDDlgItem);
-
-#ifdef _UNICODE
-#define apxGetDlgText apxGetDlgTextW
-#else
-#define apxGetDlgText apxGetDlgTextA
-#endif
LPSTR apxBrowseForFolderA(HWND hWnd, LPCSTR szTitle, LPCSTR szName);
LPWSTR apxBrowseForFolderW(HWND hWnd, LPCWSTR szTitle, LPCWSTR szName);
Modified: commons/proper/daemon/trunk/src/native/windows/src/gui.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/gui.c?rev=1814158&r1=1814157&r2=1814158&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/gui.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/gui.c Fri Nov 3 10:22:27 2017
@@ -481,40 +481,6 @@ BOOL apxYesNoMessage(LPCTSTR szTitle, LP
return (rv == IDYES);
}
-LPWSTR apxGetDlgTextW(APXHANDLE hPool, HWND hDlg, int nIDDlgItem)
-{
- DWORD l, n;
- LPWSTR szT = NULL;
-
- l = (DWORD)SendMessageW(GetDlgItem(hDlg, nIDDlgItem), WM_GETTEXTLENGTH, 0, 0);
- if (l > 0) {
- szT = apxPoolAlloc(hPool, (l + 1) * sizeof(WCHAR));
- n = GetDlgItemTextW(hDlg, nIDDlgItem, szT, l + 1);
- if (n == 0) {
- apxFree(szT);
- szT = NULL;
- }
- }
- return szT;
-}
-
-LPSTR apxGetDlgTextA(APXHANDLE hPool, HWND hDlg, int nIDDlgItem)
-{
- DWORD l, n;
- LPSTR szT = NULL;
-
- l = (DWORD)SendMessageA(GetDlgItem(hDlg, nIDDlgItem), WM_GETTEXTLENGTH, 0, 0);
- if (l > 0) {
- szT = apxPoolAlloc(hPool, (l + 1));
- n = GetDlgItemTextA(hDlg, nIDDlgItem, szT, l + 1);
- if (n == 0) {
- apxFree(szT);
- szT = NULL;
- }
- }
- return szT;
-}
-
/* Browse for folder dialog.
*/
LPSTR apxBrowseForFolderA(HWND hWnd, LPCSTR szTitle, LPCSTR szName)