From 409625a0e8541d7cea7a108951699970953af757 Mon Sep 17 00:00:00 2001 From: Timo Kunze Date: Sun, 28 Apr 2019 18:00:32 +0200 Subject: [PATCH] Make drag'n'drop to programs like Total Commander and FileZilla work if data is provided delayed. Prepared release of version 1.3.5. --- CHANGELOG | 6 ++++++ README.md | 4 ++-- help/ANSI/Doxygen/private docs CHM.cfg | 2 +- help/ANSI/Doxygen/private docs.cfg | 2 +- help/ANSI/Doxygen/public docs CHM.cfg | 2 +- help/ANSI/Doxygen/public docs.cfg | 2 +- help/Unicode/Doxygen/private docs CHM.cfg | 2 +- help/Unicode/Doxygen/private docs.cfg | 2 +- help/Unicode/Doxygen/public docs CHM.cfg | 2 +- help/Unicode/Doxygen/public docs.cfg | 2 +- src/SourceOLEDataObject.cpp | 8 ++++++-- src/res/resource.h | 2 +- 12 files changed, 23 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b33245a..b837361 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +Version 1.3.5 - 28/04/2019 + +- FIX: Dragging data to certain programs like Total Commander or FileZilla did not work if the data was provided only in the OLESetData event. + + + Version 1.3.4 - 04/02/2018 - Upgraded to WTL 10. diff --git a/README.md b/README.md index 52f6e71..f7a5d24 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- - Release 1.3.4 Release + + Release 1.3.5 Release Download ToolBarControls diff --git a/help/ANSI/Doxygen/private docs CHM.cfg b/help/ANSI/Doxygen/private docs CHM.cfg index 1d8d2dc..a48e1d6 100644 --- a/help/ANSI/Doxygen/private docs CHM.cfg +++ b/help/ANSI/Doxygen/private docs CHM.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/ANSI/Doxygen/private docs.cfg b/help/ANSI/Doxygen/private docs.cfg index c8dd5f4..38d6e42 100644 --- a/help/ANSI/Doxygen/private docs.cfg +++ b/help/ANSI/Doxygen/private docs.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/ANSI/Doxygen/public docs CHM.cfg b/help/ANSI/Doxygen/public docs CHM.cfg index cccff86..adee305 100644 --- a/help/ANSI/Doxygen/public docs CHM.cfg +++ b/help/ANSI/Doxygen/public docs CHM.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/ANSI/Doxygen/public docs.cfg b/help/ANSI/Doxygen/public docs.cfg index 9ff6cdd..9a4b56a 100644 --- a/help/ANSI/Doxygen/public docs.cfg +++ b/help/ANSI/Doxygen/public docs.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/Unicode/Doxygen/private docs CHM.cfg b/help/Unicode/Doxygen/private docs CHM.cfg index dbe0b54..0bbbf26 100644 --- a/help/Unicode/Doxygen/private docs CHM.cfg +++ b/help/Unicode/Doxygen/private docs CHM.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/Unicode/Doxygen/private docs.cfg b/help/Unicode/Doxygen/private docs.cfg index 91e6d44..e1f61e7 100644 --- a/help/Unicode/Doxygen/private docs.cfg +++ b/help/Unicode/Doxygen/private docs.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/Unicode/Doxygen/public docs CHM.cfg b/help/Unicode/Doxygen/public docs CHM.cfg index 5b089bd..36ca77d 100644 --- a/help/Unicode/Doxygen/public docs CHM.cfg +++ b/help/Unicode/Doxygen/public docs CHM.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/help/Unicode/Doxygen/public docs.cfg b/help/Unicode/Doxygen/public docs.cfg index 1b248df..496fadc 100644 --- a/help/Unicode/Doxygen/public docs.cfg +++ b/help/Unicode/Doxygen/public docs.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = "TimoSoft ToolBarControls" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4.255 +PROJECT_NUMBER = 1.3.5.258 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/SourceOLEDataObject.cpp b/src/SourceOLEDataObject.cpp index 7d4d93e..ea7f60b 100644 --- a/src/SourceOLEDataObject.cpp +++ b/src/SourceOLEDataObject.cpp @@ -301,8 +301,12 @@ STDMETHODIMP SourceOLEDataObject::QueryGetData(FORMATETC* pFormat) if(!pDataEntry->pData) { if(secondChance) { - // format not supported - return DV_E_FORMATETC; + if(properties.pOwnerToolBar && properties.pOwnerToolBar->dragDropStatus.IsDragging()) { + return S_OK; + } else { + // format not supported + return DV_E_FORMATETC; + } } // raise the OLESetData event diff --git a/src/res/resource.h b/src/res/resource.h index 54daf06..99315a2 100644 --- a/src/res/resource.h +++ b/src/res/resource.h @@ -13,7 +13,7 @@ #define VERSION_BUILD 258 #define STRFILEVERSION "1.3.5.258" #define STRPRODUCTVERSION "1.3" -#define STRTIMESTAMP "2019/04/28 17:53:33" +#define STRTIMESTAMP "2019/04/28 17:55:40" #define IDB_REBAR 1 #define IDB_TOOLBAR 2