1 files changed, 244 insertions, 241 deletions
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
index 5cea643eb5b..b9e6932b428 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
@@ -7,244 +7,247 @@
 //
 // **********************************************************************
 
-
-#include "stdafx.h"
-#include "HelloClient.h"
-#include "HelloClientDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-CHelloClientDlg::CHelloClientDlg(const Ice::CommunicatorPtr& communicator, CWnd* pParent /*=NULL*/) :
-    CDialog(CHelloClientDlg::IDD, pParent), _communicator(communicator), _currentMode(0),
-    _useSecure(false), _useTimeout(false)
-{
-    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
-}
-
-void
-CHelloClientDlg::DoDataExchange(CDataExchange* pDX)
-{
-    CDialog::DoDataExchange(pDX);
-}
-
-BEGIN_MESSAGE_MAP(CHelloClientDlg, CDialog)
-    ON_WM_PAINT()
-    ON_WM_QUERYDRAGICON()
-    //}}AFX_MSG_MAP
-    ON_BN_CLICKED(IDC_INVOKE, OnSayHello)
-    ON_BN_CLICKED(IDC_FLUSH, OnFlush)
-    ON_BN_CLICKED(IDC_SHUTDOWN, OnShutdown)
-END_MESSAGE_MAP()
-
-BOOL
-CHelloClientDlg::OnInitDialog()
-{
-    CDialog::OnInitDialog();
-
-    // Set the icon for this dialog.  The framework does this automatically
-    // when the application's main window is not a dialog
-    SetIcon(_hIcon, TRUE);            // Set big icon
-    SetIcon(_hIcon, FALSE);        // Set small icon
-
-    //
-    // Retrieve the controls.
-    //
-    _mode = (CComboBox*)GetDlgItem(IDC_MODE);
-    _secure = (CButton*)GetDlgItem(IDC_SECURE);
-    _timeout = (CButton*)GetDlgItem(IDC_TIMEOUT);
-    _status = (CStatic*)GetDlgItem(IDC_STATUSBAR);
-
-    //
-    // Use twoway mode as the initial default.
-    //
-    _mode->SetCurSel(_currentMode);
-
-    //
-    // Create the proxy.
-    //
-    Ice::PropertiesPtr properties = _communicator->getProperties();
-    const char* proxyProperty = "Hello.Proxy";
-    std::string proxy = properties->getProperty(proxyProperty);
-    Ice::ObjectPrx obj = _communicator->stringToProxy(proxy);
-    _proxy = Demo::HelloPrx::uncheckedCast(obj);
-    _currentProxy = _proxy;
-    _status->SetWindowText(CString(" Ready"));
-
-    return TRUE;  // return TRUE  unless you set the focus to a control
-}
-
-// If you add a minimize button to your dialog, you will need the code below
-// to draw the icon.  For MFC applications using the document/view model,
-// this is automatically done for you by the framework.
-
-void
-CHelloClientDlg::OnPaint() 
-{
-    if(IsIconic())
-    {
-        CPaintDC dc(this); // device context for painting
-
-        SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
-
-        // Center icon in client rectangle
-        int cxIcon = GetSystemMetrics(SM_CXICON);
-        int cyIcon = GetSystemMetrics(SM_CYICON);
-        CRect rect;
-        GetClientRect(&rect);
-        int x = (rect.Width() - cxIcon + 1) / 2;
-        int y = (rect.Height() - cyIcon + 1) / 2;
-
-        // Draw the icon
-        dc.DrawIcon(x, y, _hIcon);
-    }
-    else
-    {
-        CDialog::OnPaint();
-    }
-}
-
-// The system calls this function to obtain the cursor to display while the user drags
-// the minimized window.
-HCURSOR
-CHelloClientDlg::OnQueryDragIcon()
-{
-    return static_cast<HCURSOR>(_hIcon);
-}
-
-void
-CHelloClientDlg::OnSayHello()
-{
-    try
-    {
-        updateProxy();
-        _currentProxy->sayHello();
-        if(_currentProxy->ice_isBatchOneway() || _currentProxy->ice_isBatchDatagram())
-        {
-            _status->SetWindowText(CString(" Queued batch request"));
-        }
-        else
-        {
-            _status->SetWindowText(CString(" Sent request"));
-        }
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        handleException(ex);
-    }
-}
-
-void
-CHelloClientDlg::OnFlush()
-{
-    try
-    {
-        _communicator->flushBatchRequests();
-        _status->SetWindowText(CString(" Flushed batch requests"));
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        handleException(ex);
-    }
-}
-
-void
-CHelloClientDlg::OnShutdown()
-{
-    try
-    {
-        updateProxy();
-        _currentProxy->shutdown();
-        if(_currentProxy->ice_isBatchOneway() || _currentProxy->ice_isBatchDatagram())
-        {
-            _status->SetWindowText(CString(" Queued shutdown request"));
-        }
-        else
-        {
-            _status->SetWindowText(CString(" Sent shutdown request"));
-        }
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        handleException(ex);
-    }
-}
-
-void
-CHelloClientDlg::updateProxy()
-{
-    int mode = _mode->GetCurSel();
-    bool secure = _secure->GetCheck() == BST_CHECKED;
-    bool timeout = _timeout->GetCheck() == BST_CHECKED;
-
-    if(mode == _currentMode && secure == _useSecure && timeout == _useTimeout)
-    {
-        return;
-    }
-
-    Ice::ObjectPrx proxy;
-    switch(mode)
-    {
-    case 0:
-        proxy = _proxy->ice_twoway();
-        break;
-    case 1:
-        proxy = _proxy->ice_oneway();
-        break;
-    case 2:
-        proxy = _proxy->ice_batchOneway();
-        break;
-    case 3:
-        proxy = _proxy->ice_datagram();
-        break;
-    case 4:
-        proxy = _proxy->ice_batchDatagram();
-        break;
-    default:
-        assert(false);
-    }
-    proxy = proxy->ice_secure(secure);
-    if(timeout)
-    {
-        proxy = proxy->ice_timeout(2000);
-    }
-    else
-    {
-        proxy = proxy->ice_timeout(-1);
-    }
-
-    if(proxy->ice_isTwoway())
-    {
-        _currentProxy = Demo::HelloPrx::checkedCast(proxy);
-    }
-    else
-    {
-        _currentProxy = Demo::HelloPrx::uncheckedCast(proxy);
-    }
-    _currentMode = mode;
-    _useSecure = secure;
-    _useTimeout = timeout;
-}
-
-void
-CHelloClientDlg::handleException(const IceUtil::Exception& e)
-{
-    try
-    {
-        e.ice_throw();
-    }
-    catch(const Ice::NoEndpointException&)
-    {
-        AfxMessageBox(CString("The proxy does not support the current configuration"),
-                      MB_OK|MB_ICONEXCLAMATION);
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        std::ostringstream ostr;
-        ostr << ex;
-        std::string s = ostr.str();
-        AfxMessageBox(CString(s.c_str()), MB_OK|MB_ICONEXCLAMATION);
-    }
-    _status->SetWindowText(CString(" Ready"));
-}
+
+#include "stdafx.h"
+#include "HelloClient.h"
+#include "HelloClientDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+using namespace std;
+using namespace Demo;
+
+CHelloClientDlg::CHelloClientDlg(const Ice::CommunicatorPtr& communicator, CWnd* pParent /*=NULL*/) :
+    CDialog(CHelloClientDlg::IDD, pParent), _communicator(communicator), _currentMode(0),
+    _useSecure(false), _useTimeout(false)
+{
+    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+}
+
+void
+CHelloClientDlg::DoDataExchange(CDataExchange* pDX)
+{
+    CDialog::DoDataExchange(pDX);
+}
+
+BEGIN_MESSAGE_MAP(CHelloClientDlg, CDialog)
+    ON_WM_PAINT()
+    ON_WM_QUERYDRAGICON()
+    //}}AFX_MSG_MAP
+    ON_BN_CLICKED(IDC_INVOKE, OnSayHello)
+    ON_BN_CLICKED(IDC_FLUSH, OnFlush)
+    ON_BN_CLICKED(IDC_SHUTDOWN, OnShutdown)
+END_MESSAGE_MAP()
+
+BOOL
+CHelloClientDlg::OnInitDialog()
+{
+    CDialog::OnInitDialog();
+
+    // Set the icon for this dialog.  The framework does this automatically
+    // when the application's main window is not a dialog
+    SetIcon(_hIcon, TRUE);            // Set big icon
+    SetIcon(_hIcon, FALSE);        // Set small icon
+
+    //
+    // Retrieve the controls.
+    //
+    _mode = (CComboBox*)GetDlgItem(IDC_MODE);
+    _secure = (CButton*)GetDlgItem(IDC_SECURE);
+    _timeout = (CButton*)GetDlgItem(IDC_TIMEOUT);
+    _status = (CStatic*)GetDlgItem(IDC_STATUSBAR);
+
+    //
+    // Use twoway mode as the initial default.
+    //
+    _mode->SetCurSel(_currentMode);
+
+    //
+    // Create the proxy.
+    //
+    Ice::PropertiesPtr properties = _communicator->getProperties();
+    const char* proxyProperty = "Hello.Proxy";
+    string proxy = properties->getProperty(proxyProperty);
+    Ice::ObjectPrx obj = _communicator->stringToProxy(proxy);
+    _proxy = HelloPrx::uncheckedCast(obj);
+    _currentProxy = _proxy;
+    _status->SetWindowText(CString(" Ready"));
+
+    return TRUE;  // return TRUE  unless you set the focus to a control
+}
+
+// If you add a minimize button to your dialog, you will need the code below
+// to draw the icon.  For MFC applications using the document/view model,
+// this is automatically done for you by the framework.
+
+void
+CHelloClientDlg::OnPaint() 
+{
+    if(IsIconic())
+    {
+        CPaintDC dc(this); // device context for painting
+
+        SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
+
+        // Center icon in client rectangle
+        int cxIcon = GetSystemMetrics(SM_CXICON);
+        int cyIcon = GetSystemMetrics(SM_CYICON);
+        CRect rect;
+        GetClientRect(&rect);
+        int x = (rect.Width() - cxIcon + 1) / 2;
+        int y = (rect.Height() - cyIcon + 1) / 2;
+
+        // Draw the icon
+        dc.DrawIcon(x, y, _hIcon);
+    }
+    else
+    {
+        CDialog::OnPaint();
+    }
+}
+
+// The system calls this function to obtain the cursor to display while the user drags
+// the minimized window.
+HCURSOR
+CHelloClientDlg::OnQueryDragIcon()
+{
+    return static_cast<HCURSOR>(_hIcon);
+}
+
+void
+CHelloClientDlg::OnSayHello()
+{
+    try
+    {
+        updateProxy();
+        _currentProxy->sayHello();
+        if(_currentProxy->ice_isBatchOneway() || _currentProxy->ice_isBatchDatagram())
+        {
+            _status->SetWindowText(CString(" Queued batch request"));
+        }
+        else
+        {
+            _status->SetWindowText(CString(" Sent request"));
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::OnFlush()
+{
+    try
+    {
+        _communicator->flushBatchRequests();
+        _status->SetWindowText(CString(" Flushed batch requests"));
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::OnShutdown()
+{
+    try
+    {
+        updateProxy();
+        _currentProxy->shutdown();
+        if(_currentProxy->ice_isBatchOneway() || _currentProxy->ice_isBatchDatagram())
+        {
+            _status->SetWindowText(CString(" Queued shutdown request"));
+        }
+        else
+        {
+            _status->SetWindowText(CString(" Sent shutdown request"));
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::updateProxy()
+{
+    int mode = _mode->GetCurSel();
+    bool secure = _secure->GetCheck() == BST_CHECKED;
+    bool timeout = _timeout->GetCheck() == BST_CHECKED;
+
+    if(mode == _currentMode && secure == _useSecure && timeout == _useTimeout)
+    {
+        return;
+    }
+
+    Ice::ObjectPrx proxy;
+    switch(mode)
+    {
+    case 0:
+        proxy = _proxy->ice_twoway();
+        break;
+    case 1:
+        proxy = _proxy->ice_oneway();
+        break;
+    case 2:
+        proxy = _proxy->ice_batchOneway();
+        break;
+    case 3:
+        proxy = _proxy->ice_datagram();
+        break;
+    case 4:
+        proxy = _proxy->ice_batchDatagram();
+        break;
+    default:
+        assert(false);
+    }
+    proxy = proxy->ice_secure(secure);
+    if(timeout)
+    {
+        proxy = proxy->ice_timeout(2000);
+    }
+    else
+    {
+        proxy = proxy->ice_timeout(-1);
+    }
+
+    if(proxy->ice_isTwoway())
+    {
+        _currentProxy = HelloPrx::checkedCast(proxy);
+    }
+    else
+    {
+        _currentProxy = HelloPrx::uncheckedCast(proxy);
+    }
+    _currentMode = mode;
+    _useSecure = secure;
+    _useTimeout = timeout;
+}
+
+void
+CHelloClientDlg::handleException(const IceUtil::Exception& e)
+{
+    try
+    {
+        e.ice_throw();
+    }
+    catch(const Ice::NoEndpointException&)
+    {
+        AfxMessageBox(CString("The proxy does not support the current configuration"),
+                      MB_OK|MB_ICONEXCLAMATION);
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        ostringstream ostr;
+        ostr << ex;
+        string s = ostr.str();
+        AfxMessageBox(CString(s.c_str()), MB_OK|MB_ICONEXCLAMATION);
+    }
+    _status->SetWindowText(CString(" Ready"));
+}