summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-10-11 19:56:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-10-11 19:56:09 (GMT)
commitf995e779cf5c0142ea0136713155f875c62cdc1d (patch)
treeedca7f3afa55fe5de794373537d7c96a133bea1b
parent17496cdc52a1eddf082c45994393bc3d2649e0aa (diff)
parentd2485d93167c4fe26531ba4d406998356c912675 (diff)
downloadtk-f995e779cf5c0142ea0136713155f875c62cdc1d.zip
tk-f995e779cf5c0142ea0136713155f875c62cdc1d.tar.gz
tk-f995e779cf5c0142ea0136713155f875c62cdc1d.tar.bz2
Fix [9e487e9f158b3aeda2b92ca75deb3abc04e21a61|9e487e9f15]: Fix for tkWinButton to avoid problems in plugin
-rw-r--r--win/tkWinButton.c34
1 files changed, 21 insertions, 13 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index f4d2d05..9e1960d 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.c
@@ -1265,21 +1265,29 @@ ButtonProc(
return 0;
}
case BN_CLICKED: {
- int code;
- Tcl_Interp *interp = butPtr->info.interp;
-
- if (butPtr->info.state != STATE_DISABLED) {
- Tcl_Preserve((ClientData)interp);
- code = TkInvokeButton((TkButton*)butPtr);
- if (code != TCL_OK && code != TCL_CONTINUE
- && code != TCL_BREAK) {
- Tcl_AddErrorInfo(interp, "\n (button invoke)");
- Tcl_BackgroundError(interp);
+ /*
+ * OOPS: chromium fires WM_NULL regularly to ping if plugin is still
+ * alive. When using an external window (i.e. via the tcl plugin), this
+ * causes all buttons to fire once a second, so we need to make sure
+ * that we are not dealing with the chromium life check.
+ */
+ if (wParam != 0 || lParam != 0) {
+ int code;
+ Tcl_Interp *interp = butPtr->info.interp;
+
+ if (butPtr->info.state != STATE_DISABLED) {
+ Tcl_Preserve((ClientData)interp);
+ code = TkInvokeButton((TkButton*)butPtr);
+ if (code != TCL_OK && code != TCL_CONTINUE
+ && code != TCL_BREAK) {
+ Tcl_AddErrorInfo(interp, "\n (button invoke)");
+ Tcl_BackgroundError(interp);
+ }
+ Tcl_Release((ClientData)interp);
}
- Tcl_Release((ClientData)interp);
+ Tcl_ServiceAll();
+ return 0;
}
- Tcl_ServiceAll();
- return 0;
}
default: