diff options
author | davygrvy <davygrvy> | 2004-01-13 02:05:59 (GMT) |
---|---|---|
committer | davygrvy <davygrvy> | 2004-01-13 02:05:59 (GMT) |
commit | 4af14625c0f6efb1c21915d38a5c38b38d9b32c1 (patch) | |
tree | d3e42f48fb70b654f8a82545d3a63ea270c93825 /win/tkWinX.c | |
parent | 0f4a6f0dabe44d77cf592e4098eadaed658cc9c3 (diff) | |
download | tk-4af14625c0f6efb1c21915d38a5c38b38d9b32c1.zip tk-4af14625c0f6efb1c21915d38a5c38b38d9b32c1.tar.gz tk-4af14625c0f6efb1c21915d38a5c38b38d9b32c1.tar.bz2 |
* generic/tk3d.c: All uses of 'panic' (the macro) changed
* generic/tkBind.c: to 'Tcl_Panic' (the function). The #define
* generic/tkBitmap.c: of panic in tcl.h clearly states it is
* generic/tkCanvArc.c: deprecated in the comments.
* generic/tkCanvBmap.c: [Tcl Patch 865264]
* generic/tkCanvImg.c:
* generic/tkCanvLine.c:
* generic/tkCanvPoly.c:
* generic/tkCanvText.c:
* generic/tkCanvWind.c:
* generic/tkColor.c:
* generic/tkConfig.c:
* generic/tkCursor.c:
* generic/tkError.c:
* generic/tkEvent.c:
* generic/tkFocus.c:
* generic/tkFont.c:
* generic/tkFrame.c:
* generic/tkGC.c:
* generic/tkGrid.c:
* generic/tkImgBmap.c:
* generic/tkImgPhoto.c:
* generic/tkImgUtil.c:
* generic/tkMenu.c:
* generic/tkObj.c:
* generic/tkPack.c:
* generic/tkPlace.c:
* generic/tkRectOval.c:
* generic/tkSelect.c:
* generic/tkText.c:
* generic/tkTextBTree.c:
* generic/tkTextDisp.c:
* generic/tkTextImage.c:
* generic/tkTextIndex.c:
* generic/tkTextMark.c:
* generic/tkTextWind.c:
* generic/tkVisual.c:
* generic/tkWindow.c:
* mac/tkMacAppInit.c:
* mac/tkMacAppearanceStubs.c:
* mac/tkMacButton.c:
* mac/tkMacDraw.c:
* mac/tkMacEmbed.c:
* mac/tkMacFont.c:
* mac/tkMacInit.c:
* mac/tkMacMenus.c:
* mac/tkMacPort.h:
* mac/tkMacSubwindows.c:
* mac/tkMacWm.c:
* mac/tkMacXStubs.c:
* macosx/tkMacOSXEmbed.c:
* macosx/tkMacOSXFont.c:
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXNotify.c:
* macosx/tkMacOSXPort.h:
* macosx/tkMacOSXSubwindows.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXXStubs.c:
* unix/tkUnix3d.c:
* unix/tkUnixColor.c:
* unix/tkUnixEmbed.c:
* unix/tkUnixEvent.c:
* unix/tkUnixFocus.c:
* unix/tkUnixFont.c:
* unix/tkUnixSelect.c:
* unix/tkUnixSend.c:
* unix/tkUnixWm.c:
* win/tkWin3d.c:
* win/tkWinButton.c:
* win/tkWinColor.c:
* win/tkWinDialog.c:
* win/tkWinDraw.c:
* win/tkWinEmbed.c:
* win/tkWinFont.c:
* win/tkWinPixmap.c:
* win/tkWinPointer.c:
* win/tkWinScrlbr.c:
* win/tkWinWm.c:
* win/tkWinX.c:
Diffstat (limited to 'win/tkWinX.c')
-rw-r--r-- | win/tkWinX.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c index 8a4fe05..9327db1 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.27 2003/12/21 23:50:13 davygrvy Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.28 2004/01/13 02:06:02 davygrvy Exp $ */ #include "tkWinInt.h" @@ -26,6 +26,9 @@ #endif #include <commctrl.h> +#ifdef _MSC_VER +# pragma comment (lib, "comctl32.lib") +#endif /* * The zmouse.h file includes the definition for WM_MOUSEWHEEL. @@ -38,6 +41,9 @@ */ #include <imm.h> +#ifdef _MSC_VER +# pragma comment (lib, "imm32.lib") +#endif static TkWinProcs asciiProcs = { 0, @@ -271,7 +277,7 @@ TkWinXInit(hInstance) childClass.hCursor = NULL; if (!RegisterClass(&childClass)) { - panic("Unable to register TkChild class"); + Tcl_Panic("Unable to register TkChild class"); } /* @@ -552,7 +558,7 @@ TkpCloseDisplay(dispPtr) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (dispPtr != tsdPtr->winDisplay) { - panic("TkpCloseDisplay: tried to call TkpCloseDisplay on another display"); + Tcl_Panic("TkpCloseDisplay: tried to call TkpCloseDisplay on another display"); return; } |