summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2008-01-31 23:31:00 (GMT)
committerhobbs <hobbs>2008-01-31 23:31:00 (GMT)
commit763a2af63e3be0052e1a7077bfd29d0942f3c1eb (patch)
tree05378ae8d0c0753ea77889940d8e3994386c8845
parent0c3a20c457d2413882bf014b2e17974cbeb7b5a1 (diff)
downloadtk-763a2af63e3be0052e1a7077bfd29d0942f3c1eb.zip
tk-763a2af63e3be0052e1a7077bfd29d0942f3c1eb.tar.gz
tk-763a2af63e3be0052e1a7077bfd29d0942f3c1eb.tar.bz2
* win/tkWinDialog.c (Tk_MessageBoxObjCmd): pass "" instead of NULL
when -title isn't set. [Bug #1881892]
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWinDialog.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 295e1e9..ed24377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-31 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tkWinDialog.c (Tk_MessageBoxObjCmd): pass "" instead of NULL
+ when -title isn't set. [Bug #1881892]
+
2008-01-31 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* doc/panedwindow.n: Added proper description of -height and -width
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 8635951..ec6ede9 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.49 2007/12/13 15:28:55 dgp Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.50 2008/01/31 23:31:02 hobbs Exp $
*
*/
@@ -2202,7 +2202,7 @@ Tk_MessageBoxObjCmd(
tsdPtr->hMsgBoxHook = SetWindowsHookEx(WH_CBT, MsgBoxCBTProc, NULL,
GetCurrentThreadId());
winCode = MessageBoxW(hWnd, Tcl_GetUnicode(tmpObj),
- titleObj ? Tcl_GetUnicode(titleObj) : NULL, flags);
+ titleObj ? Tcl_GetUnicode(titleObj) : L"", flags);
UnhookWindowsHookEx(tsdPtr->hMsgBoxHook);
(void) Tcl_SetServiceMode(oldMode);