merge trunkpspjuth_canvas

1 files changed, 10 insertions, 30 deletions

diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index 4a6b4f0..d7d4d0f 100644
--- a/win/tkWinTest.c
+++ b/win/tkWinTest.c
@@ -10,8 +10,6 @@
  *
  * 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.34 2010/10/06 14:33:30 nijtmans Exp $
  */
 
 #undef USE_TCL_STUBS
@@ -42,24 +40,6 @@ static int		TestwinlocaleObjCmd(ClientData clientData,
 			    Tcl_Obj *const objv[]);
 static Tk_GetSelProc		SetSelectionResult;
 
-
-static const TkWinProcs unicodeProcs = {
-    1,
-    (LRESULT (WINAPI *)(WNDPROC, HWND, UINT, WPARAM, LPARAM)) CallWindowProcW,
-    (LRESULT (WINAPI *)(HWND, UINT, WPARAM, LPARAM)) DefWindowProcW,
-    (ATOM (WINAPI *)(const WNDCLASS *)) RegisterClassW,
-    (BOOL (WINAPI *)(HWND, LPCTSTR)) SetWindowTextW,
-    (HWND (WINAPI *)(DWORD, LPCTSTR, LPCTSTR, DWORD, int, int, int, int,
-	    HWND, HMENU, HINSTANCE, LPVOID)) CreateWindowExW,
-    (BOOL (WINAPI *)(HMENU, UINT, UINT, UINT, LPCTSTR)) InsertMenuW,
-    (int (WINAPI *)(HWND, LPCTSTR, int)) GetWindowTextW,
-    (HWND (WINAPI *)(LPCTSTR, LPCTSTR)) FindWindowW,
-    (int (WINAPI *)(HWND, LPTSTR, int)) GetClassNameW,
-};
-
-static const TkWinProcs *const tkTestWinProcs = &unicodeProcs;
-
-
 /*
  *----------------------------------------------------------------------
  *
@@ -130,7 +110,7 @@ AppendSystemError(
     if (Tcl_IsShared(resultPtr)) {
 	resultPtr = Tcl_DuplicateObj(resultPtr);
     }
-    length = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM
+    length = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
 	    | FORMAT_MESSAGE_IGNORE_INSERTS
 	    | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, error,
 	    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *) wMsgPtrPtr,
@@ -302,7 +282,7 @@ TestwineventCmd(
 	return TCL_ERROR;
     }
 #endif
-    hwnd = (HWND) strtol(argv[1], &rest, 0);
+    hwnd = INT2PTR(strtol(argv[1], &rest, 0));
     if (rest == argv[1]) {
 	hwnd = FindWindowA(NULL, argv[1]);
 	if (hwnd == NULL) {
@@ -419,14 +399,14 @@ TestfindwindowObjCmd(
         class = Tcl_WinUtfToTChar(Tcl_GetString(objv[2]), -1, &classString);
     }
 
-    hwnd  = tkTestWinProcs->findWindow(class, title);
+    hwnd  = FindWindow(class, title);
 
     if (hwnd == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to find window: ", -1));
 	AppendSystemError(interp, GetLastError());
 	r = TCL_ERROR;
     } else {
-        Tcl_SetObjResult(interp, Tcl_NewLongObj((long)hwnd));
+        Tcl_SetObjResult(interp, Tcl_NewLongObj(PTR2INT(hwnd)));
     }
 
     Tcl_DStringFree(&titleString);
@@ -442,7 +422,7 @@ EnumChildrenProc(
 {
     Tcl_Obj *listObj = (Tcl_Obj *) lParam;
 
-    Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewLongObj((long) hwnd));
+    Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewLongObj(PTR2INT(hwnd)));
     return TRUE;
 }
 
@@ -467,7 +447,7 @@ TestgetwindowinfoObjCmd(
     if (Tcl_GetLongFromObj(interp, objv[1], &hwnd) != TCL_OK)
 	return TCL_ERROR;
 
-    cch = tkTestWinProcs->getClassName((HWND)hwnd, buf, cchBuf);
+    cch = GetClassName(INT2PTR(hwnd), buf, cchBuf);
     if (cch == 0) {
     	Tcl_SetResult(interp, "failed to get class name: ", TCL_STATIC);
     	AppendSystemError(interp, GetLastError());
@@ -482,17 +462,17 @@ TestgetwindowinfoObjCmd(
     dictObj = Tcl_NewDictObj();
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("class", 5), classObj);
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("id", 2),
-	Tcl_NewLongObj(GetWindowLongA((HWND)hwnd, GWL_ID)));
+	Tcl_NewLongObj(GetWindowLongA(INT2PTR(hwnd), GWL_ID)));
 
-    cch = tkTestWinProcs->getWindowText((HWND)hwnd, (LPTSTR)buf, cchBuf);
+    cch = GetWindowText(INT2PTR(hwnd), (LPTSTR)buf, cchBuf);
     textObj = Tcl_NewUnicodeObj((LPCWSTR)buf, cch);
 
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("text", 4), textObj);
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("parent", 6),
-	Tcl_NewLongObj((long)GetParent((HWND)hwnd)));
+	Tcl_NewLongObj(PTR2INT(GetParent((INT2PTR(hwnd))))));
 
     childrenObj = Tcl_NewListObj(0, NULL);
-    EnumChildWindows((HWND)hwnd, EnumChildrenProc, (LPARAM)childrenObj);
+    EnumChildWindows(INT2PTR(hwnd), EnumChildrenProc, (LPARAM)childrenObj);
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("children", -1), childrenObj);
 
     Tcl_SetObjResult(interp, dictObj);