summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-04-14 20:59:51 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-04-14 20:59:51 (GMT)
commit6ee2ac2db060471516838a8dd4a07ff3bf8fc410 (patch)
tree8dc97a04acfda3ee4cef886b6275ab4a833c39e2 /win
parente3fe238d0a72f92aeec5f6104dc0acff33fb6447 (diff)
downloadtk-6ee2ac2db060471516838a8dd4a07ff3bf8fc410.zip
tk-6ee2ac2db060471516838a8dd4a07ff3bf8fc410.tar.gz
tk-6ee2ac2db060471516838a8dd4a07ff3bf8fc410.tar.bz2
backported tk_chooseColor -title fix from HEAD
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDialog.c6
-rw-r--r--win/tkWinTest.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index ec6ede9..06cceb2 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinDialog.c,v 1.50 2008/01/31 23:31:02 hobbs Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.50.2.1 2008/04/14 20:59:51 patthoyts Exp $
*
*/
@@ -455,13 +455,15 @@ ColorDlgHookProc(
const char *title;
CHOOSECOLOR *ccPtr;
- switch (uMsg) {
+ if (WM_INITDIALOG == uMsg) {
+
/*
* Set the title string of the dialog.
*/
ccPtr = (CHOOSECOLOR *) lParam;
title = (const char *) ccPtr->lCustData;
+
if ((title != NULL) && (title[0] != '\0')) {
Tcl_DString ds;
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index 57792ec..95b5336 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.14 2007/12/13 15:28:56 dgp Exp $
+ * RCS: @(#) $Id: tkWinTest.c,v 1.14.2.1 2008/04/14 20:59:51 patthoyts Exp $
*/
#include "tkWinInt.h"
@@ -466,6 +466,9 @@ TestgetwindowinfoObjCmd(
Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("text", -1));
Tcl_ListObjAppendElement(interp, resObj, textObj);
+ Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj("parent", -1));
+ Tcl_ListObjAppendElement(interp, resObj,
+ Tcl_NewLongObj((long)GetParent(hwnd)));
childrenObj = Tcl_NewListObj(0, NULL);
EnumChildWindows(hwnd, EnumChildrenProc, (LPARAM)childrenObj);