X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32res.h;h=2bff98885f9dc2f1a70fc03d15d843080246426c;hp=33a37200cd2363b69bd90df474082f4d43559c91;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hpb=362f5979d9efa6e7c1c38c1b75e41e91c710772b

diff --git a/w32res.h b/w32res.h
index 33a37200..2bff9888 100644
--- a/w32res.h
+++ b/w32res.h
@@ -1,6 +1,6 @@
-#ifndef _W32RES_H
-#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.7 2001/06/07 23:08:12 jongfoster Exp $"
+#ifndef W32RES_H_INCLUDED
+#define W32RES_H_INCLUDED
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.9 2001/07/29 18:43:08 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
@@ -34,6 +34,13 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    Revision 1.9  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
+ *    Revision 1.8  2001/07/13 14:04:59  oes
+ *    Removed all #ifdef PCRS
+ *
  *    Revision 1.7  2001/06/07 23:08:12  jongfoster
  *    Forward and ACL edit options removed.
  *
@@ -94,22 +101,12 @@
  *
  *********************************************************************/
 
-#ifdef WIN_GUI_EDIT
-#define IDS_NEW_BLOCKER                   1
-
-#define ID_NEW_BLOCKER                    100
-#endif /* def WIN_GUI_EDIT */
-
 #define IDR_TRAYMENU                      101
 #define IDI_IDLE                          102
 #define IDR_LOGVIEW                       103
 #define IDR_ACCELERATOR                   104
 #define IDR_POPUP_SELECTION               105
 
-#ifdef WIN_GUI_EDIT
-#define IDD_RULES                         106
-#endif /* def WIN_GUI_EDIT */
-
 
 #define IDI_JUNKBUSTER                    200
 #define IDI_JUNKBUSTER1                   201
@@ -121,20 +118,6 @@
 #define IDI_JUNKBUSTER7                   207
 #define IDI_JUNKBUSTER8                   208
 
-#ifdef WIN_GUI_EDIT
-#define IDI_DENYRULE                      209
-#define IDI_ALLOWRULE                     210
-
-#define IDC_NEW                           300
-#define IDC_ACTION                        301
-#define IDC_RULES                         302
-#define IDC_CREATE                        303
-#define IDC_MOVEUP                        304
-#define IDC_MOVEDOWN                      305
-#define IDC_DELETE                        306
-#define IDC_SAVE                          307
-#endif /* def WIN_GUI_EDIT */
-
 #define ID_SHOWWINDOW                     4000
 #define ID_HELP_ABOUTJUNKBUSTER           4001
 #define ID_FILE_EXIT                      4002
@@ -147,18 +130,18 @@
 #define ID_HELP_MANUAL                    4009
 #define ID_HELP_GPL                       4010
 #define ID_HELP_STATUS                    4011
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
 #define ID_TOGGLE_IJB                     4012
-#endif
+#endif /* def FEATURE_TOGGLE */
 
 /* Break these out so they are easier to extend, but keep consecutive */
 #define ID_TOOLS_EDITJUNKBUSTER           5000
 #define ID_TOOLS_EDITACTIONS              5001
 #define ID_TOOLS_EDITPERLRE               5002
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
 #define ID_TOOLS_EDITTRUST                5003
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
 /*
  * The following symbols are declared in <afxres.h> in VC++.
@@ -170,7 +153,7 @@
 #define ID_EDIT_COPY  30000
 
 
-#endif /* ndef _W32RES_H */
+#endif /* ndef W32RES_H_INCLUDED */
 
 /*
   Local Variables: