diff options
| author | nijtmans <nijtmans> | 2010-09-09 14:59:24 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-09-09 14:59:24 (GMT) |
| commit | 6da8b413c4b3bf6801bd9935bce44a7764ab85f6 (patch) | |
| tree | db2ee4f118c9b31127a933e042a1748307d33b17 /win/tkWinTest.c | |
| parent | 10742e417a6e784ea50d4e67cb69513a38d03741 (diff) | |
| download | tk-6da8b413c4b3bf6801bd9935bce44a7764ab85f6.zip tk-6da8b413c4b3bf6801bd9935bce44a7764ab85f6.tar.gz tk-6da8b413c4b3bf6801bd9935bce44a7764ab85f6.tar.bz2 | |
win/rules.vc: (sync with tcl version)
mingw should always link with -ladvapi32
Remove ascii variant of tkWinPocs table,
it is no longer necessary.
Diffstat (limited to 'win/tkWinTest.c')
| -rw-r--r-- | win/tkWinTest.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 70ab646..edd3338 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinTest.c,v 1.31 2010/03/04 22:59:28 nijtmans Exp $ + * RCS: @(#) $Id: tkWinTest.c,v 1.32 2010/09/09 14:59:24 nijtmans Exp $ */ #ifndef USE_TCL_STUBS @@ -45,20 +45,6 @@ static int TestwinlocaleObjCmd(ClientData clientData, static Tk_GetSelProc SetSelectionResult; -static const TkWinProcs asciiProcs = { - 0, - (LRESULT (WINAPI *)(WNDPROC, HWND, UINT, WPARAM, LPARAM)) CallWindowProcA, - (LRESULT (WINAPI *)(HWND, UINT, WPARAM, LPARAM)) DefWindowProcA, - (ATOM (WINAPI *)(const WNDCLASS *)) RegisterClassA, - (BOOL (WINAPI *)(HWND, LPCTSTR)) SetWindowTextA, - (HWND (WINAPI *)(DWORD, LPCTSTR, LPCTSTR, DWORD, int, int, int, int, - HWND, HMENU, HINSTANCE, LPVOID)) CreateWindowExA, - (BOOL (WINAPI *)(HMENU, UINT, UINT, UINT, LPCTSTR)) InsertMenuA, - (int (WINAPI *)(HWND, LPCTSTR, int)) GetWindowTextA, - (HWND (WINAPI *)(LPCTSTR, LPCTSTR)) FindWindowA, - (int (WINAPI *)(HWND, LPTSTR, int)) GetClassNameA, -}; - static const TkWinProcs unicodeProcs = { 1, (LRESULT (WINAPI *)(WNDPROC, HWND, UINT, WPARAM, LPARAM)) CallWindowProcW, @@ -73,7 +59,7 @@ static const TkWinProcs unicodeProcs = { (int (WINAPI *)(HWND, LPTSTR, int)) GetClassNameW, }; -static const TkWinProcs *tkTestWinProcs = &asciiProcs; +static const TkWinProcs *const tkTestWinProcs = &unicodeProcs; /* @@ -97,12 +83,6 @@ int TkplatformtestInit( Tcl_Interp *interp) /* Interpreter to add commands to. */ { - int useWide = (TkWinGetPlatformId() != VER_PLATFORM_WIN32_WINDOWS); - if (useWide) { - tkTestWinProcs = &unicodeProcs; - } else { - tkTestWinProcs = &asciiProcs; - } /* * Add commands for platform specific tests on MacOS here. */ |