diff options
| author | nijtmans <nijtmans> | 2010-03-12 13:02:36 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-03-12 13:02:36 (GMT) |
| commit | 36115ec36c8767cb3043dbbd1846c108ab788e8a (patch) | |
| tree | bb6ddc1254faf5843d0d0c100b1065c508dd0302 /win/tkWinSend.c | |
| parent | 94533b37310c2295093ae8d6f8849f99fd783c92 (diff) | |
| download | tk-36115ec36c8767cb3043dbbd1846c108ab788e8a.zip tk-36115ec36c8767cb3043dbbd1846c108ab788e8a.tar.gz tk-36115ec36c8767cb3043dbbd1846c108ab788e8a.tar.bz2 | |
[Bug 2956548] TkpButtonSetDefaults only initializes one button type
Fix various gcc warnings, all backported from Tk 8.6
VC6++ does not have SPI_SETKEYBOARDCUES
Diffstat (limited to 'win/tkWinSend.c')
| -rw-r--r-- | win/tkWinSend.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/win/tkWinSend.c b/win/tkWinSend.c index 086d55e..c1f9193 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -10,12 +10,16 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSend.c,v 1.15 2007/12/13 15:28:56 dgp Exp $ + * RCS: @(#) $Id: tkWinSend.c,v 1.15.2.1 2010/03/12 13:02:36 nijtmans Exp $ */ #include "tkInt.h" #include "tkWinSendCom.h" +#ifdef _MSC_VER +#define vsnprintf _vsnprintf +#endif + /* * Should be defined in WTypes.h but mingw 1.0 is missing them. */ @@ -63,13 +67,17 @@ static Tcl_ThreadDataKey dataKey; * Functions internal to this file. */ +#ifdef TK_SEND_ENABLED_ON_WINDOWS static void CmdDeleteProc(ClientData clientData); static void InterpDeleteProc(ClientData clientData, Tcl_Interp *interp); static void RevokeObjectRegistration(RegisteredInterp *riPtr); +#endif static HRESULT BuildMoniker(const char *name, LPMONIKER *pmk); +#ifdef TK_SEND_ENABLED_ON_WINDOWS static HRESULT RegisterInterp(const char *name, RegisteredInterp *riPtr); +#endif static int FindInterpreterObject(Tcl_Interp *interp, const char *name, LPDISPATCH *ppdisp); static int Send(LPDISPATCH pdispInterp, Tcl_Interp *interp, @@ -471,6 +479,7 @@ FindInterpreterObject( *-------------------------------------------------------------- */ +#ifdef TK_SEND_ENABLED_ON_WINDOWS static void CmdDeleteProc( ClientData clientData) @@ -550,6 +559,7 @@ RevokeObjectRegistration( riPtr->name = NULL; } } +#endif /* * ---------------------------------------------------------------------- @@ -568,6 +578,7 @@ RevokeObjectRegistration( * ---------------------------------------------------------------------- */ +#ifdef TK_SEND_ENABLED_ON_WINDOWS static void InterpDeleteProc( ClientData clientData, @@ -575,6 +586,7 @@ InterpDeleteProc( { CoUninitialize(); } +#endif /* * ---------------------------------------------------------------------- @@ -638,6 +650,7 @@ BuildMoniker( * ---------------------------------------------------------------------- */ +#ifdef TK_SEND_ENABLED_ON_WINDOWS static HRESULT RegisterInterp( const char *name, @@ -694,6 +707,7 @@ RegisterInterp( Tcl_DStringFree(&dString); return hr; } +#endif /* * ---------------------------------------------------------------------- @@ -833,11 +847,11 @@ Win32ErrorObj( if (lpBuffer == NULL) { lpBuffer = sBuffer; - wsprintf(sBuffer, _T("Error Code: %08lX"), hrError); + wsprintf(sBuffer, TEXT("Error Code: %08lX"), hrError); } - if ((p = _tcsrchr(lpBuffer, _T('\r'))) != NULL) { - *p = _T('\0'); + if ((p = _tcsrchr(lpBuffer, TEXT('\r'))) != NULL) { + *p = TEXT('\0'); } #ifdef _UNICODE @@ -1024,7 +1038,7 @@ SendTrace( static char buffer[1024]; va_start(args, format); - _vsnprintf(buffer, 1023, format, args); + vsnprintf(buffer, 1023, format, args); OutputDebugString(buffer); va_end(args); } |