Some cleanup

1 files changed, 115 insertions, 107 deletions

diff --git a/cppe/demo/IceE/chat/ChatConfigDlg.cpp b/cppe/demo/IceE/chat/ChatConfigDlg.cpp
index 1e23c85cbd5..989688d67fb 100644
--- a/cppe/demo/IceE/chat/ChatConfigDlg.cpp
+++ b/cppe/demo/IceE/chat/ChatConfigDlg.cpp
@@ -7,20 +7,20 @@
 //
 // **********************************************************************
 
-

-#include "stdafx.h"

-#include "IceE/SafeStdio.h"

-#include "Router.h"

-#include "ChatClient.h"

-#include "ChatConfigDlg.h"

+
+#include "stdafx.h"
+#include "IceE/SafeStdio.h"
+#include "Router.h"
+#include "ChatClient.h"
+#include "ChatConfigDlg.h"
 
 #ifdef ICEE_HAS_ROUTER
 
-

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#endif

-

+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
 class ChatCallbackI : public Demo::ChatCallback
 {
 public:
@@ -43,109 +43,117 @@ private:
 
 CChatConfigDlg::CChatConfigDlg(const Ice::CommunicatorPtr& communicator, const LogIPtr& log, 
 			       CChatClientDlg* mainDiag, const CString& user, const CString& password,
-			       const CString& host, const CString& port, CWnd* pParent /*=NULL*/) :

+			       const CString& host, const CString& port, CWnd* pParent /*=NULL*/) :
     CDialog(CChatConfigDlg::IDD, pParent), _communicator(communicator), _log(log), _mainDiag(mainDiag),
     _user(user), _password(password), _host(host), _port(port)
-{

-    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

-}

-

-void

-CChatConfigDlg::DoDataExchange(CDataExchange* pDX)

-{

-    CDialog::DoDataExchange(pDX);

-}

-

-BEGIN_MESSAGE_MAP(CChatConfigDlg, CDialog)

-    ON_WM_PAINT()

-    ON_WM_QUERYDRAGICON()

-    //}}AFX_MSG_MAP

-    ON_BN_CLICKED(IDC_LOGIN, OnLogin)

-END_MESSAGE_MAP()

-

-BOOL

-CChatConfigDlg::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 text input edit control.

-    //

-    _useredit = (CEdit*)GetDlgItem(IDC_USER);

-    _passedit = (CEdit*)GetDlgItem(IDC_PASSWORD);

-    _hostedit = (CEdit*)GetDlgItem(IDC_HOST);

-    _portedit = (CEdit*)GetDlgItem(IDC_PORT);

+{
+    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+}
+
+void
+CChatConfigDlg::DoDataExchange(CDataExchange* pDX)
+{
+    CDialog::DoDataExchange(pDX);
+}
+
+BEGIN_MESSAGE_MAP(CChatConfigDlg, CDialog)
+    ON_WM_PAINT()
+    ON_WM_QUERYDRAGICON()
+    ON_BN_CLICKED(IDC_LOGIN, OnLogin)
+END_MESSAGE_MAP()
 
+BOOL
+CChatConfigDlg::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 text input edit control.
+    //
+    _useredit = (CEdit*)GetDlgItem(IDC_USER);
+    _passedit = (CEdit*)GetDlgItem(IDC_PASSWORD);
+    _hostedit = (CEdit*)GetDlgItem(IDC_HOST);
+    _portedit = (CEdit*)GetDlgItem(IDC_PORT);
+
+    //
+    // Fill the windows with last info entered.
+    //
     _useredit->SetWindowText(_user);
     _passedit->SetWindowText(_password);
     _hostedit->SetWindowText(_host);
     _portedit->SetWindowText(_port);
-

-    //

+
+    //
     // Set the focus to the username input
-    //

-    _useredit->SetFocus();

- 

-    return FALSE; // return FALSE because we explicitly set the focus

-}

-

-void

-CChatConfigDlg::OnCancel()

-{

-    CDialog::OnCancel();

-}

-

-// 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

-CChatConfigDlg::OnPaint() 

-{

-#ifdef _WIN32_WCE

-    CDialog::OnPaint();

-#else

-    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();

-    }

-#endif

-}

-

-// The system calls this function to obtain the cursor to display while the user drags

-// the minimized window.

-HCURSOR

-CChatConfigDlg::OnQueryDragIcon()

-{

-    return static_cast<HCURSOR>(_hIcon);

-}

-

-
-void

-CChatConfigDlg::OnLogin()

-{

+    //
+    _useredit->SetFocus();
+ 
+    return FALSE; // return FALSE because we explicitly set the focus
+}
+
+void
+CChatConfigDlg::OnCancel()
+{
+    CDialog::OnCancel();
+}
+
+//
+// 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
+CChatConfigDlg::OnPaint() 
+{
+#ifdef _WIN32_WCE
+    CDialog::OnPaint();
+#else
+    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();
+    }
+#endif
+}
+
+//
+// The system calls this function to obtain the cursor to display while the user drags
+// the minimized window.
+//
+HCURSOR
+CChatConfigDlg::OnQueryDragIcon()
+{
+    return static_cast<HCURSOR>(_hIcon);
+}
+
+
+void
+CChatConfigDlg::OnLogin()
+{
+    //
+    // Retrieve the entered info from the edit controls.
+    //
     _useredit->GetWindowText(_user);
     _passedit->GetWindowText(_password);
     _hostedit->GetWindowText(_host);
@@ -226,4 +234,4 @@ CChatConfigDlg::OnLogin()
     }
 }
 
-#endif
+#endif // ICEE_HAS_ROUTER