Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / MergeApp.h

diff --git a/Src/MergeApp.h b/Src/MergeApp.h
index b31663e..143f09e 100644 (file)
--- a/Src/MergeApp.h
+++ b/Src/MergeApp.h
@@ -3,9 +3,21 @@
 
 #include "UnicodeString.h"
 
+#define _(x) tr(x)
+#define N_(x) (x)
+
 class COptionsMgr;
 class FileFilterHelper;
 
+struct AboutInfo
+{
+       AboutInfo();
+       String copyright;
+       String version;
+       String private_build;
+       String website;
+};
+
 /** @brief Retrieve error description from Windows; uses FormatMessage */
 String GetSysError(int nerr = -1);
 
@@ -14,17 +26,25 @@ void LogErrorString(const String& sz);
 void LogErrorStringUTF8(const std::string& sz);
 void AppErrorMessageBox(const String& msg);
 
-       /** @brief Load string from string resources; shortcut for CString::LoadString */
+namespace AppMsgBox
+{
+       enum
+       {
+               YES = 1,
+               OK = 2,
+               NO = 4,
+               CANCEL = 8,
+               YES_TO_ALL = 16,
+               DONT_DISPLAY_AGAIN = 32,
+       };
+       int error(const String& msg, int type = OK);
+       int warning(const String& msg, int type = OK);
+       int information(const String& msg, int type = OK);
+};
+
+/** @brief Load string from string resources; shortcut for CString::LoadString */
 String LoadResString(unsigned id);
 
-/** @brief Lang aware version of AfxFormatStrings() */
-String LangFormatStrings(unsigned, const TCHAR * const *, int);
-
-       /** @brief Lang aware version of AfxFormatString1() */
-String LangFormatString1(unsigned, const TCHAR *);
-
-       /** @brief Lang aware version of AfxFormatString2() */
-String LangFormatString2(unsigned, const TCHAR *, const TCHAR *);
-
+String tr(const std::string &str);
 
 #endif /* __MERGEAPP_H__ */
\ No newline at end of file