From 77c8787c164beb31e6a0eafbd3215bc377af6946 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 25 Nov 2006 14:08:27 +0000 Subject: [PATCH] move wxIsDragResultOk out of line to avoid problems with DLL-exported inline functions (mingw32 3.4.5 warns about it) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dnd.h | 7 +++---- src/common/dndcmn.cpp | 6 +++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/wx/dnd.h b/include/wx/dnd.h index ccc82d422a..498bbc7afe 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -45,10 +45,9 @@ enum wxDragResult wxDragCancel // the operation was cancelled by user (not an error) }; -inline WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res) -{ - return res == wxDragCopy || res == wxDragMove || res == wxDragLink; -} +// return true if res indicates that something was done during a dnd operation, +// i.e. is neither error nor none nor cancel +WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res); // ---------------------------------------------------------------------------- // wxDropSource is the object you need to create (and call DoDragDrop on it) diff --git a/src/common/dndcmn.cpp b/src/common/dndcmn.cpp index b13ba86d34..7cc7e7413a 100644 --- a/src/common/dndcmn.cpp +++ b/src/common/dndcmn.cpp @@ -20,4 +20,8 @@ #include "wx/dnd.h" -// Not much to do here, really, but GNU need this file. +bool wxIsDragResultOk(wxDragResult res) +{ + return res == wxDragCopy || res == wxDragMove || res == wxDragLink; +} + -- 2.45.2