projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commit the part of the patches I've been using that were written by torford and gjmurphy
[privoxy.git]
/
w32log.c
diff --git
a/w32log.c
b/w32log.c
index
732c0a3
..
6543fae
100644
(file)
--- a/
w32log.c
+++ b/
w32log.c
@@
-1,7
+1,7
@@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.2
5.2.5 2003/04/04 12:48:51 oes
Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.2
7 2006/07/18 14:48:48 david__schmidt
Exp $";
/*********************************************************************
*
/*********************************************************************
*
- * File : $Source: /cvsroot/ijbswa/current/
Attic/
w32log.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
*
* Purpose : Functions for creating and destroying the log window,
* ouputting strings, processing messages and so on.
*
* Purpose : Functions for creating and destroying the log window,
* ouputting strings, processing messages and so on.
@@
-32,6
+32,10
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.25.2.5 2003/04/04 12:48:51 oes Exp
*
* Revisions :
* $Log: w32log.c,v $
*
* Revisions :
* $Log: w32log.c,v $
+ * Revision 1.27 2006/07/18 14:48:48 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
* Revision 1.25.2.5 2003/04/04 12:48:51 oes
* Fixed bug #711865:
* - Made tray menu correctly reflect initial window visibility state
* Revision 1.25.2.5 2003/04/04 12:48:51 oes
* Fixed bug #711865:
* - Made tray menu correctly reflect initial window visibility state
@@
-1294,8
+1298,16
@@
LRESULT CALLBACK LogRichEditProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
pt.y = HIWORD(lParam);
ClientToScreen(hwnd, &pt);
OnLogRButtonUp(wParam, pt.x, pt.y);
pt.y = HIWORD(lParam);
ClientToScreen(hwnd, &pt);
OnLogRButtonUp(wParam, pt.x, pt.y);
+ return 0;
+ }
+ case WM_CHAR:
+ {
+ if ((GetKeyState(VK_CONTROL) != 0) && (wParam == 4)) /* ctrl+d */
+ {
+ OnLogCommand(ID_VIEW_CLEARLOG);
+ return 0;
+ }
}
}
- return 0;
}
return CallWindowProc(g_fnLogBox, hwnd, uMsg, wParam, lParam);
}
return CallWindowProc(g_fnLogBox, hwnd, uMsg, wParam, lParam);
@@
-1373,6
+1385,14
@@
LRESULT CALLBACK LogWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
return 0;
}
break;
return 0;
}
break;
+
+ case WM_CHAR:
+ if ((GetKeyState(VK_CONTROL) != 0) && (wParam == 4)) /* ctrl+d */
+ {
+ OnLogCommand(ID_VIEW_CLEARLOG);
+ return 0;
+ }
+ break;
}
return DefWindowProc(hwnd, uMsg, wParam, lParam);
}
return DefWindowProc(hwnd, uMsg, wParam, lParam);