X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=w32res.h;h=0216bf57f14e26220bfc8ff5fa50288a9cbd1540;hb=fac4a32725b380611aecc33e9a6015bf65187e98;hp=843359a3c20a9c6ed428dad4fc5bf2a2dae3bff9;hpb=72081f829de368392d04076728f8c991178c0080;p=privoxy.git

diff --git a/w32res.h b/w32res.h
index 843359a3..0216bf57 100644
--- a/w32res.h
+++ b/w32res.h
@@ -1,9 +1,9 @@
 #ifndef W32RES_H_INCLUDED
 #define W32RES_H_INCLUDED
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.13.2.1 2002/08/21 17:59:06 oes Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.16 2008/11/02 14:37:47 ler762 Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/Attic/w32res.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
  *
  * Purpose     :  Identifiers for Windows GUI resources.
  *
@@ -34,6 +34,21 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    Revision 1.16  2008/11/02 14:37:47  ler762
+ *    commit the part of the patches I've been using that were written by torford and gjmurphy
+ *      [ 1824315 ] Minor code cleanup
+ *      [ 1781135 ] Patch - Add clear log, select all, and Accelerators for w32
+ *        http://sourceforge.net/tracker/?func=detail&atid=311118&aid=1781135&group_id=11118
+ *    The full patch adds control keys A(select all), C(copy) and D(delete all) to the
+ *    Privoxy log window menu.  Select all and copy work for me without the patch
+ *    (albeit without showing the accelerator keys on the menu), so the only part of the
+ *    patch I've been using for the last year or so has been the ctrl-d to delete
+ *    everything in the Privoxy log window.
+ *
+ *    Revision 1.15  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.13.2.1  2002/08/21 17:59:06  oes
  *     - "Show Privoxy Window" now a toggle
  *     - Temp kludge to let user and default action file be edited through win32 GUI (FR 592080)
@@ -136,6 +151,7 @@
 #define IDI_ANIMATED6                     206
 #define IDI_ANIMATED7                     207
 #define IDI_ANIMATED8                     208
+#define IDI_OFF                           209
 
 #define ID_TOGGLE_SHOWWINDOW              4000
 #define ID_HELP_ABOUT                     4001
@@ -163,13 +179,6 @@
 #define ID_TOOLS_EDITTRUST                5004
 #endif /* def FEATURE_TRUST */
 
-/*
- * The following symbols are declared in <afxres.h> in VC++.
- * However, mingw32 doesn't have that header.  Let's 
- * always declare them here, for consistency.
- * These are the VC++ values.
- */
-#define IDC_STATIC      (-1)
 #define ID_EDIT_COPY  30000