[commit] r1776 - in trunk: SDK/BON/Common Tools/AutoLayout

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Jan  5 10:26:24 2012
New Revision: 1776

Log:
Fix for UNICODE

Modified:
   trunk/SDK/BON/Common/ComponentDll.cpp
   trunk/SDK/BON/Common/ComponentObj.cpp
   trunk/Tools/AutoLayout/ComponentConfig.h

Modified: trunk/SDK/BON/Common/ComponentDll.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentDll.cpp	Thu Jan  5 09:26:51 2012	(r1775)
+++ trunk/SDK/BON/Common/ComponentDll.cpp	Thu Jan  5 10:26:24 2012	(r1776)
@@ -8,7 +8,7 @@
 #include "ComponentDll.h"
 
 extern bool const g_REGISTER_SYSTEMWIDE;
-extern const char* g_COMPONENT_NAME;
+extern const TCHAR* g_COMPONENT_NAME;
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/SDK/BON/Common/ComponentObj.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentObj.cpp	Thu Jan  5 09:26:51 2012	(r1775)
+++ trunk/SDK/BON/Common/ComponentObj.cpp	Thu Jan  5 10:26:24 2012	(r1776)
@@ -54,10 +54,15 @@
 #include "ComponentObj.h"
 
 #define _OLESTR(x) OLESTR(x)
-extern const char* g_COCLASS_PROGID = COCLASS_PROGID;
+extern const char* g_COCLASS_PROGIDA = COCLASS_PROGID;
 extern const wchar_t* g_COCLASS_PROGIDW = _OLESTR(COCLASS_PROGID);
-extern const char* g_COMPONENT_NAME = COMPONENT_NAME;
+extern const char* g_COMPONENT_NAMEA = COMPONENT_NAME;
 extern const wchar_t* g_COMPONENT_NAMEW = _OLESTR(COMPONENT_NAME);
+#ifdef UNICODE
+extern const TCHAR* g_COMPONENT_NAME = g_COMPONENT_NAMEW;
+#else
+extern const TCHAR* g_COMPONENT_NAME = g_COMPONENT_NAMEA;
+#endif
 #ifdef REGISTER_SYSTEMWIDE
 extern const bool g_REGISTER_SYSTEMWIDE = true;
 #else

Modified: trunk/Tools/AutoLayout/ComponentConfig.h
==============================================================================
--- trunk/Tools/AutoLayout/ComponentConfig.h	Thu Jan  5 09:26:51 2012	(r1775)
+++ trunk/Tools/AutoLayout/ComponentConfig.h	Thu Jan  5 10:26:24 2012	(r1776)
@@ -28,7 +28,7 @@
 
 
 // This name will appear in the popup window for interpreter selection.
-#define COMPONENT_NAME L"AutoLayout"
+#define COMPONENT_NAME "AutoLayout"
 
 
 // This text will appear in the toolbar icon tooltip and in the menu.