1 files changed, 30 insertions, 0 deletions

diff --git a/KLogDlg.cpp b/KLogDlg.cpp
index 5f1c6c0..bdcb881 100644
--- a/KLogDlg.cpp
+++ b/KLogDlg.cpp
@@ -93,24 +93,25 @@ CKLogDlg::CKLogDlg(CWnd* pParent /*=NULL*/)
         m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

         m_bmpBack.LoadBitmap(IDB_BACKGROUND);

         m_bmpBack.GetBitmap(&m_bitmapBack);

         m_Trayer = new CTrayer(this);

         ASSERT(m_Trayer);

         LoadSettings();

 }

 

 void CKLogDlg::DoDataExchange(CDataExchange* pDX)

 {

         CDialog::DoDataExchange(pDX);

         //{{AFX_DATA_MAP(CKLogDlg)

+        DDX_Control(pDX, IDCANCEL, m_CancelCtl);

         DDX_Control(pDX, IDC_LOGPATTERN, m_LogPatternCtl);

         DDX_Control(pDX, IDC_FILES, m_FilesCtl);

         DDX_Control(pDX, IDC_LOGLENSPIN, m_LogLenSpinCtl);

         DDX_Control(pDX, IDC_LOGLENGTH, m_LogLengthCtl);

         DDX_Control(pDX, IDC_INVERT, m_PriInvertCtl);

         DDX_Control(pDX, IDC_TYPE_FILE, m_LogtoFileCtl);

         DDX_Control(pDX, IDC_TYPE_HOST, m_LogtoHostCtl);

         DDX_Control(pDX, IDC_TYPE_NONE, m_LogtoNoneCtl);

         DDX_Control(pDX, IDC_HOSTORFILE, m_HFNameCaptionCtl);

         DDX_Control(pDX, IDC_HOSTS, m_hlCtl);

         DDX_Control(pDX, IDC_BROWSESOUND, m_BrowseSoundCtl);

         DDX_Control(pDX, IDC_NONE, m_PriNoneCtl);

@@ -172,33 +173,35 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog)
         ON_BN_CLICKED(IDC_BROWSESOUND, OnBrowsesound)

         ON_EN_KILLFOCUS(IDC_HOSTFILE, OnKillfocusHostfile)

         ON_BN_CLICKED(IDC_BROWSE, OnBrowse)

         ON_COMMAND(ID_FILES_RESET, OnFilesReset)

         ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)

         ON_WM_CREATE()

         ON_WM_CLOSE()

         ON_COMMAND(ID_TRAY_ABOUTKLOG, OnTrayAboutklog)

         ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)

         ON_COMMAND(ID_TRAY_SHOWKLOGWINDOW, OnTrayShowklogwindow)

         ON_WM_WINDOWPOSCHANGING()

         ON_BN_CLICKED(IDC_LOGPATTERN, OnLogpattern)

+        ON_WM_GETMINMAXINFO()

         ON_BN_CLICKED(IDC_CRIT, OnPriority)

         ON_BN_CLICKED(IDC_DEBUG, OnPriority)

         ON_BN_CLICKED(IDC_EMERG, OnPriority)

         ON_BN_CLICKED(IDC_ERR, OnPriority)

         ON_BN_CLICKED(IDC_INFO, OnPriority)

         ON_BN_CLICKED(IDC_NOTICE, OnPriority)

         ON_BN_CLICKED(IDC_WARNING, OnPriority)

         ON_BN_CLICKED(IDC_TYPE_HOST, OnLogto)

         ON_BN_CLICKED(IDC_TYPE_NONE, OnLogto)

+        ON_WM_SIZE()

         //}}AFX_MSG_MAP

 END_MESSAGE_MAP()

 

 /////////////////////////////////////////////////////////////////////////////

 // CKLogDlg message handlers

 

 BOOL CKLogDlg::OnInitDialog()

 {

         CDialog::OnInitDialog();

 

         // Add "About..." menu item to system menu.

 

@@ -1356,12 +1359,39 @@ void CLogger::LookupHost(CKLogDlg *daddy)
                                 m_LogToHost.sin_addr.s_addr = *(DWORD*)he->h_addr;

                         }else{

                                 m_LogToHost.sin_addr.s_addr = INADDR_NONE;

                                 if(daddy->m_bWarnBlocking){

                                 CString sux;

                                         sux.Format(IDS_MSG_LOOKUPFAILED,(LPCTSTR)m_LogToName);

                                         daddy->MessageBox(sux,NULL,MB_ICONSTOP|MB_OK);

                                 }else

                                         MessageBeep(MB_ICONHAND);

                         }

                 }
 }
+

+void CKLogDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) 

+{

+        CDialog::OnGetMinMaxInfo(lpMMI);

+        WINDOWPLACEMENT wp;

+        if(IsWindow(m_CancelCtl.m_hWnd) && m_CancelCtl.GetWindowPlacement(&wp)) {

+                CRect wr; GetWindowRect(wr);

+                CRect cr; GetClientRect(cr);

+                CSize ncs = (wr-cr).Size();

+                CRect ctlr = wp.rcNormalPosition;

+                CSize corner = ctlr.BottomRight()+ncs;

+                lpMMI->ptMaxTrackSize.x = lpMMI->ptMinTrackSize.x = corner.cx;

+                lpMMI->ptMinTrackSize.y = corner.cy;

+        }

+}

+

+void CKLogDlg::OnSize(UINT nType, int cx, int cy) 

+{

+        CDialog::OnSize(nType, cx, cy);

+        if(!IsWindow(m_Log.m_hWnd))

+                return;

+        WINDOWPLACEMENT lp; m_Log.GetWindowPlacement(&lp);

+        CRect lr = lp.rcNormalPosition;

+        lr.bottom = cy-2;

+        CSize ls = lr.Size();

+        m_Log.SetWindowPos(0,0,0,ls.cx,ls.cy,SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOOWNERZORDER|SWP_NOZORDER);

+}