Windows Template Library (WTL) / Mailing Lists
Thanks for helping keep SourceForge clean.
Screenshot instructions:
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here &
(This may not be possible with some types of ads)
You seem to have CSS turned off.
Please don't fill out this field.
You seem to have CSS turned off.
Please don't fill out this field.
Briefly describe the problem (required):
Upload screenshot of ad (required):
, or drag & drop file here.
Please provide the ad click URL, if possible:
Mailing Lists
Brought to you by:
& E-mail list that receives notifications on CVS commits
You can subscribe to this list .
results of 58
(Page 1 of 3)
Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24612/include
Modified Files:
atlctrlx.h
Log Message:
Typo, removed extra code that does nothing
Index: atlctrlx.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlctrlx.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** atlctrlx.h 29 Mar :58 -
--- atlctrlx.h 30 Mar :39 -
***************
// get pane positions
int* pPanesPos = pPanesPos = (int*)_alloca(m_nPanes * sizeof(int));
int nRet = GetParts(m_nPanes, pPanesPos);
ATLASSERT(nRet == m_nPanes);
// get pane positions
int* pPanesPos = (int*)_alloca(m_nPanes * sizeof(int));
int nRet = GetParts(m_nPanes, pPanesPos);
ATLASSERT(nRet == m_nPanes);
Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24203/include
Modified Files:
atlframe.h
Log Message:
Added SetIcon(NULL, FALSE) for CDialogResize to remove the generic icon for resiable dialogs
Index: atlframe.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlframe.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** atlframe.h 23 Mar :33 -
--- atlframe.h 30 Mar :32 -
***************
pT-&ModifyStyle(0, dwForceStyle);
// Adding this style removes an empty icon that dialogs with WS_THICKFRAME have
// Note: This will not prevent adding an icon for the dialog using SetIcon()
if((dwStyle & WS_CHILD) == 0)
pT-&ModifyStyleEx(0, WS_EX_DLGMODALFRAME);
// Cleanup in case of multiple initialization
pT-&ModifyStyle(0, dwForceStyle);
// Adding this style removes an empty icon that dialogs with WS_THICKFRAME have.
// Setting icon to NULL is required when XP themes are active.
// Note: This will not prevent adding an icon for the dialog using SetIcon()
if((dwStyle & WS_CHILD) == 0)
pT-&ModifyStyleEx(0, WS_EX_DLGMODALFRAME);
if(pT-&GetIcon(FALSE) == NULL)
pT-&SetIcon(NULL, FALSE);
// Cleanup in case of multiple initialization
Update of /cvsroot/wtl/wtl/Samples/TabBrowser
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24203/Samples/TabBrowser
Modified Files:
WindowsDlg.h
Log Message:
Added SetIcon(NULL, FALSE) for CDialogResize to remove the generic icon for resiable dialogs
Index: WindowsDlg.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/TabBrowser/WindowsDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WindowsDlg.h 20 Mar :27 -
--- WindowsDlg.h 30 Mar :32 -
***************
*** 58,63 ****
m_ptMinTrackSize.y /= 2;
SetIcon(NULL, FALSE);
UpdateUI();
--- 58,61 ----
Update of /cvsroot/wtl/wtl/Samples/MTPad
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8180/Samples/MTPad
Modified Files:
Log Message:
Remove unneeded message handler in main form for CFindReplaceDialog::GetFindReplaceMsg() (this is part of CEditFindReplaceImplBase now).
Index: mainfrm.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/mainfrm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mainfrm.h 28 Mar :34 -
--- mainfrm.h 29 Mar :55 -
***************
*** 74,80 ****
CHAIN_MSG_MAP(CFrameWindowImpl&CMainFrame&)
CHAIN_MSG_MAP(CUpdateUI&CMainFrame&)
- #ifndef _WIN32_WCE
MESSAGE_HANDLER(CFindReplaceDialog::GetFindReplaceMsg(), m_view.OnFindReplaceCmd)
CHAIN_COMMANDS_MEMBER((m_view))
END_MSG_MAP()
--- 74,77 ----
Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21968
Modified Files:
atlctrlx.h
Log Message:
CHyperLink: WM_WINDOWPOSCHANGED -& WM_SIZE
Index: atlctrlx.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlctrlx.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** atlctrlx.h 28 Mar :32 -
--- atlctrlx.h 29 Mar :58 -
***************
MESSAGE_HANDLER(WM_SETFONT, OnSetFont)
MESSAGE_HANDLER(WM_UPDATEUISTATE, OnUpdateUiState)
MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
END_MSG_MAP()
MESSAGE_HANDLER(WM_SETFONT, OnSetFont)
MESSAGE_HANDLER(WM_UPDATEUISTATE, OnUpdateUiState)
MESSAGE_HANDLER(WM_SIZE, OnSize)
END_MSG_MAP()
***************
LRESULT OnWindowPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
T* pT = static_cast&T*&(this);
LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
T* pT = static_cast&T*&(this);
Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26631
Modified Files:
atlctrlx.h
Log Message:
Added WM_WINDOWPOSCHANGED handler for CHyperLink
Index: atlctrlx.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlctrlx.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** atlctrlx.h 23 Mar :33 -
--- atlctrlx.h 28 Mar :32 -
***************
MESSAGE_HANDLER(WM_SETFONT, OnSetFont)
MESSAGE_HANDLER(WM_UPDATEUISTATE, OnUpdateUiState)
MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
END_MSG_MAP()
***************
LRESULT OnWindowPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
T* pT = static_cast&T*&(this);
pT-&CalcLabelRect();
pT-&Invalidate();
// Implementation
void Init()
Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22649/include
Modified Files:
Log Message:
Formatting and small changes for atlfin.h and MTPad sample - also replaced CRT functions with Win32 ones to enable _ATL_MIN_CRT in atlfind.h
Index: atlfind.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlfind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** atlfind.h 27 Mar :06 -
--- atlfind.h 28 Mar :34 -
***************
*** 1,2 ****
--- 1,12 ----
+ // Windows Template Library - WTL version 8.0
+ // Copyright (C) Microsoft Corporation. All rights reserved.
+ // This file is a part of the Windows Template Library.
+ // The use and distribution terms for this software are covered by the
+ // Common Public License 1.0 ()
+ // which can be found in the file CPL.TXT at the root of this distribution.
+ // By using this software in any fashion, you are agreeing to be bound by
+ // the terms of this license. You must not remove this notice, or
+ // any other, from this software.
#ifndef __ATLFIND_H__
***************
*** 9,22 ****
! #ifndef __ATLAPP_H__
#error atlfind.h requires atlapp.h to be included first
! #ifndef __ATLWIN_H__
#error atlfind.h requires atlwin.h to be included first
! #ifndef __ATLGDI_H__
#error atlfind.h requires atlgdi.h to be included first
--- 19,24 ----
! #ifdef _WIN32_WCE
#error atlfind.h is not supported on Windows CE
***************
*** 33,36 ****
--- 35,39 ----
///////////////////////////////////////////////////////////////////////////////
// Classes in this file:
***************
*** 40,43 ****
--- 43,47 ----
// CRichEditFindReplaceImpl&T, TFindReplaceDialog&
namespace WTL
***************
*** 45,51 ****
///////////////////////////////////////////////////////////////////////////////
// CEditFindReplaceImplBase - Base class for mixin classes that
help implement Find/Replace for CEdit or CRichEditCtrl based window classes.
! #ifndef _WIN32_WCE
template &class T, class TFindReplaceDialog = CFindReplaceDialog&
--- 49,53 ----
///////////////////////////////////////////////////////////////////////////////
// CEditFindReplaceImplBase - Base class for mixin classes that
! // help implement Find/Replace for CEdit or CRichEditCtrl based window classes.
template &class T, class TFindReplaceDialog = CFindReplaceDialog&
***************
*** 69,73 ****
eText_OnReplaceAllTitle
eText_OnTextNotFoundMessage = 2,
eText_OnTextNotFoundTitle
--- 71,75 ----
eText_OnReplaceAllTitle
eText_OnTextNotFoundMessage = 2,
eText_OnTextNotFoundTitle
***************
*** 156,159 ****
--- 158,162 ----
T* pT = static_cast&T*&(this);
pT-&FindReplace(TRUE);
***************
*** 164,168 ****
// If the user is holding down SHIFT when hitting F3, we'll
// search in reverse.
Otherwise, we'll search forward.
// (be sure to have an accelerator mapped to ID_EDIT_REPEAT
// for both F3 and Shift+F3)
--- 167,171 ----
// If the user is holding down SHIFT when hitting F3, we'll
// search in reverse. Otherwise, we'll search forward.
// (be sure to have an accelerator mapped to ID_EDIT_REPEAT
// for both F3 and Shift+F3)
***************
*** 176,183 ****
if(!pT-&FindTextSimple(m_sFindNext, m_bMatchCase, m_bWholeWord, m_bFindDown))
pT-&TextNotFound(m_sFindNext);
--- 179,185 ----
if(!pT-&FindTextSimple(m_sFindNext, m_bMatchCase, m_bWholeWord, m_bFindDown))
pT-&TextNotFound(m_sFindNext);
***************
*** 197,200 ****
--- 199,203 ----
bHandled = FALSE;
***************
*** 239,246 ****
T* pT = static_cast&T*&(this);
LONG nStartChar = 0, nEndChar = 0;
// So that we can use this for both an Edit and a RichEdit,
// send EM_GETSEL directly
// (CEdit::GetSel uses int&, and CRichEditCtrlT::GetSel uses LONG&)
//pT-&GetSel(nStartChar, nEndChar);
::SendMessage(pT-&m_hWnd, EM_GETSEL, (WPARAM)&nStartChar, (LPARAM)&nEndChar);
POINT point = pT-&PosFromChar(nStartChar);
--- 242,247 ----
T* pT = static_cast&T*&(this);
LONG nStartChar = 0, nEndChar = 0;
// Send EM_GETSEL so we can use both Edit and RichEdit
// (CEdit::GetSel uses int&, and CRichEditCtrlT::GetSel uses LONG&)
::SendMessage(pT-&m_hWnd, EM_GETSEL, (WPARAM)&nStartChar, (LPARAM)&nEndChar);
POINT point = pT-&PosFromChar(nStartChar);
***************
*** 251,255 ****
--- 252,258 ----
if(point.y & rect.Height())
rect.OffsetRect(0, point.y - rect.bottom - 20);
***************
*** 258,264 ****
rect.OffsetRect(0, 40 + point.y - rect.top);
::MoveWindow(hWndDialog,
rect.left, rect.top, rect.Width(), rect.Height(),
--- 261,266 ----
rect.OffsetRect(0, 40 + point.y - rect.top);
::MoveWindow(hWndDialog, rect.left, rect.top, rect.Width(), rect.Height(), TRUE);
***************
*** 310,317 ****
findNext, replaceWith, dwFlags, pT-&operator HWND());
ATLASSERT(m_pFindReplaceDialog != NULL);
if(m_pFindReplaceDialog)
m_bFindOnly = bFindO
--- 312,317 ----
findNext, replaceWith, dwFlags, pT-&operator HWND());
ATLASSERT(m_pFindReplaceDialog != NULL);
if(m_pFindReplaceDialog != NULL)
m_bFindOnly = bFindO
***************
*** 323,327 ****
size_t nLen = lstrlen(lpszCompare);
LONG nStartChar = 0, nEndChar = 0;
//pT-&GetSel(nStartChar, nEndChar);
::SendMessage(pT-&m_hWnd, EM_GETSEL, (WPARAM)&nStartChar, (LPARAM)&nEndChar);
if(nLen != (size_t)(nEndChar - nStartChar))
--- 323,328 ----
size_t nLen = lstrlen(lpszCompare);
LONG nStartChar = 0, nEndChar = 0;
// Send EM_GETSEL so we can use both Edit and RichEdit
// (CEdit::GetSel uses int&, and CRichEditCtrlT::GetSel uses LONG&)
::SendMessage(pT-&m_hWnd, EM_GETSEL, (WPARAM)&nStartChar, (LPARAM)&nEndChar);
if(nLen != (size_t)(nEndChar - nStartChar))
***************
*** 331,334 ****
--- 332,336 ----
_CSTRING_NS::CString selectedT
pT-&GetSelText(selectedText);
return (bMatchCase && selectedText.Compare(lpszCompare) == 0) ||
(!bMatchCase && selectedText.CompareNoCase(lpszCompare) == 0);
***************
*** 360,363 ****
--- 362,366 ----
***************
*** 374,384 ****
if(!pT-&FindTextSimple(m_sFindNext, m_bMatchCase, m_bWholeWord, m_bFindDown))
pT-&TextNotFound(m_sFindNext);
pT-&AdjustDialogPosition(m_pFindReplaceDialog-&operator HWND());
--- 377,383 ----
***************
*** 394,400 ****
if(pT-&SameAsSelected(m_sFindNext, m_bMatchCase, m_bWholeWord))
pT-&ReplaceSel(m_sReplaceWith);
if(!pT-&FindTextSimple(m_sFindNext, m_bMatchCase, m_bWholeWord, m_bFindDown))
--- 393,397 ----
***************
*** 459,463 ****
formattedMessage.Format(message,
replaceCount, m_sFindNext, m_sReplaceWith);
if(m_pFindReplaceDialog)
m_pFindReplaceDialog-&MessageBox(formattedMessage,
--- 456,460 ----
formattedMessage.Format(message,
replaceCount, m_sFindNext, m_sReplaceWith);
if(m_pFindReplaceDialog != NULL)
m_pFindReplaceDialog-&MessageBox(formattedMessage,
***************
*** 476,481 ****
void OnTextNotFound(LPCTSTR lpszFind)
//::MessageBeep(MB_ICONHAND);
T* pT = static_cast&T*&(this);
_CSTRING_NS::CString message = pT-&GetTranslationText(eText_OnTextNotFoundMessage);
--- 473,476 ----
***************
*** 484,488 ****
_CSTRING_NS::CString formattedM
formattedMessage.Format(message, lpszFind);
if(m_pFindReplaceDialog)
m_pFindReplaceDialog-&MessageBox(formattedMessage,
--- 479,483 ----
_CSTRING_NS::CString formattedM
formattedMessage.Format(message, lpszFind);
if(m_pFindReplaceDialog != NULL)
m_pFindReplaceDialog-&MessageBox(formattedMessage,
***************
*** 497,501 ****
--- 492,499 ----
::MessageBeep(MB_ICONHAND);
***************
*** 503,516 ****
- #endif // _WIN32_WCE
///////////////////////////////////////////////////////////////////////////////
// CEditFindReplaceImpl - Mixin class for implementing Find/Replace for CEdit
based window classes.
! #ifndef _WIN32_WCE
// Chain to CEditFindReplaceImpl message map. Your class must also derive from CEdit.
--- 501,510 ----
///////////////////////////////////////////////////////////////////////////////
// CEditFindReplaceImpl - Mixin class for implementing Find/Replace for CEdit
! // based window classes.
// Chain to CEditFindReplaceImpl message map. Your class must also derive from CEdit.
***************
*** 550,554 ****
virtual ~CEditFindReplaceImpl()
if(m_pShadowBuffer)
delete [] m_pShadowB
--- 544,548 ----
virtual ~CEditFindReplaceImpl()
if(m_pShadowBuffer != NULL)
delete [] m_pShadowB
***************
*** 564,573 ****
// Operations
void HideSelection(BOOL bHide = TRUE, BOOL bChangeStyle = FALSE)
//ATLASSERT(::IsWindow(m_hWnd));
//::SendMessage(m_hWnd, EM_HIDESELECTION, bHide, bChangeStyle);
--- 558,564 ----
// Operations
// Supported only for RichEdit, so this does nothing for Edit
void HideSelection(BOOL /*bHide*/ = TRUE, BOOL /*bChangeStyle*/ = FALSE)
***************
*** 578,582 ****
ATLASSERT(lpszFind != NULL);
ATLASSERT(*lpszFind != '\0');
UINT nLen = pT-&GetBufferLength();
--- 569,573 ----
ATLASSERT(lpszFind != NULL);
ATLASSERT(*lpszFind != _T('\0'));
UINT nLen = pT-&GetBufferLength();
***************
*** 594,598 ****
bool isDBCS =
#ifdef _MBCS
CPINFO info={0};
::GetCPInfo(::GetOEMCP(), &info);
isDBCS = (info.MaxCharSize & 1);
--- 585,589 ----
bool isDBCS =
#ifdef _MBCS
CPINFO info = { 0 };
::GetCPInfo(::GetOEMCP(), &info);
isDBCS = (info.MaxCharSize & 1);
***************
*** 602,613 ****
// always go back one for search backwards
nStart -= int((lpszText+nStart) -
::_tcsdec(lpszText, lpszText+nStart));
else if(nStartChar != nEndChar && pT-&SameAsSelected(lpszFind, bMatchCase, bWholeWord))
// easy to go backward/forward with SBCS
if(_istlead(lpszText[nStart]))
nStart += iD
--- 593,605 ----
// always go back one for search backwards
nStart -= int((lpszText + nStart) - ::CharPrev(lpszText, lpszText + nStart));
else if(nStartChar != nEndChar && pT-&SameAsSelected(lpszFind, bMatchCase, bWholeWord))
// easy to go backward/forward with SBCS
! #ifndef _UNICODE
if(::IsDBCSLeadByte(lpszText[nStart]))
nStart += iD
***************
*** 615,619 ****
// handle search with nStart past end of buffer
UINT nLenFind = ::lstrlen(lpszFind);
if(nStart+nLenFind-1 &= nLen)
if(iDir & 0 && nLen &= nLenFind)
--- 607,611 ----
// handle search with nStart past end of buffer
UINT nLenFind = ::lstrlen(lpszFind);
if(nStart + nLenFind - 1 &= nLen)
if(iDir & 0 && nLen &= nLenFind)
***************
*** 626,631 ****
while(n--)
nStart -= int((lpszText+nStart) -
::_tcsdec(lpszText, lpszText+nStart));
--- 618,622 ----
while(n--)
nStart -= int((lpszText + nStart) - ::CharPrev(lpszText, lpszText + nStart));
***************
*** 635,639 ****
nStart = nLen - nLenF
ATLASSERT(nStart+nLenFind-1 &= nLen);
--- 626,630 ----
nStart = nLen - nLenF
ATLASSERT(nStart + nLenFind - 1 &= nLen);
***************
*** 668,677 ****
while(lpsz &= lpszStop)
if(!bMatchCase || (*lpsz == *lpszFind &&
(!_istlead(*lpsz) || lpsz[1] == lpszFind[1])))
LPTSTR lpch = (LPTSTR)(lpsz + nLenFind);
TCHAR chSave = *
*lpch = '\0';
int nResult = (*pfnCompare)(lpsz, lpszFind);
*lpch = chS
--- 659,671 ----
while(lpsz &= lpszStop)
! #ifndef _UNICODE
if(!bMatchCase || (*lpsz == *lpszFind && (!::IsDBCSLeadByte(*lpsz) || lpsz[1] == lpszFind[1])))
if(!bMatchCase || (*lpsz == *lpszFind && lpsz[1] == lpszFind[1]))
LPTSTR lpch = (LPTSTR)(lpsz + nLenFind);
TCHAR chSave = *
*lpch = _T('\0');
int nResult = (*pfnCompare)(lpsz, lpszFind);
*lpch = chS
***************
*** 683,687 ****
lpsz = ::_tcsinc(lpsz);
pT-&UnlockBuffer();
--- 677,681 ----
lpsz = ::CharNext(lpsz);
pT-&UnlockBuffer();
***************
*** 690,694 ****
int n = (int)(lpszFound - lpszText);
pT-&SetSel(n, n+nLenFind);
return TRUE;
--- 684,688 ----
int n = (int)(lpszFound - lpszText);
pT-&SetSel(n, n + nLenFind);
return TRUE;
***************
*** 706,710 ****
ATLASSERT(lpsz &= lpszText);
ATLASSERT(lpsz+nLenFind-1 &= lpszText+nLen-1);
LPSTR lpch = (LPSTR)(lpsz + nLenFind);
--- 700,704 ----
ATLASSERT(lpsz &= lpszText);
ATLASSERT(lpsz + nLenFind - 1 &= lpszText + nLen - 1);
LPSTR lpch = (LPSTR)(lpsz + nLenFind);
***************
*** 717,721 ****
pT-&UnlockBuffer();
int n = (int)(lpsz - lpszText);
pT-&SetSel(n, n+nLenFind);
return TRUE;
--- 711,715 ----
pT-&UnlockBuffer();
int n = (int)(lpsz - lpszText);
pT-&SetSel(n, n + nLenFind);
return TRUE;
***************
*** 746,750 ****
ATLASSERT(m_pShadowBuffer != NULL || m_nShadowSize == 0);
UINT nSize = pT-&GetWindowTextLength()+1;
if(nSize & m_nShadowSize)
--- 740,744 ----
ATLASSERT(m_pShadowBuffer != NULL || m_nShadowSize == 0);
UINT nSize = pT-&GetWindowTextLength() + 1;
if(nSize & m_nShadowSize)
***************
*** 762,770 ****
ATLASSERT(m_pShadowBuffer != NULL);
pT-&GetWindowText(m_pShadowBuffer, nSize);
// NOTE: The MFC counterpart does this, but why?
//// turn off edit control's modify bit
//((T*)pT)-&SetModify(FALSE);
return m_pShadowB
--- 756,761 ----
ATLASSERT(m_pShadowBuffer != NULL);
pT-&GetWindowText(m_pShadowBuffer, nSize);
return m_pShadowB
***************
*** 774,777 ****
--- 765,769 ----
LPCTSTR lpszText = (LPCTSTR)::LocalLock(hLocal);
ATLASSERT(lpszText != NULL);
return lpszT
***************
*** 800,807 ****
LPCTSTR lpszText = pT-&LockBuffer();
if(lpszText != NULL)
nLen = ::lstrlen(lpszText);
pT-&UnlockBuffer();
--- 792,798 ----
LPCTSTR lpszText = pT-&LockBuffer();
if(lpszText != NULL)
nLen = ::lstrlen(lpszText);
pT-&UnlockBuffer();
***************
*** 811,815 ****
LPCTSTR lpsz = lpszText + nI
LPCTSTR lpszStop = lpszText + nL
while(lpsz & lpszStop && *lpsz != '\r')
return LONG(lpsz - lpszText);
--- 802,806 ----
LPCTSTR lpsz = lpszText + nI
LPCTSTR lpszStop = lpszText + nL
while(lpsz & lpszStop && *lpsz != _T('\r'))
return LONG(lpsz - lpszText);
***************
*** 849,853 ****
T* pThisNoConst = const_cast&T*&(pT);
OSVERSIONINFO ovi = {0};
ovi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
::GetVersionEx(&ovi);
--- 840,844 ----
T* pThisNoConst = const_cast&T*&(pT);
OSVERSIONINFO ovi = { 0 };
ovi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
::GetVersionEx(&ovi);
***************
*** 858,862 ****
// Windows 95, 98, ME
// Under Win9x, it is necessary to maintain a shadow buffer.
It is only updated when the control contents have been changed.
pThisNoConst-&m_bShadowBufferNeeded = TRUE;
--- 849,853 ----
// Windows 95, 98, ME
// Under Win9x, it is necessary to maintain a shadow buffer.
// It is only updated when the control contents have been changed.
pThisNoConst-&m_bShadowBufferNeeded = TRUE;
***************
*** 888,898 ****
HMODULE hModule = ::LoadLibrary("comctl32.dll");
if(hModule)
typedef HRESULT (CALLBACK *LPFN_DllGetVersion)(DLLVERSIONINFO_private *);
LPFN_DllGetVersion fnDllGetVersion = (LPFN_DllGetVersion)::GetProcAddress(hModule, "DllGetVersion");
if(fnDllGetVersion)
DLLVERSIONINFO_private version = {0};
version.cbSize = sizeof(DLLVERSIONINFO_private);
if(SUCCEEDED(fnDllGetVersion(&version)))
--- 879,889 ----
HMODULE hModule = ::LoadLibrary("comctl32.dll");
if(hModule != NULL)
typedef HRESULT (CALLBACK *LPFN_DllGetVersion)(DLLVERSIONINFO_private *);
LPFN_DllGetVersion fnDllGetVersion = (LPFN_DllGetVersion)::GetProcAddress(hModule, "DllGetVersion");
if(fnDllGetVersion != NULL)
DLLVERSIONINFO_private version = { 0 };
version.cbSize = sizeof(DLLVERSIONINFO_private);
if(SUCCEEDED(fnDllGetVersion(&version)))
***************
*** 912,916 ****
! #endif // not _UNICODE
--- 903,907 ----
! #endif // !_UNICODE
***************
*** 920,931 ****
- #endif // _WIN32_WCE
///////////////////////////////////////////////////////////////////////////////
// CRichEditFindReplaceImpl - Mixin class for implementing Find/Replace for CRichEditCtrl
based window classes.
! #ifndef _WIN32_WCE
// Chain to CRichEditFindReplaceImpl message map. Your class must also derive from CRichEditCtrl.
--- 911,918 ----
///////////////////////////////////////////////////////////////////////////////
// CRichEditFindReplaceImpl - Mixin class for implementing Find/Replace for CRichEditCtrl
! // based window classes.
// Chain to CRichEditFindReplaceImpl message map. Your class must also derive from CRichEditCtrl.
***************
*** 961,965 ****
ATLASSERT(lpszFind != NULL);
FINDTEXTEX ft = {0};
pT-&GetSel(ft.chrg);
--- 948,952 ----
ATLASSERT(lpszFind != NULL);
FINDTEXTEX ft = { 0 };
pT-&GetSel(ft.chrg);
***************
*** 979,983 ****
--- 966,972 ----
if(bFindDown)
ft.chrg.cpMin++;
***************
// if we find the text return TRUE
if(pT-&FindAndSelect(dwFlags, ft) != -1)
return TRUE;
// if the original starting point was not the beginning of the buffer
// and we haven't already been here
else if(m_nInitialSearchPos & 0)
if(bFindDown)
--- 998,1011 ----
BOOL bRet = FALSE;
if(pT-&FindAndSelect(dwFlags, ft) != -1)
bRet = TRUE;
// we found the text
else if(m_nInitialSearchPos & 0)
// if the original starting point was not the beginning
// of the buffer and we haven't already been here
if(bFindDown)
***************
m_nInitialSearchPos = m_nInitialSearchPos - pT-&GetTextLength();
return pT-&FindAndSelect(dwFlags, ft) != -1;
// not found
return FALSE;
m_nInitialSearchPos = m_nInitialSearchPos - pT-&GetTextLength();
bRet = (pT-&FindAndSelect(dwFlags, ft) != -1) ? TRUE : FALSE;
***************
if(index != -1) // i.e. we found something
pT-&SetSel(ft.chrgText);
- #endif // _WIN32_WCE
}; // namespace WTL
if(index != -1) // i.e. we found something
pT-&SetSel(ft.chrgText);
}; // namespace WTL
Update of /cvsroot/wtl/wtl/Samples/MTPad
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22649/Samples/MTPad
Modified Files:
mainfrm.h MTPad.cpp MTPad.dsp MTPad.rc MTPadCE.rc view.h
Log Message:
Formatting and small changes for atlfin.h and MTPad sample - also replaced CRT functions with Win32 ones to enable _ATL_MIN_CRT in atlfind.h
Index: MTPad.cpp
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MTPad.cpp 27 Mar :05 -
--- MTPad.cpp 28 Mar :34 -
***************
*** 1,9 ****
- // This file is a part of Windows Template Library - WTL 3.0
- // The code and information is provided "as-is" without
- // warranty of any kind, either expressed or implied.
- // Copyright (C)
Microsoft Corporation
- // All rights reserved.
#include "stdatl.h"
--- 1,2 ----
Index: mainfrm.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/mainfrm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mainfrm.h 27 Mar :05 -
--- mainfrm.h 28 Mar :34 -
***************
*** 74,78 ****
--- 74,80 ----
CHAIN_MSG_MAP(CFrameWindowImpl&CMainFrame&)
CHAIN_MSG_MAP(CUpdateUI&CMainFrame&)
+ #ifndef _WIN32_WCE
MESSAGE_HANDLER(CFindReplaceDialog::GetFindReplaceMsg(), m_view.OnFindReplaceCmd)
CHAIN_COMMANDS_MEMBER((m_view))
END_MSG_MAP()
Index: MTPadCE.rc
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPadCE.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MTPadCE.rc 12 May :15 -.1.1
--- MTPadCE.rc 28 Mar :34 -
***************
*** 8,12 ****
// Generated from the TEXTINCLUDE 2 resource.
! #include "atlres.h"
/////////////////////////////////////////////////////////////////////////////
--- 8,12 ----
// Generated from the TEXTINCLUDE 2 resource.
! #include "atlresCE.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 35,39 ****
2 TEXTINCLUDE DISCARDABLE
"#include ""atlres.h""\r\n"
"\0"
--- 35,39 ----
2 TEXTINCLUDE DISCARDABLE
"#include ""atlresCE.h""\r\n"
"\0"
***************
*** 59,63 ****
DEFPUSHBUTTON
"OK",IDOK,130,81,50,14
"MTPad v2.0\nMultithreaded Notepad Sample\n\n\xA9 Microsoft 1999",
IDC_STATIC,13,51,104,38
IDR_MAINFRAME,IDC_STATIC,55,26,20,20
--- 59,63 ----
DEFPUSHBUTTON
"OK",IDOK,130,81,50,14
"MTPad v2.0\nMultithreaded Notepad Sample\n\n\xA9 Microsoft 2007",
IDC_STATIC,13,51,104,38
IDR_MAINFRAME,IDC_STATIC,55,26,20,20
***************
*** 228,232 ****
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "MTPad\0"
VALUE "LegalCopyright", "Copyright \xA9 Microsoft "
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MTPad.EXE\0"
--- 228,232 ----
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "MTPad\0"
VALUE "LegalCopyright", "Copyright \xA9 Microsoft "
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MTPad.EXE\0"
Index: MTPad.rc
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MTPad.rc 27 Mar :05 -
--- MTPad.rc 28 Mar :34 -
***************
*** 59,63 ****
DEFPUSHBUTTON
"OK",IDOK,130,81,50,14
"MTPad v2.0\nMultithreaded Notepad Sample\n\n(C) Microsoft 2007",
IDC_STATIC,13,51,104,38
IDR_MAINFRAME,IDC_STATIC,55,26,20,20
--- 59,63 ----
DEFPUSHBUTTON
"OK",IDOK,130,81,50,14
"MTPad v2.0\nMultithreaded Notepad Sample\n\n\xA9 Microsoft 2007",
IDC_STATIC,13,51,104,38
IDR_MAINFRAME,IDC_STATIC,55,26,20,20
***************
*** 269,273 ****
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "MTPad\0"
VALUE "LegalCopyright", "Copyright (C) Microsoft "
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MTPad.EXE\0"
--- 269,273 ----
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "MTPad\0"
VALUE "LegalCopyright", "Copyright \xA9 Microsoft "
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MTPad.EXE\0"
Index: view.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/view.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view.h 27 Mar :05 -
--- view.h 28 Mar :34 -
***************
*** 13,20 ****
#ifndef _WIN32_WCE
typedef CRichEditCommands&CEditView& editCommandsC
typedef CEditCommands&CEditView& editCommandsC
typedef CRichEditFindReplaceImpl&CEditView, CFindReplaceDialogWithMessageFilter& findReplaceC
--- 13,20 ----
#ifndef _WIN32_WCE
typedef CRichEditCommands&CEditView& editCommandsC
typedef CRichEditFindReplaceImpl&CEditView, CFindReplaceDialogWithMessageFilter& findReplaceC
typedef CEditCommands&CEditView& editCommandsC
Index: MTPad.dsp
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MTPad.dsp 27 Mar :05 -
--- MTPad.dsp 28 Mar :34 -
***************
*** 71,75 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
! # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "STRICT" /FR /Yu"stdatl.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 71,75 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
! # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "STRICT" /Yu"stdatl.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
Update of /cvsroot/wtl/wtl/Samples/MTPad
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22858/Samples/MTPad
Modified Files:
MTPad.cpp MTPad.dsp MTPad.rc MTPad.vcproj mainfrm.h stdatl.h
Added Files:
Log Message:
Add new atlfind.h containing new mixin classes to help implement find/replace functionality for CEdit or CRichEditCtrl based window classes:
CEditFindReplaceImplBase&T, TFindReplaceDialog&
CEditFindReplaceImpl&T, TFindReplaceDialog&
CRichEditFindReplaceImpl&T, TFindReplaceDialog&
Update MTPad sample to show usage of CRichEditFindReplaceImpl.
Fix depracated warning in MTPad usage of CRecentDocumentListBase::GetFromList.
In MTPad accelerator table, add Ctrl+H for replace and Shift+F3 for repeat (in reverse).
In MTPad view class, use CEditCommands/CRichEditCommands to show usage example.
Index: stdatl.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/stdatl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** stdatl.h 12 May :16 -.1.1
--- stdatl.h 27 Mar :05 -
***************
*** 13,16 ****
--- 13,18 ----
#endif // _WIN32_WCE
+ #define _WTL_USE_CSTRING
#include &atlbase.h&
#include &atlapp.h&
Index: mainfrm.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/mainfrm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mainfrm.h 12 May :15 -.1.1
--- mainfrm.h 27 Mar :05 -
***************
*** 41,52 ****
BOOL PreTranslateMessage(MSG* pMsg)
! #ifndef _WIN32_WCE
if(m_view.m_pFindDlg != NULL)
_ASSERTE(::IsWindow(m_view.m_pFindDlg-&m_hWnd));
if(::IsDialogMessage(m_view.m_pFindDlg-&m_hWnd, pMsg))
return TRUE;
! #endif // _WIN32_WCE
return CFrameWindowImpl&CMainFrame&::PreTranslateMessage(pMsg);
--- 41,46 ----
BOOL PreTranslateMessage(MSG* pMsg)
if(m_view.PreTranslateMessage(pMsg))
return TRUE;
return CFrameWindowImpl&CMainFrame&::PreTranslateMessage(pMsg);
***************
*** 80,84 ****
CHAIN_MSG_MAP(CFrameWindowImpl&CMainFrame&)
CHAIN_MSG_MAP(CUpdateUI&CMainFrame&)
CHAIN_COMMANDS_ALT_MEMBER((m_view), 1)
END_MSG_MAP()
--- 74,79 ----
CHAIN_MSG_MAP(CFrameWindowImpl&CMainFrame&)
CHAIN_MSG_MAP(CUpdateUI&CMainFrame&)
MESSAGE_HANDLER(CFindReplaceDialog::GetFindReplaceMsg(), m_view.OnFindReplaceCmd)
CHAIN_COMMANDS_MEMBER((m_view))
END_MSG_MAP()
***************
*** 349,353 ****
// get file name from the MRU list
TCHAR szFile[MAX_PATH];
if(m_mru.GetFromList(wID, szFile))
// find file name without the path
--- 344,348 ----
// get file name from the MRU list
TCHAR szFile[MAX_PATH];
if(m_mru.GetFromList(wID, szFile, MAX_PATH))
// find file name without the path
Index: MTPad.cpp
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MTPad.cpp 12 May :15 -.1.1
--- MTPad.cpp 27 Mar :05 -
***************
*** 16,19 ****
--- 16,21 ----
#include &atlctrlw.h&
#include &atlprint.h&
+ #include &atlfind.h&
+ #include "finddlg.h"
#endif // _WIN32_WCE
--- NEW FILE: finddlg.h ---
#ifndef __FindReplaceDialogWithMessageFilter_h__
#define __FindReplaceDialogWithMessageFilter_h__
#pragma once
#ifndef __cplusplus
#error ATL requires C++ compilation (use a .cpp suffix)
#ifndef __ATLAPP_H__
#error FindReplaceDialogWithMessageFilter.h requires atlapp.h to be included first
#ifndef __ATLWIN_H__
#error FindReplaceDialogWithMessageFilter.h requires atlwin.h to be included first
class CFindReplaceDialogWithMessageFilter :
public CFindReplaceDialogImpl&CFindReplaceDialogWithMessageFilter&,
public CMessageFilter
protected:
CMessageLoop* m_messageL
CFindReplaceDialogWithMessageFilter(CMessageLoop* messageLoop) :
m_messageLoop(messageLoop)
BOOL PreTranslateMessage(MSG* pMsg)
HWND hWndFocus = ::GetFocus();
if((m_hWnd == hWndFocus) || this-&IsChild(hWndFocus))
return this-&IsDialogMessage(pMsg);
return FALSE;
virtual void OnFinalMessage(HWND /*hWnd*/)
BEGIN_MSG_MAP(CFindReplaceDialogWithMessageFilter)
MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
END_MSG_MAP()
LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
if(m_messageLoop)
m_messageLoop-&AddMessageFilter(this);
bHandled = FALSE;
LRESULT OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
if(m_messageLoop)
m_messageLoop-&RemoveMessageFilter(this);
bHandled = FALSE;
#endif //__FindReplaceDialogWithMessageFilter_h__
Index: MTPad.rc
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MTPad.rc 12 May :15 -.1.1
--- MTPad.rc 27 Mar :05 -
***************
*** 59,63 ****
DEFPUSHBUTTON
"OK",IDOK,130,81,50,14
"MTPad v2.0\nMultithreaded Notepad Sample\n\n\xA9 Microsoft 1999",
IDC_STATIC,13,51,104,38
IDR_MAINFRAME,IDC_STATIC,55,26,20,20
--- 59,63 ----
DEFPUSHBUTTON
"OK",IDOK,130,81,50,14
"MTPad v2.0\nMultithreaded Notepad Sample\n\n(C) Microsoft 2007",
IDC_STATIC,13,51,104,38
IDR_MAINFRAME,IDC_STATIC,55,26,20,20
***************
*** 95,98 ****
--- 95,99 ----
"C",
ID_EDIT_COPY,
VIRTKEY, CONTROL, NOINVERT
"F",
ID_EDIT_FIND,
VIRTKEY, CONTROL, NOINVERT
"H",
ID_EDIT_REPLACE,
VIRTKEY, CONTROL, NOINVERT
"N",
ID_FILE_NEW,
VIRTKEY, CONTROL, NOINVERT
"O",
ID_FILE_OPEN,
VIRTKEY, CONTROL, NOINVERT
***************
*** 104,107 ****
--- 105,109 ----
VK_DELETE,
ID_EDIT_CUT,
VIRTKEY, SHIFT, NOINVERT
ID_EDIT_REPEAT,
VIRTKEY, NOINVERT
ID_EDIT_REPEAT,
VIRTKEY, SHIFT, NOINVERT
ID_NEXT_PANE,
VIRTKEY, NOINVERT
ID_PREV_PANE,
VIRTKEY, SHIFT, NOINVERT
***************
*** 267,271 ****
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "MTPad\0"
VALUE "LegalCopyright", "Copyright \xA9 Microsoft "
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MTPad.EXE\0"
--- 269,273 ----
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "MTPad\0"
VALUE "LegalCopyright", "Copyright (C) Microsoft "
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MTPad.EXE\0"
Index: view.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/view.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** view.h 12 May :17 -.1.1
--- view.h 27 Mar :05 -
***************
*** 1,9 ****
class CEditView :
#ifndef _WIN32_WCE
public CWindowImpl&CEditView, CRichEditCtrl&
#else // _WIN32_WCE
public CWindowImpl&CEditView, CEdit&
#endif // _WIN32_WCE
#ifndef _WIN32_WCE
--- 1,21 ----
class CEditView :
#ifndef _WIN32_WCE
public CWindowImpl&CEditView, CRichEditCtrl&,
public CRichEditCommands&CEditView&,
public CRichEditFindReplaceImpl&CEditView, CFindReplaceDialogWithMessageFilter&
#else // _WIN32_WCE
public CWindowImpl&CEditView, CEdit&,
public CEditCommands&CEditView&
#endif // _WIN32_WCE
+ protected:
typedef CEditView thisC
+ #ifndef _WIN32_WCE
typedef CRichEditCommands&CEditView& editCommandsC
typedef CEditCommands&CEditView& editCommandsC
typedef CRichEditFindReplaceImpl&CEditView, CFindReplaceDialogWithMessageFilter& findReplaceC
#ifndef _WIN32_WCE
***************
*** 16,20 ****
cchTAB = 8,
nSearchStringLen = 128,
nMaxBufferLen = 4000000
--- 28,31 ----
***************
*** 24,48 ****
TCHAR m_strFilePath[MAX_PATH];
TCHAR m_strFileName[MAX_PATH];
- #ifndef _WIN32_WCE
CFindReplaceDialog* m_pFindD
- #endif // _WIN32_WCE
TCHAR m_strFind[nSearchStringLen];
BOOL m_bMatchC
BOOL m_bWholeW
BOOL m_bFindO
BOOL m_bWordW
CEditView() :
m_nRow(0), m_nCol(0),
! #ifndef _WIN32_WCE
m_pFindDlg(NULL),
! #endif // _WIN32_WCE
m_bMatchCase(FALSE), m_bWholeWord(FALSE),
m_bFindOnly(TRUE), m_bWordWrap(FALSE)
m_font = AtlGetDefaultGuiFont();
m_strFilePath[0] = 0;
m_strFileName[0] = 0;
m_strFind[0] = 0;
--- 35,47 ----
TCHAR m_strFilePath[MAX_PATH];
TCHAR m_strFileName[MAX_PATH];
BOOL m_bWordW
CEditView() :
m_nRow(0), m_nCol(0),
m_bWordWrap(FALSE)
m_font = AtlGetDefaultGuiFont();
m_strFilePath[0] = 0;
m_strFileName[0] = 0;
***************
*** 52,55 ****
--- 51,68 ----
BOOL PreTranslateMessage(MSG* pMsg)
+ #ifndef _WIN32_WCE
// In non Multi-thread SDI cases, CFindReplaceDialogWithMessageFilter will add itself to the
// global message filters list.
In our case, we'll call it directly.
if(m_pFindReplaceDialog != NULL)
if(m_pFindReplaceDialog-&PreTranslateMessage(pMsg))
return TRUE;
return FALSE;
BEGIN_MSG_MAP(CEditView)
MESSAGE_HANDLER(WM_CREATE, OnCreate)
***************
*** 57,75 ****
MESSAGE_HANDLER(WM_KEYUP, OnKey)
MESSAGE_HANDLER(WM_LBUTTONDOWN, OnKey)
! #ifndef _WIN32_WCE
MESSAGE_HANDLER(CFindReplaceDialog::GetFindReplaceMsg(), OnFindReplaceCmd)
! #endif // _WIN32_WCE
ALT_MSG_MAP(1)
COMMAND_ID_HANDLER(ID_EDIT_UNDO, OnEditUndo)
COMMAND_ID_HANDLER(ID_EDIT_CUT, OnEditCut)
COMMAND_ID_HANDLER(ID_EDIT_COPY, OnEditCopy)
COMMAND_ID_HANDLER(ID_EDIT_PASTE, OnEditPaste)
COMMAND_ID_HANDLER(ID_EDIT_CLEAR, OnEditClear)
COMMAND_ID_HANDLER(ID_EDIT_SELECT_ALL, OnEditSelectAll)
#ifndef _WIN32_WCE
COMMAND_ID_HANDLER(ID_EDIT_WORD_WRAP, OnEditWordWrap)
COMMAND_ID_HANDLER(ID_EDIT_FIND, OnEditFind)
COMMAND_ID_HANDLER(ID_EDIT_REPEAT, OnEditFindNext)
COMMAND_ID_HANDLER(ID_EDIT_REPLACE, OnEditReplace)
COMMAND_ID_HANDLER(ID_FORMAT_FONT, OnViewFormatFont)
#endif // _WIN32_WCE
--- 70,80 ----
MESSAGE_HANDLER(WM_KEYUP, OnKey)
MESSAGE_HANDLER(WM_LBUTTONDOWN, OnKey)
COMMAND_ID_HANDLER(ID_EDIT_PASTE, OnEditPaste)
CHAIN_MSG_MAP_ALT(editCommandsClass, 1)
#ifndef _WIN32_WCE
CHAIN_MSG_MAP_ALT(findReplaceClass, 1)
COMMAND_ID_HANDLER(ID_EDIT_WORD_WRAP, OnEditWordWrap)
COMMAND_ID_HANDLER(ID_FORMAT_FONT, OnViewFormatFont)
#endif // _WIN32_WCE
***************
*** 141,162 ****
LRESULT OnEditUndo(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
LRESULT OnEditCut(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
LRESULT OnEditCopy(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
LRESULT OnEditPaste(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
--- 146,149 ----
***************
*** 169,184 ****
LRESULT OnEditClear(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
LRESULT OnEditSelectAll(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
SetSel(0, -1);
#ifndef _WIN32_WCE
LRESULT OnEditWordWrap(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
--- 156,159 ----
***************
*** 191,407 ****
LRESULT OnEditFind(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
if(m_pFindDlg != NULL)
if(m_bFindOnly)
_ASSERTE(::IsWindow(m_pFindDlg-&m_hWnd));
m_pFindDlg-&SetFocus();
m_pFindDlg-&DestroyWindow();
m_pFindDlg = new CFindReplaceD
if(m_pFindDlg == NULL)
_ASSERTE(FALSE);
::MessageBeep((UINT)-1);
m_bFindOnly = TRUE;
DWORD dwFlags = FR_HIDEUPDOWN;
if(m_bMatchCase)
dwFlags |= FR_MATCHCASE;
if(m_bWholeWord)
dwFlags |= FR_WHOLEWORD;
if(!m_pFindDlg-&Create(TRUE, m_strFind, NULL, dwFlags, m_hWnd))
delete m_pFindD
m_pFindDlg = NULL;
::MessageBeep((UINT)-1);
m_pFindDlg-&ShowWindow(SW_NORMAL);
LRESULT OnEditFindNext(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
if(m_strFind[0] == 0)
return OnEditFind(wNotifyCode, wID, hWndCtl, bHandled);
BOOL bRet = DoFindText();
::MessageBeep((UINT)-1);
LRESULT OnFindReplaceCmd(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
CFindReplaceDialog* pDlg = CFindReplaceDialog::GetNotifier(lParam);
if(pDlg == NULL)
::MessageBeep((UINT)-1);
_ASSERTE(pDlg == m_pFindDlg);
if(pDlg-&FindNext())
lstrcpyn(m_strFind, pDlg-&m_fr.lpstrFindWhat, nSearchStringLen);
m_bMatchCase = pDlg-&MatchCase();
m_bWholeWord = pDlg-&MatchWholeWord();
BOOL bRet = DoFindText();
::MessageBeep((UINT)-1);
else if(pDlg-&ReplaceCurrent())
lstrcpyn(m_strFind, pDlg-&m_fr.lpstrFindWhat, nSearchStringLen);
m_bMatchCase = pDlg-&MatchCase();
m_bWholeWord = pDlg-&MatchWholeWord();
GetSel(chrg);
if(chrg.cpMin != chrg.cpMax)
USES_CONVERSION;
LPSTR lpstrTextA = (LPSTR)_alloca(chrg.cpMax - chrg.cpMin + 2);
GetSelText(lpstrTextA);
LPTSTR lpstrText = A2T(lpstrTextA);
if(m_bMatchCase)
nRet = lstrcmp(lpstrText, m_strFind);
nRet = lstrcmpi(lpstrText, m_strFind);
if(nRet == 0)
ReplaceSel(pDlg-&GetReplaceString(), TRUE);
BOOL bRet = DoFindText();
::MessageBeep((UINT)-1);
else if(pDlg-&ReplaceAll())
lstrcpyn(m_strFind, pDlg-&m_fr.lpstrFindWhat, nSearchStringLen);
m_bMatchCase = pDlg-&MatchCase();
m_bWholeWord = pDlg-&MatchWholeWord();
HCURSOR hOldCursor = NULL;
SetRedraw(FALSE);
BOOL bRet = DoFindText(FALSE);
::MessageBeep((UINT)-1);
hOldCursor = ::SetCursor(::LoadCursor(NULL, IDC_WAIT));
ReplaceSel(pDlg-&GetReplaceString(), TRUE);
while(DoFindText(FALSE));
SetRedraw(TRUE);
Invalidate();
UpdateWindow();
if(hOldCursor != NULL)
::SetCursor(hOldCursor);
else if(pDlg-&IsTerminating())
m_pFindDlg = NULL;
BOOL DoFindText(BOOL bNext = TRUE)
DWORD dwFlags = FR_DOWN;
if(m_bMatchCase)
dwFlags |= FR_MATCHCASE;
if(m_bWholeWord)
dwFlags |= FR_WHOLEWORD;
GetSel(chrg);
FINDTEXTEX
ft.chrg.cpMin = bNext ? chrg.cpMax : chrg.cpM
ft.chrg.cpMax = -1;
ft.lpstrText = m_strF
if(FindText(dwFlags, ft) == -1)
return FALSE;
SetSel(ft.chrgText);
return TRUE;
LRESULT OnEditReplace(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
if(m_pFindDlg != NULL)
if(!m_bFindOnly)
_ASSERTE(::IsWindow(m_pFindDlg-&m_hWnd));
m_pFindDlg-&SetFocus();
m_pFindDlg-&DestroyWindow();
m_pFindDlg = new CFindReplaceD
if(m_pFindDlg == NULL)
_ASSERTE(FALSE);
::MessageBeep((UINT)-1);
m_bFindOnly = FALSE;
DWORD dwFlags = FR_HIDEUPDOWN;
if(m_bMatchCase)
dwFlags |= FR_MATCHCASE;
if(m_bWholeWord)
dwFlags |= FR_WHOLEWORD;
if(!m_pFindDlg-&Create(FALSE, m_strFind, NULL, dwFlags, m_hWnd))
delete m_pFindD
m_pFindDlg = NULL;
::MessageBeep((UINT)-1);
m_pFindDlg-&ShowWindow(SW_NORMAL);
LRESULT OnViewFormatFont(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
m_font.GetLogFont(&dlg.m_lf);
dlg.m_cf.Flags |= CF_INITTOLOGFONTSTRUCT;
if (dlg.DoModal() == IDOK)
m_font.DeleteObject();
m_font.CreateFontIndirect(&dlg.m_lf);
SetFont(m_font);
#endif // _WIN32_WCE
--- 166,232 ----
LRESULT OnViewFormatFont(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
m_font.GetLogFont(&dlg.m_lf);
dlg.m_cf.Flags |= CF_INITTOLOGFONTSTRUCT;
if (dlg.DoModal() == IDOK)
m_font.DeleteObject();
m_font.CreateFontIndirect(&dlg.m_lf);
SetFont(m_font);
+ #endif // _WIN32_WCE
! // Overrides from CEditFindReplaceImpl
! #ifndef _WIN32_WCE
CFindReplaceDialogWithMessageFilter* CreateFindReplaceDialog(BOOL bFindOnly, // TRUE for Find, FALSE for FindReplace
LPCTSTR lpszFindWhat,
LPCTSTR lpszReplaceWith = NULL,
DWORD dwFlags = FR_DOWN,
HWND hWndParent = NULL)
// In non Multi-Threaded SDI cases, we'd pass in the message loop to CFindReplaceDialogWithMessageFilter.
// In our case, we'll call PreTranslateMessage directly from this class.
//CFindReplaceDialogWithMessageFilter* findReplaceDialog =
// new CFindReplaceDialogWithMessageFilter(_Module.GetMessageLoop());
CFindReplaceDialogWithMessageFilter* findReplaceDialog =
new CFindReplaceDialogWithMessageFilter(NULL);
if(findReplaceDialog == NULL)
::MessageBeep(MB_ICONHAND);
HWND hWndFindReplace = findReplaceDialog-&Create(bFindOnly,
lpszFindWhat, lpszReplaceWith, dwFlags, hWndParent);
if(hWndFindReplace == NULL)
delete findReplaceD
findReplaceDialog = NULL;
findReplaceDialog-&SetActiveWindow();
findReplaceDialog-&ShowWindow(SW_SHOW);
return findReplaceD
DWORD GetFindReplaceDialogFlags(void) const
DWORD dwFlags = FR_HIDEWHOLEWORD;
if(m_bFindDown)
dwFlags |= FR_DOWN;
if(m_bMatchCase)
dwFlags |= FR_MATCHCASE;
return dwF
#endif // _WIN32_WCE
Index: MTPad.dsp
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MTPad.dsp 12 May :15 -.1.1
--- MTPad.dsp 27 Mar :05 -
***************
*** 71,75 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
! # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "STRICT" /Yu"stdatl.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 71,75 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
! # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "STRICT" /FR /Yu"stdatl.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 116,119 ****
--- 116,123 ----
# Begin Source File
+ SOURCE=.\finddlg.h
+ # End Source File
+ # Begin Source File
SOURCE=.\mainfrm.h
# End Source File
Index: MTPad.vcproj
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MTPad/MTPad.vcproj,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MTPad.vcproj 12 May :15 -.1.1
--- MTPad.vcproj 27 Mar :05 -
***************
*** 161,164 ****
--- 161,167 ----
RelativePath=".\finddlg.h"&
RelativePath=".\mainfrm.h"&
Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22858/include
Added Files:
Log Message:
Add new atlfind.h containing new mixin classes to help implement find/replace functionality for CEdit or CRichEditCtrl based window classes:
CEditFindReplaceImplBase&T, TFindReplaceDialog&
CEditFindReplaceImpl&T, TFindReplaceDialog&
CRichEditFindReplaceImpl&T, TFindReplaceDialog&
Update MTPad sample to show usage of CRichEditFindReplaceImpl.
Fix depracated warning in MTPad usage of CRecentDocumentListBase::GetFromList.
In MTPad accelerator table, add Ctrl+H for replace and Shift+F3 for repeat (in reverse).
In MTPad view class, use CEditCommands/CRichEditCommands to show usage example.
--- NEW FILE: atlfind.h ---
#ifndef __ATLFIND_H__
#define __ATLFIND_H__
#pragma once
#ifndef __cplusplus
#error ATL requires C++ compilation (use a .cpp suffix)
#ifndef __ATLAPP_H__
#error atlfind.h requires atlapp.h to be included first
#ifndef __ATLWIN_H__
#error atlfind.h requires atlwin.h to be included first
#ifndef __ATLGDI_H__
[...1012 lines suppressed...]
// not found
return FALSE;
long FindAndSelect(DWORD dwFlags, FINDTEXTEX& ft)
T* pT = static_cast&T*&(this);
LONG index = pT-&FindText(dwFlags, ft);
if(index != -1) // i.e. we found something
pT-&SetSel(ft.chrgText);
#endif // _WIN32_WCE
}; // namespace WTL
#endif // __ATLFIND_H__
Update of /cvsroot/wtl/wtl/Wizards/WTLApp70/Templates/1033
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25273
Modified Files:
Frame.cpp Frame.h
Log Message:
Naming fix
Index: Frame.cpp
===================================================================
RCS file: /cvsroot/wtl/wtl/Wizards/WTLApp70/Templates/1033/Frame.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Frame.cpp 27 Mar :41 -
--- Frame.cpp 27 Mar :21 -
***************
*** 346,352 ****
! LRESULT [!output WTL_FRAME_CLASS]::OnWindowTab(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
m_view.SetActivePage(wID-ID_WINDOW_TABFIRST);
--- 346,353 ----
! LRESULT [!output WTL_FRAME_CLASS]::OnWindowActivate(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
int nPage = wID - ID_WINDOW_TABFIRST;
m_view.SetActivePage(nPage);
Index: Frame.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Wizards/WTLApp70/Templates/1033/Frame.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Frame.h 27 Mar :41 -
--- Frame.h 27 Mar :21 -
***************
*** 113,117 ****
COMMAND_ID_HANDLER(ID_WINDOW_CLOSE, OnWindowClose)
COMMAND_ID_HANDLER(ID_WINDOW_CLOSE_ALL, OnWindowCloseAll)
COMMAND_RANGE_HANDLER(ID_WINDOW_TABFIRST, ID_WINDOW_TABLAST, OnWindowTab)
[!if WTL_APPTYPE_EXPLORER]
--- 113,117 ----
COMMAND_ID_HANDLER(ID_WINDOW_CLOSE, OnWindowClose)
COMMAND_ID_HANDLER(ID_WINDOW_CLOSE_ALL, OnWindowCloseAll)
COMMAND_RANGE_HANDLER(ID_WINDOW_TABFIRST, ID_WINDOW_TABLAST, OnWindowActivate)
[!if WTL_APPTYPE_EXPLORER]
***************
*** 485,494 ****
[!if WTL_USE_CPP_FILES]
! LRESULT OnWindowTab(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
! LRESULT OnWindowTab(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
m_view.SetActivePage(wID-ID_WINDOW_TABFIRST);
--- 485,495 ----
[!if WTL_USE_CPP_FILES]
! LRESULT OnWindowActivate(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
! LRESULT OnWindowActivate(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
int nPage = wID - ID_WINDOW_TABFIRST;
m_view.SetActivePage(nPage);
Update of /cvsroot/wtl/wtl/Wizards/WTLApp70/Templates/1033
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16107
Modified Files:
Frame.cpp Frame.h
Log Message:
Menu handler for window switching
Index: Frame.cpp
===================================================================
RCS file: /cvsroot/wtl/wtl/Wizards/WTLApp70/Templates/1033/Frame.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Frame.cpp 21 Mar :16 -
--- Frame.cpp 27 Mar :41 -
***************
*** 345,348 ****
--- 345,355 ----
+ LRESULT [!output WTL_FRAME_CLASS]::OnWindowTab(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
m_view.SetActivePage(wID-ID_WINDOW_TABFIRST);
[!if WTL_APPTYPE_EXPLORER]
Index: Frame.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Wizards/WTLApp70/Templates/1033/Frame.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Frame.h 21 Mar :16 -
--- Frame.h 27 Mar :41 -
***************
*** 113,116 ****
--- 113,117 ----
COMMAND_ID_HANDLER(ID_WINDOW_CLOSE, OnWindowClose)
COMMAND_ID_HANDLER(ID_WINDOW_CLOSE_ALL, OnWindowCloseAll)
COMMAND_RANGE_HANDLER(ID_WINDOW_TABFIRST, ID_WINDOW_TABLAST, OnWindowTab)
[!if WTL_APPTYPE_EXPLORER]
***************
*** 483,486 ****
--- 484,498 ----
+ [!if WTL_USE_CPP_FILES]
+ LRESULT OnWindowTab(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+ LRESULT OnWindowTab(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
m_view.SetActivePage(wID-ID_WINDOW_TABFIRST);
+ [!endif]
[!if WTL_APPTYPE_EXPLORER]
Update of /cvsroot/wtl/wtl/Samples/MiniPie
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4330/Samples/MiniPie
Modified Files:
MiniPie.sln MiniPieFrame.cpp
Log Message:
Added WM 6 platforms
Updated to use atlmisc.h 1.30 AtlLoadString(UINT uID)
Index: MiniPieFrame.cpp
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MiniPie/MiniPieFrame.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MiniPieFrame.cpp 23 Jan :07 -
--- MiniPieFrame.cpp 25 Mar :54 -
***************
*** 92,96 ****
TBBUTTONINFO tbbi = { sizeof(TBBUTTONINFO), TBIF_TEXT | TBIF_COMMAND | TBIF_BYINDEX };
tbbi.idCommand =
tbbi.pszText = CString(MAKEINTRESOURCE(iID)).GetBuffer();
return CMenuBarCtrl(m_hWndCECommandBar).SetButtonInfo(bRight, &tbbi);
--- 92,96 ----
TBBUTTONINFO tbbi = { sizeof(TBBUTTONINFO), TBIF_TEXT | TBIF_COMMAND | TBIF_BYINDEX };
tbbi.idCommand =
tbbi.pszText = (LPTSTR)AtlLoadString(iID);
return CMenuBarCtrl(m_hWndCECommandBar).SetButtonInfo(bRight, &tbbi);
Index: MiniPie.sln
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MiniPie/MiniPie.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MiniPie.sln 23 Jan :07 -
--- MiniPie.sln 25 Mar :54 -
***************
*** 7,12 ****
--- 7,16 ----
Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
Debug|Windows Mobile 6 Professional SDK (ARMV4I) = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
Debug|Windows Mobile 6 Standard SDK (ARMV4I) = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
Release|Windows Mobile 6 Professional SDK (ARMV4I) = Release|Windows Mobile 6 Professional SDK (ARMV4I)
Release|Windows Mobile 6 Standard SDK (ARMV4I) = Release|Windows Mobile 6 Standard SDK (ARMV4I)
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
***************
*** 17,20 ****
--- 21,30 ----
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
***************
*** 23,26 ****
--- 33,42 ----
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
{092EFB7-AD3F-66F479C1A0DF}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Update of /cvsroot/wtl/wtl/Samples/MiniPie
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2477/Samples/MiniPie
Modified Files:
MiniPie.vcproj stdafx.h
Log Message:
Added WM 6 platforms
Updated to use atlmisc.h 1.30 AtlLoadString(UINT uID)
Index: stdafx.h
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MiniPie/stdafx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stdafx.h 23 Jan :07 -
--- stdafx.h 25 Mar :06 -
***************
*** 29,32 ****
--- 29,33 ----
#include &atlframe.h&
+ #include &atlmisc.h&
#include &atlctrls.h&
#include &atlddx.h&
Index: MiniPie.vcproj
===================================================================
RCS file: /cvsroot/wtl/wtl/Samples/MiniPie/MiniPie.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MiniPie.vcproj 23 Jan :25 -
--- MiniPie.vcproj 25 Mar :06 -
***************
*** 14,17 ****
--- 14,23 ----
Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
Name="Windows Mobile 6 Professional SDK (ARMV4I)"
Name="Windows Mobile 6 Standard SDK (ARMV4I)"
&/Platforms&
&ToolFiles&
***************
*** 65,68 ****
--- 71,75 ----
Name="VCResourceCompilerTool"
AdditionalOptions="-n"
PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE=$(CEVER);SHELLSDK_MODULES_AYGSHELL"
Culture="1033"
***************
*** 153,156 ****
--- 160,164 ----
Name="VCResourceCompilerTool"
AdditionalOptions="-n"
PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE=$(CEVER);SHELLSDK_MODULES_AYGSHELL"
Culture="1033"
***************
*** 240,243 ****
--- 248,252 ----
Name="VCResourceCompilerTool"
AdditionalOptions="-n"
PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE=$(CEVER);SHELLSDK_MODULES_AYGSHELL"
Culture="1033"
***************
*** 326,329 ****
--- 335,698 ----
Name="VCResourceCompilerTool"
AdditionalOptions="-n"
PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE=$(CEVER);SHELLSDK_MODULES_AYGSHELL"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
Name="VCPreLinkEventTool"
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
AdditionalDependencies="atls.lib libcmt.lib corelibc.lib coredll.lib commctrl.lib ole32.lib oleaut32.lib uuid.lib atl.lib atlosapis.lib $(NOINHERIT) $(NOINHERIT)"
LinkIncremental="1"
DelayLoadDLLs="$(NOINHERIT)"
SubSystem="0"
Name="VCALinkTool"
Name="VCXDCMakeTool"
Name="VCBscMakeTool"
Name="VCCodeSignTool"
Name="VCPostBuildEventTool"
&DeploymentTool
ForceDirty="-1"
RemoteDirectory=""
RegisterOutput="0"
AdditionalFiles=""
&DebuggerTool
&/Configuration&
&Configuration
Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
Name="VCPreBuildEventTool"
Name="VCCustomBuildTool"
Name="VCXMLDataGeneratorTool"
Name="VCWebServiceProxyGeneratorTool"
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/MiniPie.tlb"
HeaderFileName="MiniPie.h"
DLLDataFileName=""
InterfaceIdentifierFileName="MiniPie_i.c"
ProxyFileName="MiniPie_p.c"
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;_DEBUG;$(PLATFORMDEFINES);$(ARCHFAM);$(_ARCHFAM_);_UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
MinimalRebuild="true"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
WarningLevel="4"
DebugInformationFormat="3"
Name="VCManagedResourceCompilerTool"
Name="VCResourceCompilerTool"
AdditionalOptions="-n"
PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE=$(CEVER);SHELLSDK_MODULES_AYGSHELL"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
Name="VCPreLinkEventTool"
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
AdditionalDependencies="atlsd.lib libcmtd.lib corelibc.lib coredll.lib commctrl.lib ole32.lib oleaut32.lib uuid.lib atl.lib atlosapis.lib $(NOINHERIT) $(NOINHERIT)"
LinkIncremental="2"
DelayLoadDLLs="$(NOINHERIT)"
GenerateDebugInformation="true"
SubSystem="0"
TargetMachine="0"
Name="VCALinkTool"
Name="VCXDCMakeTool"
Name="VCBscMakeTool"
Name="VCCodeSignTool"
Name="VCPostBuildEventTool"
&DeploymentTool
ForceDirty="-1"
RemoteDirectory=""
RegisterOutput="0"
AdditionalFiles=""
&DebuggerTool
&/Configuration&
&Configuration
Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
Name="VCPreBuildEventTool"
Name="VCCustomBuildTool"
Name="VCXMLDataGeneratorTool"
Name="VCWebServiceProxyGeneratorTool"
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/MiniPie.tlb"
HeaderFileName="MiniPie.h"
DLLDataFileName=""
InterfaceIdentifierFileName="MiniPie_i.c"
ProxyFileName="MiniPie_p.c"
Name="VCCLCompilerTool"
ExecutionBucket="7"
PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;NDEBUG;$(PLATFORMDEFINES);$(ARCHFAM);$(_ARCHFAM_);_UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
ExceptionHandling="0"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
WarningLevel="4"
DebugInformationFormat="0"
Name="VCManagedResourceCompilerTool"
Name="VCResourceCompilerTool"
AdditionalOptions="-n"
PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE=$(CEVER);SHELLSDK_MODULES_AYGSHELL"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
Name="VCPreLinkEventTool"
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
AdditionalDependencies="atls.lib libcmt.lib corelibc.lib coredll.lib commctrl.lib ole32.lib oleaut32.lib uuid.lib atl.lib atlosapis.lib $(NOINHERIT) $(NOINHERIT)"
LinkIncremental="1"
DelayLoadDLLs="$(NOINHERIT)"
SubSystem="0"
TargetMachine="0"
Name="VCALinkTool"
Name="VCXDCMakeTool"
Name="VCBscMakeTool"
Name="VCCodeSignTool"
Name="VCPostBuildEventTool"
&DeploymentTool
ForceDirty="-1"
RemoteDirectory=""
RegisterOutput="0"
AdditionalFiles=""
&DebuggerTool
&/Configuration&
&Configuration
Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
Name="VCPreBuildEventTool"
Name="VCCustomBuildTool"
Name="VCXMLDataGeneratorTool"
Name="VCWebServ
