[Winmerge-svn] SF.net SVN: winmerge:[5864] trunk/Src

[<jt...@us...>]

Revision: 5864
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5864&view=rev
Author:   jtuc
Date:     2008-08-30 17:49:42 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
heksedit - First step towards UI translation

Modified Paths:
--------------
    trunk/Src/HexMergeFrm.cpp
    trunk/Src/HexMergeView.cpp

Modified: trunk/Src/HexMergeFrm.cpp
===================================================================
--- trunk/Src/HexMergeFrm.cpp	2008-08-30 17:40:22 UTC (rev 5863)
+++ trunk/Src/HexMergeFrm.cpp	2008-08-30 17:49:42 UTC (rev 5864)
@@ -138,6 +138,8 @@
 {
 	Customize(pif->get_settings());
 	Customize(pif->get_colors());
+	LANGID wLangID = (LANGID)GetThreadLocale();
+	pif->load_lang(wLangID);
 }
 
 /**

Modified: trunk/Src/HexMergeView.cpp
===================================================================
--- trunk/Src/HexMergeView.cpp	2008-08-30 17:40:22 UTC (rev 5863)
+++ trunk/Src/HexMergeView.cpp	2008-08-30 17:49:42 UTC (rev 5864)
@@ -42,8 +42,15 @@
 #endif
 
 /**
- * @brief Turn bool api result into success/error code.
+ * @brief Macros to help build version dependent window class names
  */
+#define SHARPEN_A(X) #X
+#define SHARPEN_W(X) L#X
+#define SHARPEN(T,X) SHARPEN_##T(X)
+
+/**
+ * @brief Turn bool api result into success/error code
+ */
 static HRESULT NTAPI SE(BOOL f)
 {
 	if (f)
@@ -121,7 +128,17 @@
 BOOL CHexMergeView::PreCreateWindow(CREATESTRUCT& cs)
 {
 	static const TCHAR szFileName[] = _T("heksedit.dll");
-	static const TCHAR szClassName[] = _T("frhed hexclass");
+#ifdef _UNICODE
+	static const TCHAR szClassName[] = L"hekseditW_"
+		SHARPEN(W,FRHED_MAJOR_VERSION) L"."
+		SHARPEN(W,FRHED_MINOR_VERSION) L"."
+		SHARPEN(W,FRHED_SUB_RELEASE_NO);
+#else
+	static const TCHAR szClassName[] = "hekseditA_"
+		SHARPEN(A,FRHED_MAJOR_VERSION) "."
+		SHARPEN(A,FRHED_MINOR_VERSION) "."
+		SHARPEN(A,FRHED_SUB_RELEASE_NO);
+#endif
 	if ((cs.hInstance = ::GetModuleHandle(szFileName)) == 0 &&
 		(cs.hInstance = ::LoadLibrary(szFileName)) == 0)
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.