No longer using explicit values for resource identification.

programs/winhelp/Da.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
 {
  POPUP "&Filer" {
-  MENUITEM "&bn...", 0x101
+  MENUITEM "&bn...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Udskriv emne", 0x104
-  MENUITEM "&Indstil printer", 0x106
+  MENUITEM "&Udskriv emne", MNID_FILE_PRINT
+  MENUITEM "&Indstil printer", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Afslut", 0x108
+  MENUITEM "&Afslut", MNID_FILE_EXIT
  }
  POPUP "&Rediger" {
-   MENUITEM "K&opier...", 0x10A
+   MENUITEM "K&opier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Anmrk...", 0x10C
+   MENUITEM "&Anmrk...", MNID_EDIT_ANNOTATE
  }
  POPUP "Bog&mrke" {
-   MENUITEM "&Definer...", 0x10E
+   MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
  POPUP "&Hjlp" {
-   MENUITEM "&Brug af Hjlp", 0x110
-   MENUITEM "Altid &verst", 0x111
+   MENUITEM "&Brug af Hjlp", MNID_HELP_HELPON
+   MENUITEM "Altid &verst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "Om &WINE", 0x114
+   MENUITEM "Om &WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"WINE Hjlp"
-WHERROR, 		"FEJL"
-WARNING,  		"ADVARSEL"
-INFO,  			"Information"
-NOT_IMPLEMENTED, 	"Ikke implementeret"
-HLPFILE_ERROR_s, 	"Fejl ved lsning af filen `%s'"
-CONTENTS, 		"&Indhold"
-SEARCH, 		"&Sg"
-BACK, 			"&Tilbage"
-HISTORY, 		"&Oversigt"
-ALL_FILES, 		"Alle filer (*.*)"
-HELP_FILES_HLP, 	"Hjlpe filer (*.hlp)"
+STID_WINE_HELP, 	"WINE Hjlp"
+STID_WHERROR, 		"FEJL"
+STID_WARNING,  		"ADVARSEL"
+STID_INFO,  		"Information"
+STID_NOT_IMPLEMENTED, 	"Ikke implementeret"
+STID_HLPFILE_ERROR_s, 	"Fejl ved lsning af filen `%s'"
+STID_CONTENTS, 		"&Indhold"
+STID_SEARCH, 		"&Sg"
+STID_BACK, 		"&Tilbage"
+STID_HISTORY, 		"&Oversigt"
+STID_TOPICS, 		"To&pics"
+STID_ALL_FILES, 	"Alle filer (*.*)"
+STID_HELP_FILES_HLP, 	"Hjlpe filer (*.hlp)"
 }

programs/winhelp/De.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 {
  POPUP "&Datei" {
-  MENUITEM "&ffnen...", 0x101
+  MENUITEM "&ffnen...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "Thema &drucken", 0x104
-  MENUITEM "Drucker&einrichtung...", 0x106
+  MENUITEM "Thema &drucken", MNID_FILE_PRINT
+  MENUITEM "Drucker&einrichtung...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Beenden", 0x108
+  MENUITEM "&Beenden", MNID_FILE_EXIT
  }
  POPUP "&Bearbeiten" {
-   MENUITEM "&Kopieren...", 0x10A
+   MENUITEM "&Kopieren...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Anmerken...", 0x10C
+   MENUITEM "&Anmerken...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Lesezeichen" {
-   MENUITEM "&Definieren...", 0x10E
+   MENUITEM "&Definieren...", MNID_BKMK_DEFINE
  }
  POPUP "&Hilfe" {
-   MENUITEM "&Hilfe benutzen", 0x110
-   MENUITEM "Immer im &Vordergrund", 0x111
+   MENUITEM "&Hilfe benutzen", MNID_HELP_HELPON
+   MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&ber WINE", 0x114
+   MENUITEM "&ber WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"WINE Hilfe"
-WHERROR, 		"FEHLER"
-WARNING,  		"ACHTUNG"
-INFO,  			"Information"
-NOT_IMPLEMENTED, 	"Nicht implementiert"
-HLPFILE_ERROR_s, 	"Fehler beim Lesen der Hilfe-Datei `%s'"
-CONTENTS, 		"&Inhalt"
-SEARCH, 		"&Suchen"
-BACK, 			"&Zurck"
-HISTORY, 		"&Bisher"
-ALL_FILES, 		"Alle Dateien (*.*)"
-HELP_FILES_HLP, 	"Hilfe-Dateien (*.hlp)"
+STID_WINE_HELP, 	"WINE Hilfe"
+STID_WHERROR, 		"FEHLER"
+STID_WARNING,  		"ACHTUNG"
+STID_INFO,  		"Information"
+STID_NOT_IMPLEMENTED, 	"Nicht implementiert"
+STID_HLPFILE_ERROR_s, 	"Fehler beim Lesen der Hilfe-Datei `%s'"
+STID_CONTENTS, 		"&Inhalt"
+STID_SEARCH, 		"&Suchen"
+STID_BACK, 		"&Zurck"
+STID_HISTORY, 		"&Bisher"
+STID_TOPICS, 		"&Topics"
+STID_ALL_FILES, 	"Alle Dateien (*.*)"
+STID_HELP_FILES_HLP, 	"Hilfe-Dateien (*.hlp)"
 }

programs/winhelp/En.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 {
  POPUP "&File" {
-  MENUITEM "&Open", 0x101
+  MENUITEM "&Open", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Print", 0x104
-  MENUITEM "Printer &setup...", 0x106
+  MENUITEM "&Print", MNID_FILE_PRINT
+  MENUITEM "Printer &setup...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Exit", 0x108
+  MENUITEM "&Exit", MNID_FILE_EXIT
  }
  POPUP "&Edit" {
-   MENUITEM "&Copy...", 0x10A
+   MENUITEM "&Copy...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annotate...", 0x10C
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Bookmark" {
-   MENUITEM "&Define...", 0x10E
+   MENUITEM "&Define...", MNID_BKMK_DEFINE
  }
  POPUP "&Help" {
-   MENUITEM "Help &on help", 0x110
-   MENUITEM "Always on &top", 0x111
+   MENUITEM "Help &on help", MNID_HELP_HELPON
+   MENUITEM "Always on &top", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&About WINE", 0x114
+   MENUITEM "&About WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -53,16 +53,17 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"WINE Help"
-WHERROR, 		"ERROR"
-WARNING,  		"WARNING"
-INFO,  			"Information"
-NOT_IMPLEMENTED, 	"Not implemented"
-HLPFILE_ERROR_s, 	"Error while reading the help file `%s'"
-CONTENTS, 		"&Contents"
-SEARCH, 		"&Search"
-BACK, 			"&Back"
-HISTORY, 		"&History"
-ALL_FILES, 		"All files (*.*)"
-HELP_FILES_HLP, 	"Help files (*.hlp)"
+STID_WINE_HELP, 	"WINE Help"
+STID_WHERROR, 		"ERROR"
+STID_WARNING,  		"WARNING"
+STID_INFO,  		"Information"
+STID_NOT_IMPLEMENTED, 	"Not implemented"
+STID_HLPFILE_ERROR_s, 	"Error while reading the help file `%s'"
+STID_CONTENTS, 		"&Contents"
+STID_SEARCH, 		"&Search"
+STID_BACK, 		"&Back"
+STID_HISTORY, 		"&History"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"All files (*.*)"
+STID_HELP_FILES_HLP, 	"Help files (*.hlp)"
 }

programs/winhelp/Es.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 {
  POPUP "&Archivo" {
-  MENUITEM "A&brir...", 0x101
+  MENUITEM "A&brir...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Imprimir", 0x104
-  MENUITEM "&Configuracin Impresora...", 0x106
+  MENUITEM "&Imprimir", MNID_FILE_PRINT
+  MENUITEM "&Configuracin Impresora...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Salir", 0x108
+  MENUITEM "&Salir", MNID_FILE_EXIT
  }
  POPUP "&Editar" {
-   MENUITEM "&Copiar...", 0x10A
+   MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Anotar...", 0x10C
+   MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Marcador" {
-   MENUITEM "&Definir...", 0x10E
+   MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
  POPUP "&Ayuda" {
-   MENUITEM "&Ayuda sobre la ayuda", 0x110
-   MENUITEM "&Toujours visible", 0x111
+   MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
+   MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Acerca de WINE", 0x114
+   MENUITEM "&Acerca de WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"Ayuda de WINE"
-WHERROR, 		"ERROR"
-WARNING,  		"CUIDADO"
-INFO,  			"Informacin"
-NOT_IMPLEMENTED, 	"An no implementado"
-HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
-CONTENTS, 		"&Indice"
-SEARCH, 		"&Buscar"
-BACK, 			"&Anterior"
-HISTORY, 		"&Historia"
-ALL_FILES, 		"Todos los archivos (*.*)"
-HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
+STID_WINE_HELP, 	"Ayuda de WINE"
+STID_WHERROR, 		"ERROR"
+STID_WARNING,  		"CUIDADO"
+STID_INFO,  		"Informacin"
+STID_NOT_IMPLEMENTED, 	"An no implementado"
+STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
+STID_CONTENTS, 		"&Indice"
+STID_SEARCH, 		"&Buscar"
+STID_BACK, 		"&Anterior"
+STID_HISTORY, 		"&Historia"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"Todos los archivos (*.*)"
+STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
 }

programs/winhelp/Fi.rc

@@ -25,28 +25,28 @@
 MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
 {
  POPUP "&Tiedosto" {
-  MENUITEM "&Avaa...", 0x101
+  MENUITEM "&Avaa...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Tulosta", 0x104
-  MENUITEM "&Kirjoittimen asetukset...", 0x106
+  MENUITEM "&Tulosta", MNID_FILE_PRINT
+  MENUITEM "&Kirjoittimen asetukset...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Lopeta", 0x108
+  MENUITEM "&Lopeta", MNID_FILE_EXIT
  }
  POPUP "&Muokkaa" {
-   MENUITEM "&Kopioi...", 0x10A
+   MENUITEM "&Kopioi...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Huomautus...", 0x10C
+   MENUITEM "&Huomautus...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Kirjanmerkki" {
-   MENUITEM "&Aseta...", 0x10E
+   MENUITEM "&Aseta...", MNID_BKMK_DEFINE
  }
  POPUP "&Ohje" {
-   MENUITEM "&Ohjeen kytt", 0x110
-   MENUITEM "&Aina pllimmisen", 0x111
+   MENUITEM "&Ohjeen kytt", MNID_HELP_HELPON
+   MENUITEM "&Aina pllimmisen", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "T&ietoja...", 0x113
+   MENUITEM "T&ietoja...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Tietoja WINEst", 0x114
+   MENUITEM "&Tietoja WINEst", MNID_HELP_WINE
 #endif
  }
 }
@@ -55,16 +55,17 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"WINE Ohje"
-WHERROR, 		"VIRHE"
-WARNING,  		"VAROITUS"
-INFO,  			"Tietoja"
-NOT_IMPLEMENTED, 	"Ei kytettviss"
-HLPFILE_ERROR_s, 	"Virhe luettaessa ohjetiedostoa `%s'"
-CONTENTS, 		"&Sisllys"
-SEARCH, 		"&Etsi"
-BACK, 			"&Takaisin"
-HISTORY, 		"&Luetut"
-ALL_FILES, 		"Kaikki tiedostot (*.*)"
-HELP_FILES_HLP, 	"Ohjetiedostot (*.hlp)"
+STID_WINE_HELP, 	"WINE Ohje"
+STID_WHERROR, 		"VIRHE"
+STID_WARNING,  		"VAROITUS"
+STID_INFO,  		"Tietoja"
+STID_NOT_IMPLEMENTED, 	"Ei kytettviss"
+STID_HLPFILE_ERROR_s, 	"Virhe luettaessa ohjetiedostoa `%s'"
+STID_CONTENTS, 		"&Sisllys"
+STID_SEARCH, 		"&Etsi"
+STID_BACK, 		"&Takaisin"
+STID_HISTORY, 		"&Luetut"
+STID_TOPICS,		"T&opics"
+STID_ALL_FILES, 	"Kaikki tiedostot (*.*)"
+STID_HELP_FILES_HLP, 	"Ohjetiedostot (*.hlp)"
 }

programs/winhelp/Fr.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 {
  POPUP "&Fichier" {
-  MENUITEM "&Ouvrir", 0x101
+  MENUITEM "&Ouvrir", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "Im&primer", 0x104
-  MENUITEM "&Configuration de l'imprimante...", 0x106
+  MENUITEM "Im&primer", MNID_FILE_PRINT
+  MENUITEM "&Configuration de l'imprimante...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Quitter", 0x108
+  MENUITEM "&Quitter", MNID_FILE_EXIT
  }
  POPUP "&Edition" {
-   MENUITEM "&Copier...", 0x10A
+   MENUITEM "&Copier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annotation...", 0x10C
+   MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Signet" {
-   MENUITEM "&Dfinir...", 0x10E
+   MENUITEM "&Dfinir...", MNID_BKMK_DEFINE
  }
  POPUP "&?" {
-   MENUITEM "&Utiliser l'aide", 0x110
-   MENUITEM "&Toujours visible", 0x111
+   MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
+   MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&A propos de WINE", 0x114
+   MENUITEM "&A propos de WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"Aide de WINE"
-WHERROR, 		"ERREUR"
-WARNING,  		"ATTENTION"
-INFO,  			"Information"
-NOT_IMPLEMENTED, 	"Non implement"
-HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide `%s'"
-CONTENTS, 		"&Index"
-SEARCH, 		"&Rechercher"
-BACK, 			"&Prcdent"
-HISTORY, 		"&Historique"
-ALL_FILES, 		"Tout fichier (*.*)"
-HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"
+STID_WINE_HELP, 	"Aide de WINE"
+STID_WHERROR, 		"ERREUR"
+STID_WARNING,  		"ATTENTION"
+STID_INFO,  		"Information"
+STID_NOT_IMPLEMENTED, 	"Non implement"
+STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide `%s'"
+STID_CONTENTS, 		"&Index"
+STID_SEARCH, 		"&Rechercher"
+STID_BACK, 		"&Prcdent"
+STID_HISTORY, 		"&Historique"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"Tout fichier (*.*)"
+STID_HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"
 }

programs/winhelp/Hu.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
 {
  POPUP "&File" {
-  MENUITEM "&Megnyits...", 0x101
+  MENUITEM "&Megnyits...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Nyomtats", 0x104
-  MENUITEM "Nyomtat &bellts...", 0x106
+  MENUITEM "&Nyomtats", MNID_FILE_PRINT
+  MENUITEM "Nyomtat &bellts...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Kilps", 0x108
+  MENUITEM "&Kilps", MNID_FILE_EXIT
  }
  POPUP "&Szerkeszts" {
-   MENUITEM "&Msols...", 0x10A
+   MENUITEM "&Msols...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annotate...", 0x10C
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Knyvjelz" {
-   MENUITEM "&Definils...", 0x10E
+   MENUITEM "&Definils...", MNID_BKMK_DEFINE
  }
  POPUP "&Segtsg" {
-   MENUITEM "Segtsg &a segtsgrl", 0x110
-   MENUITEM "Mindig &legfell", 0x111
+   MENUITEM "Segtsg &a segtsgrl", MNID_HELP_HELPON
+   MENUITEM "Mindig &legfell", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Informci...", 0x113
+   MENUITEM "&Informci...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&&A WINE-rl", 0x114
+   MENUITEM "&&A WINE-rl", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"WINE segtsg"
-WHERROR, 		"HIBA"
-WARNING,  		"FIGYELMEZTETS"
-INFO,  			"Informci"
-NOT_IMPLEMENTED, 	"Nincs implementlva"
-HLPFILE_ERROR_s, 	"Hiba a `%s' file olvassakor"
-CONTENTS, 		"&Tartalom"
-SEARCH, 		"&Keress"
-BACK, 			"&Vissza"
-HISTORY, 		"&History"
-ALL_FILES, 		"Minden file (*.*)"
-HELP_FILES_HLP, 	"Segtsg file-ok (*.hlp)"
+STID_WINE_HELP, 	"WINE segtsg"
+STID_WHERROR, 		"HIBA"
+STID_WARNING,  		"FIGYELMEZTETS"
+STID_INFO,  		"Informci"
+STID_NOT_IMPLEMENTED, 	"Nincs implementlva"
+STID_HLPFILE_ERROR_s, 	"Hiba a `%s' file olvassakor"
+STID_CONTENTS, 		"&Tartalom"
+STID_SEARCH, 		"&Keress"
+STID_BACK, 		"&Vissza"
+STID_HISTORY, 		"&History"
+STID_TOPICS,		"T&opics"
+STID_ALL_FILES, 	"Minden file (*.*)"
+STID_HELP_FILES_HLP, 	"Segtsg file-ok (*.hlp)"
 }

programs/winhelp/It.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 {
  POPUP "&File" {
-  MENUITEM "&Apri...", 0x101
+  MENUITEM "&Apri...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "s&tampa", 0x104
-  MENUITEM "&Setup stampante...", 0x106
+  MENUITEM "s&tampa", MNID_FILE_PRINT
+  MENUITEM "&Setup stampante...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Esci", 0x108
+  MENUITEM "&Esci", MNID_FILE_EXIT
  }
  POPUP "&Modifica" {
-   MENUITEM "&Copia...", 0x10A
+   MENUITEM "&Copia...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annota...", 0x10C
+   MENUITEM "&Annota...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Segnalibro" {
-   MENUITEM "&Definisci...", 0x10E
+   MENUITEM "&Definisci...", MNID_BKMK_DEFINE
  }
  POPUP "&?" {
-   MENUITEM "&Aiuto sulla guida", 0x110
-   MENUITEM "Sempre in primo &piano", 0x111
+   MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON
+   MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Informazioni su...", 0x113
+   MENUITEM "&Informazioni su...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Informazion su WINE", 0x114
+   MENUITEM "&Informazion su WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"Guida di WINE"
-WHERROR, 		"ERRORE"
-WARNING,  		"ATTENZIONE"
-INFO,  			"Informazione"
-NOT_IMPLEMENTED, 	"Non ancora implementato"
-HLPFILE_ERROR_s, 	"Errore di lettura HelpFile `%s'"
-CONTENTS, 		"&Sommario"
-SEARCH, 		"&Ricerca"
-BACK, 			"&Precedente"
-HISTORY, 		"&Indice"
-ALL_FILES, 		"Tutti i file (*.*)"
-HELP_FILES_HLP, 	"HelpFiles (*.hlp)"
+STID_WINE_HELP, 	"Guida di WINE"
+STID_WHERROR, 		"ERRORE"
+STID_WARNING,  		"ATTENZIONE"
+STID_INFO,  		"Informazione"
+STID_NOT_IMPLEMENTED, 	"Non ancora implementato"
+STID_HLPFILE_ERROR_s, 	"Errore di lettura HelpFile `%s'"
+STID_CONTENTS, 		"&Sommario"
+STID_SEARCH, 		"&Ricerca"
+STID_BACK, 		"&Precedente"
+STID_HISTORY, 		"&Indice"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"Tutti i file (*.*)"
+STID_HELP_FILES_HLP, 	"HelpFiles (*.hlp)"
 }

programs/winhelp/Ko.rc

@@ -24,28 +24,28 @@
 MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
 {
  POPUP "파일(&F)" {
-  MENUITEM "열기(&O)...", 0x101
+  MENUITEM "열기(&O)...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "인쇄(&P)", 0x104
-  MENUITEM "프린터 설정(&S)...", 0x106
+  MENUITEM "인쇄(&P)", MNID_FILE_PRINT
+  MENUITEM "프린터 설정(&S)...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "종료(&E)", 0x108
+  MENUITEM "종료(&E)", MNID_FILE_EXIT
  }
  POPUP "편집(&E)" {
-   MENUITEM "복사(&C)...", 0x10A
+   MENUITEM "복사(&C)...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "주석(&A)...", 0x10C
+   MENUITEM "주석(&A)...", MNID_EDIT_ANNOTATE
  }
  POPUP "책갈피(&B)" {
-   MENUITEM "정의(&D)...", 0x10E
+   MENUITEM "정의(&D)...", MNID_BKMK_DEFINE
  }
  POPUP "도움말(&H)" {
-   MENUITEM "도움말 사용법(&O)", 0x110
-   MENUITEM "항상 위(&T)", 0x111
+   MENUITEM "도움말 사용법(&O)", MNID_HELP_HELPON
+   MENUITEM "항상 위(&T)", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "정보(&I)...", 0x113
+   MENUITEM "정보(&I)...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "와인에 관하여(&A)", 0x114
+   MENUITEM "와인에 관하여(&A)", MNID_HELP_WINE
 #endif
  }
 }
@@ -54,16 +54,17 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"와인 도움말"
-WHERROR, 		"오류"
-WARNING,  		"경고"
-INFO,  			"정보"
-NOT_IMPLEMENTED, 	"구현되지 않았음"
-HLPFILE_ERROR_s, 	"도움말 파일 `%s'를 읽는 도중 오류 발생"
-CONTENTS, 		"목차(&C)"
-SEARCH, 		"찾기(&S)"
-BACK, 			"뒤로(&B)"
-HISTORY, 		"히스토리(&H)"
-ALL_FILES, 		"모든 파일 (*.*)"
-HELP_FILES_HLP, 	"도움말 파일 (*.hlp)"
+STID_WINE_HELP, 	"와인 도움말"
+STID_WHERROR, 		"오류"
+STID_WARNING,  		"경고"
+STID_INFO,  		"정보"
+STID_NOT_IMPLEMENTED, 	"구현되지 않았음"
+STID_HLPFILE_ERROR_s, 	"도움말 파일 `%s'를 읽는 도중 오류 발생"
+STID_CONTENTS, 		"목차(&C)"
+STID_SEARCH, 		"찾기(&S)"
+STID_BACK, 		"뒤로(&B)"
+STID_HISTORY, 		"히스토리(&H)"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"모든 파일 (*.*)"
+STID_HELP_FILES_HLP, 	"도움말 파일 (*.hlp)"
 }

programs/winhelp/Makefile.in

@@ -2,6 +2,7 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
+WRCFLAGS  = -DWINELIB
 MODULE    = winhelp.exe
 APPMODE   = gui
 IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32

programs/winhelp/Pt.rc

@@ -25,28 +25,28 @@
 MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 {
  POPUP "&Arquiv" {
-  MENUITEM "A&brir...", 0x101
+  MENUITEM "A&brir...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Imprimir", 0x104
-  MENUITEM "&Configurar Impressora...", 0x106
+  MENUITEM "&Imprimir", MNID_FILE_PRINT
+  MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Sair", 0x108
+  MENUITEM "&Sair", MNID_FILE_EXIT
  }
  POPUP "&Editar" {
-   MENUITEM "&Copiar...", 0x10A
+   MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Anotar...", 0x10C
+   MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Marcador" {
-   MENUITEM "&Definir...", 0x10E
+   MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
  POPUP "&Ajuda" {
-   MENUITEM "Ajuda &na ajuda", 0x110
-   MENUITEM "Sempre &visvel", 0x111
+   MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
+   MENUITEM "Sempre &visvel", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Sobre WINE", 0x114
+   MENUITEM "&Sobre WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -55,16 +55,17 @@ MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"Ajuda WINE"
-WHERROR, 		"ERRO"
-WARNING,  		"AVISO"
-INFO,  			"Informai"
-NOT_IMPLEMENTED, 	"No implementado"
-HLPFILE_ERROR_s, 	"Foi encontrado um erro enquanto lia `%s'"
-CONTENTS, 		"&Contedo"
-SEARCH, 		"&Procurar"
-BACK, 			"&Voltar"
-HISTORY, 		"&Histrico"
-ALL_FILES, 		"Todos os arquivo (*.*)"
-HELP_FILES_HLP, 	"Arquivos de ajuda (*.hlp)"
+STID_WINE_HELP, 	"Ajuda WINE"
+STID_WHERROR, 		"ERRO"
+STID_WARNING,  		"AVISO"
+STID_INFO,  		"Informai"
+STID_NOT_IMPLEMENTED, 	"No implementado"
+STID_HLPFILE_ERROR_s, 	"Foi encontrado um erro enquanto lia `%s'"
+STID_CONTENTS, 		"&Contedo"
+STID_SEARCH, 		"&Procurar"
+STID_BACK, 		"&Voltar"
+STID_HISTORY, 		"&Histrico"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"Todos os arquivo (*.*)"
+STID_HELP_FILES_HLP, 	"Arquivos de ajuda (*.hlp)"
 }

programs/winhelp/Si.rc

@@ -23,28 +23,28 @@
 MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 {
  POPUP "&Datoteka" {
-  MENUITEM "&Odpri ...", 0x101
+  MENUITEM "&Odpri ...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "Na&tisni temo ...", 0x104
-  MENUITEM "&Priprava tiskalnika", 0x106
+  MENUITEM "Na&tisni temo ...", MNID_FILE_PRINT
+  MENUITEM "&Priprava tiskalnika", MNID_FILE_SETUP
   MENUITEM SEPARATOR
-  MENUITEM "Iz&hod", 0x108
+  MENUITEM "Iz&hod", MNID_FILE_EXIT
  }
  POPUP "&Urejanje" {
-   MENUITEM "&Kopiraj", 0x10A
+   MENUITEM "&Kopiraj", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Pripombe ...", 0x10C
+   MENUITEM "&Pripombe ...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Zaznamek" {
-   MENUITEM "&Doloi ...", 0x10E
+   MENUITEM "&Doloi ...", MNID_BKMK_DEFINE
  }
  POPUP "&Pomo" {
-   MENUITEM "&O pomoi", 0x110
-   MENUITEM "Vedno na &vrhu", 0x111
+   MENUITEM "&O pomoi", MNID_HELP_HELPON
+   MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Informacije ...", 0x113
+   MENUITEM "&Informacije ...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&O WINE", 0x114
+   MENUITEM "&O WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -52,16 +52,16 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 {
-WINE_HELP, 		"WINE Pomo"
-WHERROR, 		"NAPAKA"
-WARNING,  		"OPOZORILO"
-INFO,  			"Informacija"
-NOT_IMPLEMENTED, 	"Ni (e) na voljo"
-HLPFILE_ERROR_s, 	"Napaka pri branju datoteke `%s'"
-CONTENTS, 		"&Teme pomoi"
-SEARCH, 		"&Iskanje"
-BACK, 			"&Nazaj"
-HISTORY, 		"&Zgodovina"
-ALL_FILES, 		"Vse datiteke (*.*)"
-HELP_FILES_HLP, 	"Datoteke s pomojo (*.hlp)"
+STID_WINE_HELP, 		"WINE Pomo"
+STID_WHERROR, 		"NAPAKA"
+STID_WARNING,  		"OPOZORILO"
+STID_INFO,  			"Informacija"
+STID_NOT_IMPLEMENTED, 	"Ni (e) na voljo"
+STID_HLPFILE_ERROR_s, 	"Napaka pri branju datoteke `%s'"
+STID_CONTENTS, 		"&Teme pomoi"
+STID_SEARCH, 		"&Iskanje"
+STID_BACK, 			"&Nazaj"
+STID_HISTORY, 		"&Zgodovina"
+STID_ALL_FILES, 		"Vse datiteke (*.*)"
+STID_HELP_FILES_HLP, 	"Datoteke s pomojo (*.hlp)"
 }

programs/winhelp/Sk.rc

@@ -21,27 +21,27 @@
 MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 {
  POPUP "&Sbor" {
-   MENUITEM "&Otvori...", 0x101
+   MENUITEM "&Otvori...", MNID_FILE_OPEN
    MENUITEM SEPARATOR
-   MENUITEM "&Tlai", 0x104
-   MENUITEM "&Nastavenie tlae...", 0x106
-   MENUITEM "U&koni", 0x108
+   MENUITEM "&Tlai", MNID_FILE_PRINT
+   MENUITEM "&Nastavenie tlae...", MNID_FILE_SETUP
+   MENUITEM "U&koni", MNID_FILE_EXIT
  }
  POPUP "&Upravi" {
-   MENUITEM "Kop&rova...", 0x10a
+   MENUITEM "Kop&rova...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Skomentova...", 0x10c
+   MENUITEM "&Skomentova...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Zloka" {
-   MENUITEM "&Definova...", 0x10e
+   MENUITEM "&Definova...", MNID_BKMK_DEFINE
  }
  POPUP "&Pomoc" {
-   MENUITEM "Pomoc &na pomoci", 0x110
-   MENUITEM "Vdy na &vrchu", 0x111
+   MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON
+   MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Info...", 0x113
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "O& WINE", 0x114
+   MENUITEM "O& WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -49,16 +49,16 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 {
-WINE_HELP,             "WINE Pomoc"
-WHERROR,               "CHYBA"
-WARNING,               "VAROVANIE"
-INFO,                  "Informcie"
-NOT_IMPLEMENTED,       "Neimplementovan"
-HLPFILE_ERROR_s,       "Chyba poas tania sboru `%s'"
-CONTENTS,              "&Obsah"
-SEARCH,                "&Hada"
-BACK,                  "&Sp"
-HISTORY,               "&Histria"
-ALL_FILES,             "Vetky sbory (*.*)"
-HELP_FILES_HLP,        "Sbory pomoci (*.hlp)"
+STID_WINE_HELP,             "WINE Pomoc"
+STID_WHERROR,               "CHYBA"
+STID_WARNING,               "VAROVANIE"
+STID_INFO,                  "Informcie"
+STID_NOT_IMPLEMENTED,       "Neimplementovan"
+STID_HLPFILE_ERROR_s,       "Chyba poas tania sboru `%s'"
+STID_CONTENTS,              "&Obsah"
+STID_SEARCH,                "&Hada"
+STID_BACK,                  "&Sp"
+STID_HISTORY,               "&Histria"
+STID_ALL_FILES,             "Vetky sbory (*.*)"
+STID_HELP_FILES_HLP,        "Sbory pomoci (*.hlp)"
 }

programs/winhelp/Sw.rc

@@ -25,28 +25,28 @@
 MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 {
  POPUP "&Arkiv" {
-  MENUITEM "&ppna...", 0x101
+  MENUITEM "&ppna...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Skriv ut", 0x104
-  MENUITEM "Skrivar &instllningar...", 0x106
+  MENUITEM "&Skriv ut", MNID_FILE_PRINT
+  MENUITEM "Skrivar &instllningar...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Avsluta", 0x108
+  MENUITEM "&Avsluta", MNID_FILE_EXIT
  }
  POPUP "&Redigera" {
-   MENUITEM "&Kopiera...", 0x10A
+   MENUITEM "&Kopiera...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Markera...", 0x10C
+   MENUITEM "&Markera...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Bokmrke" {
-   MENUITEM "&Defingera...", 0x10E
+   MENUITEM "&Defingera...", MNID_BKMK_DEFINE
  }
  POPUP "&Hjlp" {
-   MENUITEM "Anvndningen &av hjlp", 0x110
-   MENUITEM "Alltid &verst", 0x111
+   MENUITEM "Anvndningen &av hjlp", MNID_HELP_HELPON
+   MENUITEM "Alltid &verst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Information...", 0x113
+   MENUITEM "&Information...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Om WINE", 0x114
+   MENUITEM "&Om WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -55,16 +55,17 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"WINE Hjlp"
-WHERROR, 		"FEL"
-WARNING,  		"VARNING"
-INFO,  			"Information"
-NOT_IMPLEMENTED, 	"Ej implementererat"
-HLPFILE_ERROR_s, 	"FEL vid lsning av hjlp filen `%s'"
-CONTENTS, 		"&Innehll"
-SEARCH, 		"&Sk"
-BACK, 			"&Tillbaka"
-HISTORY, 		"&versikt"
-ALL_FILES, 		"Alla filer (*.*))"
-HELP_FILES_HLP, 	"Hjlp filer (*.hlp)"
+STID_WINE_HELP, 	"WINE Hjlp"
+STID_WHERROR, 		"FEL"
+STID_WARNING,  		"VARNING"
+STID_INFO,  		"Information"
+STID_NOT_IMPLEMENTED, 	"Ej implementererat"
+STID_HLPFILE_ERROR_s, 	"FEL vid lsning av hjlp filen `%s'"
+STID_CONTENTS, 		"&Innehll"
+STID_SEARCH, 		"&Sk"
+STID_BACK, 		"&Tillbaka"
+STID_HISTORY, 		"&versikt"
+STID_TOPICS,		"T&opics"
+STID_ALL_FILES, 	"Alla filer (*.*))"
+STID_HELP_FILES_HLP, 	"Hjlp filer (*.hlp)"
 }

programs/winhelp/Va.rc

@@ -29,28 +29,28 @@
 MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_NEUTRAL
 {
  POPUP "&Datoteca" {
-  MENUITEM "&Rivir", 0x101
+  MENUITEM "&Rivir", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Stampar tema", 0x104
-  MENUITEM "&Installaziun dal stampader...", 0x106
+  MENUITEM "&Stampar tema", MNID_FILE_PRINT
+  MENUITEM "&Installaziun dal stampader...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Finir", 0x108
+  MENUITEM "&Finir", MNID_FILE_EXIT
  }
  POPUP "&Lavurar" {
-   MENUITEM "Capchar", 0x10A
+   MENUITEM "Capchar", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annotaziun...", 0x10C
+   MENUITEM "&Annotaziun...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Marca" {
-   MENUITEM "&Definir...", 0x10E
+   MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
  POPUP "&Agd" {
-   MENUITEM "&Douvrar l'agd", 0x110
-   MENUITEM "Adna da&vant", 0x111
+   MENUITEM "&Douvrar l'agd", MNID_HELP_HELPON
+   MENUITEM "Adna da&vant", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "I&nfuormaziuns", 0x113
+   MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "Davart &WINE", 0x114
+   MENUITEM "Davart &WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -69,6 +69,7 @@ CONTENTS, 		"&Cuntgn"
 SEARCH, 		"&Tscherchar"
 BACK, 			"&Inavo"
 HISTORY, 		"&Fin qua"
+TOPICS,			"T&opics"
 ALL_FILES, 		"Tuot las datotecas (*.*)"
 HELP_FILES_HLP, 	"Datotecas d'agd (*.hlp)"
 }

programs/winhelp/Wa.rc

@@ -25,28 +25,28 @@
 MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL
 {
  POPUP "&Fitch" {
-  MENUITEM "&Drov...", 0x101
+  MENUITEM "&Drov...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
-  MENUITEM "&Rexhe", 0x104
-  MENUITEM "&Apontiaedje del scrirece...", 0x106
+  MENUITEM "&Rexhe", MNID_FILE_PRINT
+  MENUITEM "&Apontiaedje del scrirece...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "Mouss &Fo", 0x108
+  MENUITEM "Mouss &Fo", MNID_FILE_EXIT
  }
  POPUP "&Candj" {
-   MENUITEM "&Copy...", 0x10A
+   MENUITEM "&Copy...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Sicrre...", 0x10C
+   MENUITEM "&Sicrre...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Rimrkes" {
-   MENUITEM "&Defini...", 0x10E
+   MENUITEM "&Defini...", MNID_BKMK_DEFINE
  }
  POPUP "&Aide" {
-   MENUITEM "&Aide so l' Aide", 0x110
-   MENUITEM "Todi &Visibe", 0x111
+   MENUITEM "&Aide so l' Aide", MNID_HELP_HELPON
+   MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Informcion...", 0x113
+   MENUITEM "&Informcion...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM " &dfait di WINEE", 0x114
+   MENUITEM " &dfait di WINEE", MNID_HELP_WINE
 #endif
  }
 }
@@ -55,16 +55,17 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_NEUTRAL
 {
-WINE_HELP, 		"Aidance di WINE"
-WHERROR, 		"AROKE"
-WARNING,  		"ADVERTIXHMINT"
-INFO,  			"Informcion"
-NOT_IMPLEMENTED, 	"Nn co possibe"
-HLPFILE_ERROR_s, 	"Yk n' a nn st  moumint di lere li fitch d' aide `%s'"
-CONTENTS, 		"&dvins"
-SEARCH, 		"C&wer"
-BACK, 			"n &Er"
-HISTORY, 		"&Istwere"
-ALL_FILES, 		"Tos les fitchs (*.*)"
-HELP_FILES_HLP, 	"Fitchs d' aide (*.hlp)"
+STID_WINE_HELP, 	"Aidance di WINE"
+STID_WHERROR, 		"AROKE"
+STID_WARNING,  		"ADVERTIXHMINT"
+STID_INFO,  		"Informcion"
+STID_NOT_IMPLEMENTED, 	"Nn co possibe"
+STID_HLPFILE_ERROR_s, 	"Yk n' a nn st  moumint di lere li fitch d' aide `%s'"
+STID_CONTENTS, 		"&dvins"
+STID_SEARCH, 		"C&wer"
+STID_BACK, 		"n &Er"
+STID_HISTORY, 		"&Istwere"
+STID_TOPICS,		"&Topics"
+STID_ALL_FILES, 	"Tos les fitchs (*.*)"
+STID_HELP_FILES_HLP, 	"Fitchs d' aide (*.hlp)"
 }

programs/winhelp/macro.c

@@ -319,11 +319,11 @@ void MACRO_FileOpen(void)
     CHAR szzFilter[2 * MAX_STRING_LEN + 100];
     LPSTR p = szzFilter;
 
-    LoadString(Globals.hInstance, 0X12B, p, MAX_STRING_LEN);
+    LoadString(Globals.hInstance, STID_HELP_FILES_HLP, p, MAX_STRING_LEN);
     p += strlen(p) + 1;
     lstrcpy(p, "*.hlp");
     p += strlen(p) + 1;
-    LoadString(Globals.hInstance, 0x12A, p, MAX_STRING_LEN);
+    LoadString(Globals.hInstance, STID_ALL_FILES, p, MAX_STRING_LEN);
     p += strlen(p) + 1;
     lstrcpy(p, "*.*");
     p += strlen(p) + 1;

programs/winhelp/winhelp.c

@@ -151,10 +151,6 @@ static BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, LPCSTR lpszWindow,
                                      BOOL bPopup, HWND hParentWnd, LPPOINT mouse, INT nCmdShow)
 {
     CHAR    szCaption[MAX_STRING_LEN];
-    CHAR    szContents[MAX_STRING_LEN];
-    CHAR    szSearch[MAX_STRING_LEN];
-    CHAR    szBack[MAX_STRING_LEN];
-    CHAR    szHistory[MAX_STRING_LEN];
     SIZE    size   = {CW_USEDEFAULT, 0/*CW_USEDEFAULT*/};
     POINT   origin = {240, 0};
     LPSTR   ptr;
@@ -217,14 +213,18 @@ static BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, LPCSTR lpszWindow,
         MACRO_CreateButton("BTN_TEST", "&Test", "MacroTest");
     if (bPrimary && page)
     {
-        LoadString(Globals.hInstance, 0x126, szContents, sizeof(szContents));
-        LoadString(Globals.hInstance, 0x127,   szSearch,   sizeof(szSearch));
-        LoadString(Globals.hInstance, 0x128,     szBack,     sizeof(szBack));
-        LoadString(Globals.hInstance, 0x129,  szHistory,  sizeof(szHistory));
-        MACRO_CreateButton("BTN_CONTENTS", szContents, "Contents()");
-        MACRO_CreateButton("BTN_SEARCH",   szSearch,   "Search()");
-        MACRO_CreateButton("BTN_BACK",     szBack,     "Back()");
-        MACRO_CreateButton("BTN_HISTORY",  szHistory,  "History()");
+        CHAR    buffer[MAX_STRING_LEN];
+
+        LoadString(Globals.hInstance, STID_CONTENTS, buffer, sizeof(buffer));
+        MACRO_CreateButton("BTN_CONTENTS", buffer, "Contents()");
+        LoadString(Globals.hInstance, STID_SEARCH,buffer, sizeof(buffer));
+        MACRO_CreateButton("BTN_SEARCH", buffer, "Search()");
+        LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer));
+        MACRO_CreateButton("BTN_BACK", buffer, "Back()");
+        LoadString(Globals.hInstance, STID_HISTORY, buffer, sizeof(buffer));
+        MACRO_CreateButton("BTN_HISTORY", buffer, "History()");
+        LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
+        MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
     }
 
     /* Initialize file specific pushbuttons */
@@ -268,7 +268,7 @@ static BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, LPCSTR lpszWindow,
             }
 
     /* Create main Window */
-    if (!page) LoadString(Globals.hInstance, 0x120, szCaption, sizeof(szCaption));
+    if (!page) LoadString(Globals.hInstance, STID_WINE_HELP, szCaption, sizeof(szCaption));
     hWnd = CreateWindow(bPopup ? TEXT_WIN_CLASS_NAME : MAIN_WIN_CLASS_NAME,
                         page ? page->file->lpszTitle : szCaption,
                         bPopup ? WS_POPUPWINDOW | WS_BORDER : WS_OVERLAPPEDWINDOW,
@@ -319,7 +319,7 @@ BOOL WINHELP_CreateHelpWindowByHash(LPCSTR lpszFile, LONG lHash, LPCSTR lpszWind
             page = lHash ? HLPFILE_PageByHash(szFile_hlp, lHash) : HLPFILE_Contents(szFile_hlp);
             if (!page)
 	    {
-                WINHELP_MessageBoxIDS_s(HLPFILE_ERROR_s, lpszFile, WHERROR, MB_OK);
+                WINHELP_MessageBoxIDS_s(STID_HLPFILE_ERROR_s, lpszFile, STID_WHERROR, MB_OK);
                 if (Globals.win_list) return FALSE;
 	    }
 	}
@@ -386,28 +386,23 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         switch (wParam)
 	{
             /* Menu FILE */
-	case 0x101:			MACRO_FileOpen();       break;
-	case 0x104:			MACRO_Print();          break;
-	case 0x106:			MACRO_PrinterSetup();   break;
-	case 0x108:			MACRO_Exit();           break;
+	case MNID_FILE_OPEN:    MACRO_FileOpen();       break;
+	case MNID_FILE_PRINT:	MACRO_Print();          break;
+	case MNID_FILE_SETUP:	MACRO_PrinterSetup();   break;
+	case MNID_FILE_EXIT:	MACRO_Exit();           break;
 
             /* Menu EDIT */
-	case 0x10A:     	        MACRO_CopyDialog();     break;
-	case 0x10C:        	        MACRO_Annotate();       break;
+	case MNID_EDIT_COPYDLG: MACRO_CopyDialog();     break;
+	case MNID_EDIT_ANNOTATE:MACRO_Annotate();       break;
 
             /* Menu Bookmark */
-	case 0x10E:			MACRO_BookmarkDefine(); break;
+	case MNID_BKMK_DEFINE:  MACRO_BookmarkDefine(); break;
 
             /* Menu Help */
-	case 0x110:			MACRO_HelpOn();         break;
-	case 0x111:			MACRO_HelpOnTop();      break;
-
-            /* Menu Info */
-	case 0x113:			MACRO_About();          break;
-
-	case 0x114:
-            ShellAbout(hWnd, "WINE", "Help", 0);
-            break;
+	case MNID_HELP_HELPON:	MACRO_HelpOn();         break;
+	case MNID_HELP_HELPTOP: MACRO_HelpOnTop();      break;
+	case MNID_HELP_ABOUT:	MACRO_About();          break;
+	case MNID_HELP_WINE:    ShellAbout(hWnd, "WINE", "Help", 0); break;
 
 	default:
             /* Buttons */
@@ -416,7 +411,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
             if (button)
                 MACRO_ExecuteMacro(button->lpszMacro);
             else
-                WINHELP_MessageBoxIDS(0x124, 0x121, MB_OK);
+                WINHELP_MessageBoxIDS(STID_NOT_IMPLEMENTED, 0x121, MB_OK);
             break;
 	}
         break;

programs/winhelp/winhelp_res.h

+#define MNID_FILE_OPEN          0x101
+#define MNID_FILE_PRINT         0x104
+#define MNID_FILE_SETUP         0x106
+#define MNID_FILE_EXIT          0x108
+
+#define MNID_EDIT_COPYDLG       0x111
+#define MNID_EDIT_ANNOTATE      0x112
+
+#define MNID_BKMK_DEFINE        0x121
+
+#define MNID_HELP_HELPON        0x131
+#define MNID_HELP_HELPTOP       0x132
+#define MNID_HELP_ABOUT         0x141
+#define MNID_HELP_WINE          0x142
+
 #define MAIN_MENU		0x10F
-#define WINE_HELP		0x120
-#define WHERROR			0x121
-#define WARNING  		0x122
-#define INFO  			0x123
-#define NOT_IMPLEMENTED 	0x124
-#define HLPFILE_ERROR_s 	0x125
-#define CONTENTS 		0x126
-#define SEARCH	 		0x127
-#define BACK 			0x128
-#define HISTORY 		0x129
-#define ALL_FILES 		0x12A
-#define HELP_FILES_HLP	 	0x12B
-#define DIALOG_TEST		0x12C
+
+#define STID_WINE_HELP		0x120
+#define STID_WHERROR		0x121
+#define STID_WARNING  		0x122
+#define STID_INFO  		0x123
+#define STID_NOT_IMPLEMENTED 	0x124
+#define STID_HLPFILE_ERROR_s 	0x125
+#define STID_CONTENTS 		0x126
+#define STID_SEARCH	 	0x127
+#define STID_BACK 		0x128
+#define STID_HISTORY 		0x129
+#define STID_TOPICS 		0x12A
+#define STID_ALL_FILES 		0x12B
+#define STID_HELP_FILES_HLP	0x12C
+#define STID_DIALOG_TEST	0x12D