Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OnEnter/OnDragOver API update (compiles, links, somewhat runs under wxGTK)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-21 17:47:45 +00:00
parent e5d6aa2208
commit c9057ae1c5
6 changed files with 124 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/dnd.cpp
View File

@@ -188,22 +188,24 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
this is only valid for the duration of this call */
drop_target->SetDragContext( context );
bool ret = FALSE;
/* TODO: what should be the default behaviour? Copy or move? */
wxDragResult result = wxDragMove;
if (drop_target->m_firstMotion)
{
/* the first "drag_motion" event substitutes a "drag_enter" event */
ret = drop_target->OnEnter( x, y );
result = drop_target->OnEnter( x, y, result );
}
else
{
/* give program a chance to react (i.e. to say no by returning FALSE) */
ret = drop_target->OnMove( x, y );
result = drop_target->OnDragOver( x, y, result );
}
/* we don't yet handle which "actions" (i.e. copy or move)
the target accepts. so far we simply accept the
suggested action. TODO. */
bool ret = result != wxDragNone;
if (ret)
gdk_drag_status( context, context->suggested_action, time );
@@ -367,7 +369,17 @@ wxDropTarget::wxDropTarget( wxDataObject *data )
m_dragTime = 0;
}
bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )
wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
wxCoord WXUNUSED(y),
wxDragResult def )
{
if (!m_dataObject)
return FALSE;
return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
}
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
@@ -375,23 +387,7 @@ bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )
return (GetMatchingPair() != (GdkAtom) 0);
}
bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
return (GetMatchingPair() != (GdkAtom) 0);
}
bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
return (GetMatchingPair() != (GdkAtom) 0);
}
bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
bool wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;

38
src/gtk1/dnd.cpp
View File

@@ -188,22 +188,24 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
this is only valid for the duration of this call */
drop_target->SetDragContext( context );
bool ret = FALSE;
/* TODO: what should be the default behaviour? Copy or move? */
wxDragResult result = wxDragMove;
if (drop_target->m_firstMotion)
{
/* the first "drag_motion" event substitutes a "drag_enter" event */
ret = drop_target->OnEnter( x, y );
result = drop_target->OnEnter( x, y, result );
}
else
{
/* give program a chance to react (i.e. to say no by returning FALSE) */
ret = drop_target->OnMove( x, y );
result = drop_target->OnDragOver( x, y, result );
}
/* we don't yet handle which "actions" (i.e. copy or move)
the target accepts. so far we simply accept the
suggested action. TODO. */
bool ret = result != wxDragNone;
if (ret)
gdk_drag_status( context, context->suggested_action, time );
@@ -367,7 +369,17 @@ wxDropTarget::wxDropTarget( wxDataObject *data )
m_dragTime = 0;
}
bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )
wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
wxCoord WXUNUSED(y),
wxDragResult def )
{
if (!m_dataObject)
return FALSE;
return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
}
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
@@ -375,23 +387,7 @@ bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )
return (GetMatchingPair() != (GdkAtom) 0);
}
bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
return (GetMatchingPair() != (GdkAtom) 0);
}
bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
return (GetMatchingPair() != (GdkAtom) 0);
}
bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
bool wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;

74
src/msw/ole/droptgt.cpp
View File

@@ -79,6 +79,13 @@ private:
static inline DWORD GetDropEffect(DWORD flags);
};
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
static wxDragResult ConvertDragEffectToResult(DWORD dwEffect);
static DWORD ConvertDragResultToEffect(wxDragResult result);
// ============================================================================
// wxIDropTarget implementation
// ============================================================================
@@ -138,16 +145,18 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
return S_OK;
}
// TODO should check the point also?
*pdwEffect = GetDropEffect(grfKeyState);
// get hold of the data object
m_pIDataObject = pIDataSource;
m_pIDataObject->AddRef();
// give some visual feedback
m_pTarget->OnEnter();
*pdwEffect = ConvertDragResultToEffect(
m_pTarget->OnEnter(pt.x, pt.y,
ConvertDragEffectToResult(
GetDropEffect(grfKeyState)
)
)
);
return S_OK;
}
@@ -167,8 +176,19 @@ STDMETHODIMP wxIDropTarget::DragOver(DWORD grfKeyState,
{
// there are too many of them... wxLogDebug("IDropTarget::DragOver");
*pdwEffect = m_pIDataObject == NULL ? DROPEFFECT_NONE
: GetDropEffect(grfKeyState);
wxDragResult result;
if ( m_pIDataObject ) {
result = ConvertDragEffectToResult(GetDropEffect(grfKeyState));
}
else {
// can't accept data anyhow normally
result = wxDragNone;
}
*pdwEffect = ConvertDragResultToEffect(
m_pTarget->OnDragOver(pt.x, pt.y, result)
);
return S_OK;
}
@@ -435,5 +455,45 @@ bool wxFileDropTarget::OnData(wxCoord x, wxCoord y)
((wxFileDataObject *)m_dataObject)->GetFilenames());
}
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
static wxDragResult ConvertDragEffectToResult(DWORD dwEffect)
{
switch ( dwEffect ) {
case DROPEFFECT_COPY:
return wxDragCopy;
case DROPEFFECT_MOVE:
return wxDragMove;
default:
wxFAIL_MSG(wxT("invalid value in ConvertDragEffectToResult"));
// fall through
case DROPEFFECT_NONE:
return wxDragNone;
}
}
static DWORD ConvertDragResultToEffect(wxDragResult result)
{
switch ( result ) {
case wxDragCopy:
return DROPEFFECT_COPY;
case wxDragMove:
return DROPEFFECT_MOVE;
default:
wxFAIL_MSG(wxT("invalid value in ConvertDragResultToEffect"));
// fall through
case wxDragNone:
return DROPEFFECT_NONE;
}
}
#endif
// wxUSE_DRAG_AND_DROP