summaryrefslogtreecommitdiffstats
path: root/win/tkWinSend.c
diff options
context:
space:
mode:
Diffstat (limited to 'win/tkWinSend.c')
-rw-r--r--win/tkWinSend.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index 84b37ac..10cd181 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.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: tkWinSend.c,v 1.17 2008/10/05 18:22:22 dkf Exp $
+ * RCS: @(#) $Id: tkWinSend.c,v 1.18 2008/10/17 23:18:38 nijtmans Exp $
*/
#include "tkInt.h"
@@ -68,7 +68,9 @@ static void CmdDeleteProc(ClientData clientData);
static void InterpDeleteProc(ClientData clientData,
Tcl_Interp *interp);
#endif
+#ifdef TK_SEND_ENABLED_ON_WINDOWS
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,
@@ -88,7 +90,7 @@ static Tcl_EventProc SendEventProc;
#else
#define TRACE 1 ? ((void)0) : SendTrace
#endif
-
+
/*
*--------------------------------------------------------------
*
@@ -189,7 +191,7 @@ Tk_SetAppName(
return (const char *) riPtr->name;
#endif /* TK_SEND_ENABLED_ON_WINDOWS */
}
-
+
/*
*----------------------------------------------------------------------
*
@@ -295,7 +297,7 @@ TkGetInterpNames(
return result;
#endif /* TK_SEND_ENABLED_ON_WINDOWS */
}
-
+
/*
*--------------------------------------------------------------
*
@@ -324,7 +326,7 @@ Tk_SendObjCmd(
enum {
SEND_ASYNC, SEND_DISPLAYOF, SEND_LAST
};
- static const char *sendOptions[] = {
+ static const char *const sendOptions[] = {
"-async", "-displayof", "--", NULL
};
int result = TCL_OK;
@@ -387,7 +389,7 @@ Tk_SendObjCmd(
return result;
}
-
+
/*
*--------------------------------------------------------------
*
@@ -456,7 +458,7 @@ FindInterpreterObject(
}
return result;
}
-
+
/*
*--------------------------------------------------------------
*
@@ -511,8 +513,7 @@ CmdDeleteProc(
ckfree(clientData);
}
-#endif
-
+
/*
*--------------------------------------------------------------
*
@@ -556,7 +557,8 @@ RevokeObjectRegistration(
riPtr->name = NULL;
}
}
-
+#endif
+
/*
* ----------------------------------------------------------------------
*
@@ -583,7 +585,7 @@ InterpDeleteProc(
CoUninitialize();
}
#endif
-
+
/*
* ----------------------------------------------------------------------
*
@@ -626,7 +628,7 @@ BuildMoniker(
}
return hr;
}
-
+
/*
* ----------------------------------------------------------------------
*
@@ -704,7 +706,7 @@ RegisterInterp(
return hr;
}
#endif
-
+
/*
* ----------------------------------------------------------------------
*
@@ -812,7 +814,7 @@ Send(
return (SUCCEEDED(hr) ? TCL_OK : TCL_ERROR);
}
-
+
/*
* ----------------------------------------------------------------------
*
@@ -862,7 +864,7 @@ Win32ErrorObj(
return errPtr;
}
-
+
/*
* ----------------------------------------------------------------------
*
@@ -926,7 +928,7 @@ SetExcepInfo(
}
}
}
-
+
/*
* ----------------------------------------------------------------------
*
@@ -970,7 +972,7 @@ TkWinSend_QueueCommand(
return 0;
}
-
+
/*
* ----------------------------------------------------------------------
*
@@ -1007,7 +1009,7 @@ SendEventProc(
return 1; /* 1 to indicate the event has been handled */
}
-
+
/*
* ----------------------------------------------------------------------
*
@@ -1038,7 +1040,7 @@ SendTrace(
OutputDebugString(buffer);
va_end(args);
}
-
+
/*
* Local Variables:
* mode: c