winefile: Remove redundant About Wine menu option.

2008-03-27 13:36:39 +01:00 · 2008-03-27 13:36:39 +01:00 · 761ce98b3f
parent cf5e6bcec9
commit 761ce98b3f
20 changed files with 2 additions and 84 deletions
--- a/programs/winefile/Cs.rc
+++ b/programs/winefile/Cs.rc
@ -145,9 +145,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Jak používat nápovìdu\tF1",  ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Informace o Winefile...",    ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Informace o &Wine...",        ID_ABOUT_WINE
-#endif
    }
 }

@ -195,7 +192,6 @@ STRINGTABLE
    IDS_SHELL               "Pøíkazový øádek"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Zatím neimplementováno"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/De.rc
+++ b/programs/winefile/De.rc
@ -137,9 +137,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "Hilfe &verwenden\tF1",        ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Info über Winefile...",      ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Info über &Wine...",          ID_ABOUT_WINE
-#endif
    }
 }

@ -240,7 +237,6 @@ STRINGTABLE
    IDS_SHELL               "Shell"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Noch nicht implementiert"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/En.rc
+++ b/programs/winefile/En.rc
@ -140,10 +140,7 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "Help &Search...\tF1",         ID_HELP
        MENUITEM "&Using Help\tF1",             ID_HELP_USING
        MENUITEM SEPARATOR
-        MENUITEM "&Info about Winefile...",     ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Info about &Wine...",         ID_ABOUT_WINE
-#endif
+        MENUITEM "&About Winefile...",          ID_ABOUT
    }
 }

@ -244,7 +241,6 @@ STRINGTABLE
    IDS_SHELL               "Shell"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Not yet implemented"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/Es.rc
+++ b/programs/winefile/Es.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Usando la ayuda\tF1",        ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Acerca de Winefile...",      ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Acerca de &Wine...",          ID_ABOUT_WINE
-#endif
    }
 }

@ -242,7 +239,6 @@ STRINGTABLE
    IDS_SHELL               "Shell"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Aún no implementado"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/Fr.rc
+++ b/programs/winefile/Fr.rc
@ -143,9 +143,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Utiliser l'aide\tF1",        ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "À &propos de Winefile",    ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "À propos de &Wine",        ID_ABOUT_WINE
-#endif
    }
 }

@ -246,7 +243,6 @@ STRINGTABLE
    IDS_SHELL               "Shell"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Pas encore implémenté"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/Hu.rc
+++ b/programs/winefile/Hu.rc
@ -142,9 +142,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Használat\tF1",              ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Winefile-ról...",            ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "W&ine-ról...",                ID_ABOUT_WINE
-#endif
    }
 }

--- a/programs/winefile/It.rc
+++ b/programs/winefile/It.rc
@ -142,9 +142,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Uso dell Guida\tF1",         ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Informazioni su Winefile...",ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Informazioni su &Wine...",    ID_ABOUT_WINE
-#endif
    }
 }

--- a/programs/winefile/Ko.rc
+++ b/programs/winefile/Ko.rc
@ -142,9 +142,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "도움말 사용법(&U)\tF1",             ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "Winefile 관련 정보(&I)...",     ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "&Wine 관련 정보...",         ID_ABOUT_WINE
-#endif
    }
 }

@ -245,7 +242,6 @@ STRINGTABLE
    IDS_SHELL               "셀"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "미구현"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine 파일"
 }

--- a/programs/winefile/Nl.rc
+++ b/programs/winefile/Nl.rc
@ -138,9 +138,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Instructie\tF1",             ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Over Winefile...",           ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Over &Wine...",               ID_ABOUT_WINE
-#endif
    }
 }

@ -241,7 +238,6 @@ STRINGTABLE
    IDS_SHELL               "Shell"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Nog niet geimplementeerd"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/No.rc
+++ b/programs/winefile/No.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "Br&uk av hjelp\tF1",             ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Informasjon om Filbehandling . . .",     ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Informasjon om &Wine . . .",         ID_ABOUT_WINE
-#endif
    }
 }

@ -242,7 +239,6 @@ STRINGTABLE
    IDS_SHELL               "Skall"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Ikke implementert ennå"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Filbehandling"
 }

--- a/programs/winefile/Pl.rc
+++ b/programs/winefile/Pl.rc
@ -142,9 +142,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Używanie pomocy",            ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Winefile...",                ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "W&ine...",                    ID_ABOUT_WINE
-#endif
    }
 }

@ -244,7 +241,6 @@ STRINGTABLE
    IDS_SHELL               "Pulpit"       /* tłumaczenie nie dosłowne, ale chyba lepiej pasuje */
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Jeszcze nie zaimplementowane"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/Pt.rc
+++ b/programs/winefile/Pt.rc
@ -141,9 +141,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Usando a ajuda",             ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Sobre o Winefile...",        ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Sobre o &Wine...",            ID_ABOUT_WINE
-#endif
    }
 }

@ -264,9 +261,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "Pesquisar...",                ID_HELP
        MENUITEM "&Usar a ajuda",             ID_HELP_USING
        MENUITEM SEPARATOR
-#ifdef __WINE__
-        MENUITEM "Acerca do &Wine...",          ID_ABOUT_WINE
-#endif
    }
 }

@ -348,7 +342,6 @@ STRINGTABLE
 IDS_SHELL                  "Shell"
 IDS_TITLEFMT               "%s - %s"
 IDS_NO_IMPL                "Ainda não implementado"
- IDS_WINE                   "WINE"
 IDS_WINE_FILE              "Wine File"
 }

@ -364,7 +357,6 @@ STRINGTABLE
 IDS_SHELL                  "Linha de Comandos"
 IDS_TITLEFMT               "%s - %s"
 IDS_NO_IMPL                "Ainda não implementado"
- IDS_WINE                   "WINE"
 IDS_WINE_FILE              "Ficheiro Wine"
 }

--- a/programs/winefile/Ru.rc
+++ b/programs/winefile/Ru.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Èñïîëüçîâàíèå ñïðàâêè\tF1",  ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Î Winefile...",              ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Î &Wine...",                  ID_ABOUT_WINE
-#endif
    }
 }

@ -241,7 +238,6 @@ STRINGTABLE
    IDS_SHELL               "Shell"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Åù¸ íå ðåàëèçîâàíî"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/Si.rc
+++ b/programs/winefile/Si.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Using Help\tF1",             ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&Info about Winefile...",     ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Info about &Wine...",         ID_ABOUT_WINE
-#endif
    }
 }

--- a/programs/winefile/Sv.rc
+++ b/programs/winefile/Sv.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "&Använda hjälpen\tF1",        ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "Information om &Winefile...", ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "Info about &Wine...",         ID_ABOUT_WINE
-#endif
    }
 }

@ -189,7 +186,6 @@ STRINGTABLE
    IDS_SHELL               "Skal"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Ej implementerat ännu"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine File"
 }

--- a/programs/winefile/Tr.rc
+++ b/programs/winefile/Tr.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "Yardım &Kullanımı\tF1",       ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "Winefile hakkında &bilgi...", ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "&Wine hakkýnda bilgi...",     ID_ABOUT_WINE
-#endif
    }
 }

@ -242,7 +239,6 @@ STRINGTABLE
    IDS_SHELL               "Kabuk"
    IDS_TITLEFMT            "%s - %s"
    IDS_NO_IMPL             "Henüz tamamlanmadı"
-    IDS_WINE                "WINE"
    IDS_WINE_FILE           "Wine Dosya Yöneticisi"
 }

--- a/programs/winefile/Zh.rc
+++ b/programs/winefile/Zh.rc
@ -139,9 +139,6 @@ IDM_WINEFILE MENU FIXED IMPURE
        MENUITEM "使用帮助（&U）\tF1",          ID_HELP_USING
        MENUITEM SEPARATOR
        MENUITEM "&关于 Winefile...",           ID_ABOUT
-#ifdef __WINE__
-        MENUITEM "关于 &Wine...",               ID_ABOUT_WINE
-#endif
    }
 }

--- a/programs/winefile/resource.h
+++ b/programs/winefile/resource.h
@ -101,7 +101,6 @@

 /* winefile extensions */

-#define ID_ABOUT_WINE                   0x8000
 #define ID_LICENSE                      0x8001
 #define ID_NO_WARRANTY                  0x8002
 #define ID_WINDOW_AUTOSORT              0x8003
@ -122,8 +121,7 @@
 #define IDS_SHELL                       1205
 #define IDS_TITLEFMT                    1206
 #define IDS_NO_IMPL                     1207
-#define IDS_WINE                        1208
-#define IDS_WINE_FILE                   1209
+#define IDS_WINE_FILE                   1208

 #define IDS_COL_NAME                    1210
 #define IDS_COL_SIZE                    1211
--- a/programs/winefile/winefile.c
+++ b/programs/winefile/winefile.c
@ -2509,8 +2509,6 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM

 				/*TODO: There are even more menu items! */

-#ifndef _NO_EXTENSIONS
-#ifdef __WINE__
 				case ID_LICENSE:
 					WineLicense(Globals.hMainWnd);
 					break;
@ -2519,15 +2517,9 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM
 					WineWarranty(Globals.hMainWnd);
 					break;

-				case ID_ABOUT_WINE:
-					ShellAbout(hwnd, RS(b2,IDS_WINE), RS(b1,IDS_WINEFILE), 0);
-					break;
-#endif
-
 				case ID_ABOUT:
 					ShellAbout(hwnd, RS(b1,IDS_WINEFILE), NULL, 0);
 					break;
-#endif	/* _NO_EXTENSIONS */

 				default:
 					/*TODO: if (wParam >= PM_FIRST_LANGUAGE && wParam <= PM_LAST_LANGUAGE)
--- a/programs/winefile/winefile.h
+++ b/programs/winefile/winefile.h
@ -43,10 +43,6 @@
 #include <locale.h>
 #include <time.h>

-#ifndef __WINE__
-#include <malloc.h> /* for alloca() */
-#endif
-
 #include <shellapi.h>   /* for ShellExecute() */
 #include <shlobj.h>     /* for SHFormatDrive() */