Wed Apr 8 12:45:16 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * utils/NamingViewer/BindDialog.cpp
        * utils/NamingViewer/BindDialog.h
        * utils/NamingViewer/BindNewContext.cpp
        * utils/NamingViewer/BindNewContext.h
          Unicode fixes

4 files changed, 12 insertions, 12 deletions

diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp
index 7fe921bb9a0..8c578e672c9 100644
--- a/TAO/utils/NamingViewer/BindDialog.cpp
+++ b/TAO/utils/NamingViewer/BindDialog.cpp
@@ -20,8 +20,8 @@ CBindDialog::CBindDialog(bool Context, CORBA::ORB_ptr pORB, CWnd* pParent /*=NUL
 {
   //{{AFX_DATA_INIT(CBindDialog)
   m_IOR = _T("");
-  m_ID = "";
-  m_Kind = "";
+  m_ID = _T("");
+  m_Kind = _T("");
   //}}AFX_DATA_INIT
   m_pORB = pORB;
   m_Context = Context;
@@ -87,8 +87,8 @@ void CBindDialog::OnOK()
   // TODO: Add extra validation here
   UpdateData();
   m_Name.length(1);
-  m_Name[0].id = CORBA::string_dup(m_ID);
-  m_Name[0].kind = CORBA::string_dup(m_Kind);
+  m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
+  m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
   try
   {
     m_Object = m_pORB->string_to_object(m_IOR);
diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h
index ba0adc275b4..a8e80a8e56e 100644
--- a/TAO/utils/NamingViewer/BindDialog.h
+++ b/TAO/utils/NamingViewer/BindDialog.h
@@ -22,8 +22,8 @@ public:
   //{{AFX_DATA(CBindDialog)
   enum { IDD = IDD_BIND };
   CString m_IOR;
-  CStringA m_ID;
-  CStringA m_Kind;
+  CString m_ID;
+  CString m_Kind;
   //}}AFX_DATA
   CORBA::Object_ptr GetObject() {return m_Object;};
 
diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp
index 61a250f6198..0746f4a42f6 100644
--- a/TAO/utils/NamingViewer/BindNewContext.cpp
+++ b/TAO/utils/NamingViewer/BindNewContext.cpp
@@ -19,8 +19,8 @@ CBindNewContext::CBindNewContext(CWnd* pParent /*=NULL*/)
   : CDialog(CBindNewContext::IDD, pParent)
 {
   //{{AFX_DATA_INIT(CBindNewContext)
-  m_ID = "";
-  m_Kind = "";
+  m_ID = _T("");
+  m_Kind = _T("");
   //}}AFX_DATA_INIT
 }
 
@@ -48,7 +48,7 @@ void CBindNewContext::OnOK()
   // TODO: Add extra validation here
   UpdateData();
   m_Name.length(1);
-  m_Name[0].id = CORBA::string_dup(m_ID);
-  m_Name[0].kind = CORBA::string_dup(m_Kind);
+  m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
+  m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
   CDialog::OnOK();
 }
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index f24d1c4b9cd..b94ca864732 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -20,8 +20,8 @@ public:
 // Dialog Data
   //{{AFX_DATA(CBindNewContext)
   enum { IDD = IDD_BIND_NEW_CONTEXT };
-  CStringA m_ID;
-  CStringA m_Kind;
+  CString m_ID;
+  CString m_Kind;
   //}}AFX_DATA
   CosNaming::Name& GetName() {return m_Name;};