Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 12 insertions, 1 deletions

diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
index 4935e1b72da..a93ae1e934f 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -18,15 +18,19 @@
 class CHelloClientDlg : public CDialog

 {

 public:

+
     CHelloClientDlg(const Ice::CommunicatorPtr&, CWnd* = NULL);

 

     enum { IDD = IDD_HELLOCLIENT_DIALOG };

 

 protected:

+
     virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support

 

 protected:

+
     Ice::CommunicatorPtr _communicator;

+    CEdit* _host;

     CComboBox* _mode;

     CButton* _secure;

     CButton* _timeout;

@@ -35,17 +39,24 @@ protected:
     Demo::HelloPrx _proxy;

     Demo::HelloPrx _currentProxy;

     int _currentMode;

+    std::string _hostname;

     bool _useSecure;

     bool _useTimeout;

     HICON _hIcon;

 

     // Generated message map functions

     virtual BOOL OnInitDialog();

+    afx_msg void OnClose();

     afx_msg void OnPaint();

     afx_msg HCURSOR OnQueryDragIcon();

     afx_msg void OnSayHello();

     afx_msg void OnFlush();

     afx_msg void OnShutdown();

+    afx_msg LRESULT OnAMIException(WPARAM, LPARAM);

+    afx_msg LRESULT OnAMISayHelloResponse(WPARAM, LPARAM);

+    afx_msg LRESULT OnAMISayHelloSent(WPARAM, LPARAM);

+    afx_msg LRESULT OnAMIFlushBatchRequestsSent(WPARAM, LPARAM);

+    afx_msg LRESULT OnAMIShutdownSent(WPARAM, LPARAM);

     DECLARE_MESSAGE_MAP()

 

     void updateProxy();