[Winmerge-svn] SF.net SVN: winmerge:[7452] branches/R2_14/Src

[<ge...@us...>]

Revision: 7452
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7452&view=rev
Author:   gerundt
Date:     2010-12-06 06:56:28 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
PATCH: [ 3117406 ] Drop GetClipTcharTextFormat() function

Modified Paths:
--------------
    branches/R2_14/Src/Common/ClipBoard.cpp
    branches/R2_14/Src/FilepathEdit.cpp
    branches/R2_14/Src/StdAfx.cpp
    branches/R2_14/Src/StdAfx.h
    branches/R2_14/Src/editlib/ccrystaleditview.cpp
    branches/R2_14/Src/editlib/ccrystaltextview2.cpp

Modified: branches/R2_14/Src/Common/ClipBoard.cpp
===================================================================
--- branches/R2_14/Src/Common/ClipBoard.cpp	2010-12-06 06:55:47 UTC (rev 7451)
+++ branches/R2_14/Src/Common/ClipBoard.cpp	2010-12-06 06:56:28 UTC (rev 7452)
@@ -31,8 +31,7 @@
 			LPTSTR pszData = (LPTSTR)::GlobalLock(hData);
 			_tcscpy(pszData, text.c_str());
 			GlobalUnlock(hData);
-			UINT fmt = GetClipTcharTextFormat();
-			bOK = SetClipboardData(fmt, hData) != NULL;
+			bOK = SetClipboardData(CF_UNICODETEXT, hData) != NULL;
 		}
 		CloseClipboard();
 	}
@@ -50,8 +49,7 @@
 	bool bSuccess = false;
 	if (OpenClipboard(currentWindowHandle))
 	{
-		UINT fmt = GetClipTcharTextFormat();
-		HGLOBAL hData = GetClipboardData(fmt);
+		HGLOBAL hData = GetClipboardData(CF_UNICODETEXT);
 		if (hData != NULL)
 		{
 			LPTSTR pszData = (LPTSTR) GlobalLock(hData);
@@ -73,6 +71,5 @@
  */
 bool TextInClipboard()
 {
-	UINT fmt = GetClipTcharTextFormat();
-	return IsClipboardFormatAvailable(fmt) != FALSE;
+	return IsClipboardFormatAvailable(CF_UNICODETEXT) != FALSE;
 }

Modified: branches/R2_14/Src/FilepathEdit.cpp
===================================================================
--- branches/R2_14/Src/FilepathEdit.cpp	2010-12-06 06:55:47 UTC (rev 7451)
+++ branches/R2_14/Src/FilepathEdit.cpp	2010-12-06 06:56:28 UTC (rev 7452)
@@ -241,9 +241,8 @@
 	// Copy selected data from m_sOriginalText into the alloc'd data area
 	_tcscpy (pszData, (LPTSTR) m_sOriginalText.Mid(iBegin, iEnd - iBegin).GetBuffer(0));
 	GlobalUnlock (hData);
-	UINT fmt = GetClipTcharTextFormat();      // CF_TEXT or CF_UNICODETEXT
 	// Using alloc'd data, set the clipboard
-	SetClipboardData (fmt, hData);
+	SetClipboardData (CF_UNICODETEXT, hData);
 
 	// release the clipboard
 	CloseClipboard ();

Modified: branches/R2_14/Src/StdAfx.cpp
===================================================================
--- branches/R2_14/Src/StdAfx.cpp	2010-12-06 06:55:47 UTC (rev 7451)
+++ branches/R2_14/Src/StdAfx.cpp	2010-12-06 06:56:28 UTC (rev 7452)
@@ -149,12 +149,6 @@
 	return str;
 }
 
-// Get appropriate clipboard format for TCHAR text
-int GetClipTcharTextFormat()
-{
-	return CF_UNICODETEXT;
-}
-
 #if _MSC_VER <= 1310
 /**
 * @brief Calculates a number absolute value.

Modified: branches/R2_14/Src/StdAfx.h
===================================================================
--- branches/R2_14/Src/StdAfx.h	2010-12-06 06:55:47 UTC (rev 7451)
+++ branches/R2_14/Src/StdAfx.h	2010-12-06 06:56:28 UTC (rev 7452)
@@ -139,9 +139,6 @@
 	/** @brief Inline sprintf-style format; shortcut for CString::Format */
 CString Fmt(LPCTSTR fmt, ...);
 
-	/** @brief Get appropriate clipboard format for TCHAR text, ie, CF_TEXT or CF_UNICODETEXT */
-int GetClipTcharTextFormat();
-
 	/** @brief include for the custom dialog boxes, with do not ask/display again */
 #include "MessageBoxDialog.h"
 

Modified: branches/R2_14/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaleditview.cpp	2010-12-06 06:55:47 UTC (rev 7451)
+++ branches/R2_14/Src/editlib/ccrystaleditview.cpp	2010-12-06 06:56:28 UTC (rev 7452)
@@ -964,8 +964,7 @@
 DROPEFFECT CEditDropTargetImpl::
 OnDragEnter (CWnd * pWnd, COleDataObject * pDataObject, DWORD dwKeyState, CPoint point)
 {
-  UINT fmt = GetClipTcharTextFormat();
-  if (!pDataObject->IsDataAvailable (fmt))
+  if (!pDataObject->IsDataAvailable (CF_UNICODETEXT))
     {
       m_pOwner->HideDropIndicator ();
       return DROPEFFECT_NONE;
@@ -1003,8 +1002,7 @@
   //  if ((pDataObject->IsDataAvailable( CF_TEXT ) ) ||       // If Text Available
   //          ( pDataObject -> IsDataAvailable( xxx ) ) ||    // Or xxx Available
   //          ( pDataObject -> IsDataAvailable( yyy ) ) )     // Or yyy Available
-  UINT fmt = GetClipTcharTextFormat();      // CF_TEXT or CF_UNICODETEXT
-  if (pDataObject->IsDataAvailable (fmt))   // If Text Available
+  if (pDataObject->IsDataAvailable (CF_UNICODETEXT))   // If Text Available
 
     {
       bDataSupported = true;    // Set Flag
@@ -1045,8 +1043,7 @@
   //  if( ( pDataObject -> IsDataAvailable( CF_TEXT ) ) ||    // If Text Available
   //          ( pDataObject -> IsDataAvailable( xxx ) ) ||    // Or xxx Available
   //          ( pDataObject -> IsDataAvailable( yyy ) ) )     // Or yyy Available
-  UINT fmt = GetClipTcharTextFormat();      // CF_TEXT or CF_UNICODETEXT
-  if (pDataObject->IsDataAvailable (fmt))   // If Text Available
+  if (pDataObject->IsDataAvailable (CF_UNICODETEXT))   // If Text Available
 
     {
       bDataSupported = true;    // Set Flag
@@ -1119,8 +1116,7 @@
 BOOL CCrystalEditView::
 DoDropText (COleDataObject * pDataObject, const CPoint & ptClient)
 {
-  UINT fmt = GetClipTcharTextFormat();      // CF_TEXT or CF_UNICODETEXT
-  HGLOBAL hData = pDataObject->GetGlobalData (fmt);
+  HGLOBAL hData = pDataObject->GetGlobalData (CF_UNICODETEXT);
   if (hData == NULL)
     return FALSE;
 

Modified: branches/R2_14/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview2.cpp	2010-12-06 06:55:47 UTC (rev 7451)
+++ branches/R2_14/Src/editlib/ccrystaltextview2.cpp	2010-12-06 06:56:28 UTC (rev 7452)
@@ -794,8 +794,7 @@
             m_pTextBuffer->BeginUndoGroup ();
 
           COleDataSource ds;
-          UINT fmt = GetClipTcharTextFormat();      // CF_TEXT or CF_UNICODETEXT
-          ds.CacheGlobalData (fmt, hData);
+          ds.CacheGlobalData (CF_UNICODETEXT, hData);
           m_bDraggingText = TRUE;
           DROPEFFECT de = ds.DoDragDrop (GetDropEffect ());
           if (de != DROPEFFECT_NONE)
@@ -1118,8 +1117,7 @@
 BOOL CCrystalTextView::
 TextInClipboard ()
 {
-  UINT fmt = GetClipTcharTextFormat();
-  return IsClipboardFormatAvailable (fmt);
+  return IsClipboardFormatAvailable (CF_UNICODETEXT);
 }
 
 BOOL CCrystalTextView::
@@ -1142,8 +1140,7 @@
           LPTSTR pszData = (LPTSTR)::GlobalLock (hData);
           memcpy (pszData, pszText, cbData);
           GlobalUnlock (hData);
-          UINT fmt = GetClipTcharTextFormat();
-          bOK = SetClipboardData (fmt, hData) != NULL;
+          bOK = SetClipboardData (CF_UNICODETEXT, hData) != NULL;
           if (bOK)
             SetClipboardData (RegisterClipboardFormat (_T("WinMergeClipboard")), NULL);
         }
@@ -1158,8 +1155,7 @@
   BOOL bSuccess = FALSE;
   if (OpenClipboard ())
     {
-      UINT fmt = GetClipTcharTextFormat();
-      HGLOBAL hData = GetClipboardData (fmt);
+      HGLOBAL hData = GetClipboardData (CF_UNICODETEXT);
       if (hData != NULL)
         {
           LPTSTR pszData = (LPTSTR) GlobalLock (hData);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.