OSDN Git Service

BUG: [ 959729 ] View menu show-items disabled in mergeview
authorKimmo Varis <kimmov@gmail.com>
Sun, 6 Jun 2004 15:26:16 +0000 (15:26 +0000)
committerKimmo Varis <kimmov@gmail.com>
Sun, 6 Jun 2004 15:26:16 +0000 (15:26 +0000)
Src/editlib/editcmd.h
Src/readme.txt

index ed3f74e..89fcd1a 100644 (file)
 #define IDS_FIND_INCREMENTAL_BACKWARD   8641
 #define IDS_FIND_INCREMENTAL_FAILED     8642
 #define IDS_SHEET_OPTIONS               8700
-#define IDR_MARGIN_CURSOR               22900
-#define IDR_DEFAULT_ACCEL               22901
-#define IDR_MARGIN_ICONS                22902
-#define IDR_RTF_ACCEL                   22903
-#define ID_POPUP_EDIT                   32774
-#define ID_POPUP_PRINT                  32775
-#define ID_POPUP_OPEN                   32780
-#define ID_POPUP_COPYSHORTCUT           32781
-#define ID_POPUP_ADDTOFAVORITES         32782
-#define ID_POPUP_ADDTODESKTOP           32783
-#define ID_POPUP_PROPERTIES             32784
-#define ID_VIEW_FULL_SCREEN             32791
-#define ID_CHAR_BOLD                    32799
-#define ID_TOOLS_SPELLING               32800
-#define ID_TOOLS_SPELLING_SET           32801
-#define ID_CHAR_ITALIC                  32802
-#define ID_TOOLS_CHARCODING             32803
-#define ID_CHAR_UNDERLINE               32804
-#define ID_PARA_LEFT                    32805
-#define ID_PARA_CENTER                  32806
-#define ID_PARA_RIGHT                   32807
-#define ID_FILE_RELOAD                  36999
-#define ID_EDIT_FIRST                   37000
-#define ID_EDIT_DELETE                  37000
-#define ID_EDIT_DELETE_BACK             37001
-#define ID_EDIT_DELETE_WORD             37002
-#define ID_EDIT_DELETE_WORD_BACK        37003
-#define ID_EDIT_TAB                     37004
-#define ID_EDIT_UNTAB                   37005
-#define ID_EDIT_SWITCH_OVRMODE          37006
-#define ID_EDIT_CHAR_LEFT               37100
-#define ID_EDIT_EXT_CHAR_LEFT           37101
-#define ID_EDIT_CHAR_RIGHT              37102
-#define ID_EDIT_EXT_CHAR_RIGHT          37103
-#define ID_EDIT_WORD_LEFT               37104
-#define ID_EDIT_EXT_WORD_LEFT           37105
-#define ID_EDIT_WORD_RIGHT              37106
-#define ID_EDIT_EXT_WORD_RIGHT          37107
-#define ID_EDIT_LINE_UP                 37108
-#define ID_EDIT_EXT_LINE_UP             37109
-#define ID_EDIT_LINE_DOWN               37110
-#define ID_EDIT_EXT_LINE_DOWN           37111
-#define ID_EDIT_SCROLL_UP               37112
-#define ID_EDIT_SCROLL_DOWN             37113
-#define ID_EDIT_PAGE_UP                 37114
-#define ID_EDIT_EXT_PAGE_UP             37115
-#define ID_EDIT_PAGE_DOWN               37116
-#define ID_EDIT_EXT_PAGE_DOWN           37117
-#define ID_EDIT_LINE_END                37118
-#define ID_EDIT_EXT_LINE_END            37119
-#define ID_EDIT_HOME                    37120
-#define ID_EDIT_EXT_HOME                37121
-#define ID_EDIT_TEXT_BEGIN              37122
-#define ID_EDIT_EXT_TEXT_BEGIN          37123
-#define ID_EDIT_TEXT_END                37124
-#define ID_EDIT_EXT_TEXT_END            37125
-#define ID_EDIT_TOGGLE_BOOKMARK0        37200
-#define ID_EDIT_TOGGLE_BOOKMARK1        37201
-#define ID_EDIT_TOGGLE_BOOKMARK2        37202
-#define ID_EDIT_TOGGLE_BOOKMARK3        37203
-#define ID_EDIT_TOGGLE_BOOKMARK4        37204
-#define ID_EDIT_TOGGLE_BOOKMARK5        37205
-#define ID_EDIT_TOGGLE_BOOKMARK6        37206
-#define ID_EDIT_TOGGLE_BOOKMARK7        37207
-#define ID_EDIT_TOGGLE_BOOKMARK8        37208
-#define ID_EDIT_TOGGLE_BOOKMARK9        37209
-#define ID_EDIT_GO_BOOKMARK0            37210
-#define ID_EDIT_GO_BOOKMARK1            37211
-#define ID_EDIT_GO_BOOKMARK2            37212
-#define ID_EDIT_GO_BOOKMARK3            37213
-#define ID_EDIT_GO_BOOKMARK4            37214
-#define ID_EDIT_GO_BOOKMARK5            37215
-#define ID_EDIT_GO_BOOKMARK6            37216
-#define ID_EDIT_GO_BOOKMARK7            37217
-#define ID_EDIT_GO_BOOKMARK8            37218
-#define ID_EDIT_GO_BOOKMARK9            37219
-#define ID_EDIT_CLEAR_BOOKMARKS         37220
-#define ID_EDIT_SET_BREAKPOINT          37221
-#define ID_EDIT_ENABLE_BREAKPOINT       37222
-#define ID_EDIT_TOGGLE_BOOKMARK         37223
-#define ID_EDIT_GOTO_NEXT_BOOKMARK      37224
-#define ID_EDIT_GOTO_PREV_BOOKMARK      37225
-#define ID_EDIT_CLEAR_ALL_BOOKMARKS     37226
-#define ID_EDIT_GOTO_LAST_CHANGE        37227
-#define ID_EDIT_FIND_INCREMENTAL_FORWARD 37228
-#define ID_EDIT_FIND_INCREMENTAL_BACKWARD 37229
-#define ID_EDIT_AUTOCOMPLETE            37300
-#define ID_EDIT_AUTOEXPAND              37301
-#define ID_EDIT_MATCHBRACE              37302
-#define ID_EDIT_LOWERCASE               37303
-#define ID_EDIT_UPPERCASE               37304
-#define ID_EDIT_CAPITALIZE              37305
-#define ID_EDIT_SENTENCE                37306
-#define ID_EDIT_SWAPCASE                37307
-#define ID_EDIT_GOTO                    37308
-#define ID_VIEW_OPTIONS                 37400
-#define ID_VIEW_TOGGLE_SRC_HDR          37401
-#define ID_VIEW_SELMARGIN               37402
-#define ID_DATE_TIME                    37403
-#define ID_VIEW_WORDWRAP                37404
-#define ID_READ_ONLY                    37405
-#define ID_SOURCE_PLAIN                 37500
-#define ID_SOURCE_ASP                   37501
-#define ID_SOURCE_BASIC                 37502
-#define ID_SOURCE_BATCH                 37503
-#define ID_SOURCE_C                     37504
-#define ID_SOURCE_AUTODCL               37505
-#define ID_SOURCE_FORTRAN               37506
-#define ID_SOURCE_HTML                  37507
-#define ID_SOURCE_INSTALLSHIELD         37508
-#define ID_SOURCE_JAVA                  37509
-#define ID_SOURCE_AUTOLISP              37510
-#define ID_SOURCE_PASCAL                37511
-#define ID_SOURCE_PERL                  37512
-#define ID_SOURCE_PHP                   37513
-#define ID_SOURCE_PYTHON                37514
-#define ID_SOURCE_REXX                  37515
-#define ID_SOURCE_RSRC                  37516
-#define ID_SOURCE_SGML                  37517
-#define ID_SOURCE_SH                    37518
-#define ID_SOURCE_SIOD                  37519
-#define ID_SOURCE_SQL                   37520
-#define ID_SOURCE_TCL                   37521
-#define ID_SOURCE_TEX                   37522
-#define ID_EDIT_INDICATOR_READ          37901
-#define ID_EDIT_INDICATOR_CRLF          37902
-#define ID_EDIT_INDICATOR_POSITION      37903
-#define ID_INDICATOR_TIME               37904
-#define ID_FORCE_REDRAW                 37999
-#define ID_EDIT_LAST                    37999
+#define IDR_MARGIN_CURSOR               20000
+#define IDR_DEFAULT_ACCEL               20001
+#define IDR_MARGIN_ICONS                20002
+#define IDR_RTF_ACCEL                   20003
+#define ID_POPUP_EDIT                   20032
+#define ID_POPUP_PRINT                  20033
+#define ID_POPUP_OPEN                   20034
+#define ID_POPUP_COPYSHORTCUT           20035
+#define ID_POPUP_ADDTOFAVORITES         20036
+#define ID_POPUP_ADDTODESKTOP           20037
+#define ID_POPUP_PROPERTIES             20038
+#define ID_VIEW_FULL_SCREEN             20064
+#define ID_CHAR_BOLD                    20080
+#define ID_TOOLS_SPELLING               20081
+#define ID_TOOLS_SPELLING_SET           20082
+#define ID_CHAR_ITALIC                  20083
+#define ID_TOOLS_CHARCODING             20084
+#define ID_CHAR_UNDERLINE               20085
+#define ID_PARA_LEFT                    20086
+#define ID_PARA_CENTER                  20087
+#define ID_PARA_RIGHT                   20088
+#define ID_FILE_RELOAD                  20999
+#define ID_EDIT_FIRST                   21000
+#define ID_EDIT_DELETE                  21000
+#define ID_EDIT_DELETE_BACK             21001
+#define ID_EDIT_DELETE_WORD             21002
+#define ID_EDIT_DELETE_WORD_BACK        21003
+#define ID_EDIT_TAB                     21004
+#define ID_EDIT_UNTAB                   21005
+#define ID_EDIT_SWITCH_OVRMODE          21006
+#define ID_EDIT_CHAR_LEFT               21100
+#define ID_EDIT_EXT_CHAR_LEFT           21101
+#define ID_EDIT_CHAR_RIGHT              21102
+#define ID_EDIT_EXT_CHAR_RIGHT          21103
+#define ID_EDIT_WORD_LEFT               21104
+#define ID_EDIT_EXT_WORD_LEFT           21105
+#define ID_EDIT_WORD_RIGHT              21106
+#define ID_EDIT_EXT_WORD_RIGHT          21107
+#define ID_EDIT_LINE_UP                 21108
+#define ID_EDIT_EXT_LINE_UP             21109
+#define ID_EDIT_LINE_DOWN               21110
+#define ID_EDIT_EXT_LINE_DOWN           21111
+#define ID_EDIT_SCROLL_UP               21112
+#define ID_EDIT_SCROLL_DOWN             21113
+#define ID_EDIT_PAGE_UP                 21114
+#define ID_EDIT_EXT_PAGE_UP             21115
+#define ID_EDIT_PAGE_DOWN               21116
+#define ID_EDIT_EXT_PAGE_DOWN           21117
+#define ID_EDIT_LINE_END                21118
+#define ID_EDIT_EXT_LINE_END            21119
+#define ID_EDIT_HOME                    21120
+#define ID_EDIT_EXT_HOME                21121
+#define ID_EDIT_TEXT_BEGIN              21122
+#define ID_EDIT_EXT_TEXT_BEGIN          21123
+#define ID_EDIT_TEXT_END                21124
+#define ID_EDIT_EXT_TEXT_END            21125
+#define ID_EDIT_TOGGLE_BOOKMARK0        21200
+#define ID_EDIT_TOGGLE_BOOKMARK1        21201
+#define ID_EDIT_TOGGLE_BOOKMARK2        21202
+#define ID_EDIT_TOGGLE_BOOKMARK3        21203
+#define ID_EDIT_TOGGLE_BOOKMARK4        21204
+#define ID_EDIT_TOGGLE_BOOKMARK5        21205
+#define ID_EDIT_TOGGLE_BOOKMARK6        21206
+#define ID_EDIT_TOGGLE_BOOKMARK7        21207
+#define ID_EDIT_TOGGLE_BOOKMARK8        21208
+#define ID_EDIT_TOGGLE_BOOKMARK9        21209
+#define ID_EDIT_GO_BOOKMARK0            21210
+#define ID_EDIT_GO_BOOKMARK1            21211
+#define ID_EDIT_GO_BOOKMARK2            21212
+#define ID_EDIT_GO_BOOKMARK3            21213
+#define ID_EDIT_GO_BOOKMARK4            21214
+#define ID_EDIT_GO_BOOKMARK5            21215
+#define ID_EDIT_GO_BOOKMARK6            21216
+#define ID_EDIT_GO_BOOKMARK7            21217
+#define ID_EDIT_GO_BOOKMARK8            21218
+#define ID_EDIT_GO_BOOKMARK9            21219
+#define ID_EDIT_CLEAR_BOOKMARKS         21220
+#define ID_EDIT_SET_BREAKPOINT          21221
+#define ID_EDIT_ENABLE_BREAKPOINT       21222
+#define ID_EDIT_TOGGLE_BOOKMARK         21223
+#define ID_EDIT_GOTO_NEXT_BOOKMARK      21224
+#define ID_EDIT_GOTO_PREV_BOOKMARK      21225
+#define ID_EDIT_CLEAR_ALL_BOOKMARKS     21226
+#define ID_EDIT_GOTO_LAST_CHANGE        21227
+#define ID_EDIT_FIND_INCREMENTAL_FORWARD 21228
+#define ID_EDIT_FIND_INCREMENTAL_BACKWARD 21229
+#define ID_EDIT_AUTOCOMPLETE            21300
+#define ID_EDIT_AUTOEXPAND              21301
+#define ID_EDIT_MATCHBRACE              21302
+#define ID_EDIT_LOWERCASE               21303
+#define ID_EDIT_UPPERCASE               21304
+#define ID_EDIT_CAPITALIZE              21305
+#define ID_EDIT_SENTENCE                21306
+#define ID_EDIT_SWAPCASE                21307
+#define ID_EDIT_GOTO                    21308
+#define ID_VIEW_OPTIONS                 21400
+#define ID_VIEW_TOGGLE_SRC_HDR          21401
+#define ID_VIEW_SELMARGIN               21402
+#define ID_DATE_TIME                    21403
+#define ID_VIEW_WORDWRAP                21404
+#define ID_READ_ONLY                    21405
+#define ID_SOURCE_PLAIN                 21500
+#define ID_SOURCE_ASP                   21501
+#define ID_SOURCE_BASIC                 21502
+#define ID_SOURCE_BATCH                 21503
+#define ID_SOURCE_C                     21504
+#define ID_SOURCE_AUTODCL               21505
+#define ID_SOURCE_FORTRAN               21506
+#define ID_SOURCE_HTML                  21507
+#define ID_SOURCE_INSTALLSHIELD         21508
+#define ID_SOURCE_JAVA                  21509
+#define ID_SOURCE_AUTOLISP              21510
+#define ID_SOURCE_PASCAL                21511
+#define ID_SOURCE_PERL                  21512
+#define ID_SOURCE_PHP                   21513
+#define ID_SOURCE_PYTHON                21514
+#define ID_SOURCE_REXX                  21515
+#define ID_SOURCE_RSRC                  21516
+#define ID_SOURCE_SGML                  21517
+#define ID_SOURCE_SH                    21518
+#define ID_SOURCE_SIOD                  21519
+#define ID_SOURCE_SQL                   21520
+#define ID_SOURCE_TCL                   21521
+#define ID_SOURCE_TEX                   21522
+#define ID_EDIT_INDICATOR_READ          21901
+#define ID_EDIT_INDICATOR_CRLF          21902
+#define ID_EDIT_INDICATOR_POSITION      21903
+#define ID_INDICATOR_TIME               21904
+#define ID_FORCE_REDRAW                 21999
+#define ID_EDIT_LAST                    21999
 #define ID_HELP_TIPOFTHEDAY             39000
 #define ID_FORMAT_SHOW_ADDRESS          40001
 #define ID_FORMAT_SHOW_HEX              40002
 #define ID_FORMAT_BPR_LAST              40026
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        1002
index 2653c30..5bd519d 100644 (file)
@@ -1,3 +1,8 @@
+2004-06-06 Kimmo
+ BUG: [ 959729 ] View menu show-items disabled in mergeview
+  Second try, renumber items in editlib/editcmd.h
+  Src/editlib/editcmd.h
+
 2004-06-06 Laoran
  update for MergeSwedish.rc ; contribution from Hans Eriksson
   Language/Swedish: MergeSwedish.rc