Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 16:50:23 +00:00
parent 665b537f51
commit 521bf4ff3e
50 changed files with 311 additions and 362 deletions

View File

@@ -1,13 +1,18 @@
///////////////////////////////////////////////////////////////////////////////
// Name: dnd.cpp
// Name: src/x11/dnd.cpp
// Purpose: wxDropTarget, wxDropSource classes
// Author: Julian Smart
// Id: $Id$
// Copyright: (c) 1998 Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
#pragma hdrstop
#endif
#if wxUSE_DRAG_AND_DROP
@@ -44,14 +49,14 @@ wxDropTarget::~wxDropTarget()
bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
{
OnDropText( x, y, (const char*)data );
return TRUE;
return true;
}
bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
{
wxLogDebug( "Got dropped text: %s.", psz );
wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y );
return TRUE;
return true;
}
size_t wxTextDropTarget::GetFormatCount() const
@@ -77,7 +82,7 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char *
{
wxLogDebug( aszFiles[i] );
}
return TRUE;
return true;
}
bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
@@ -88,10 +93,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
for (i = 0; i < size; i++)
if (text[i] == 0) number++;
if (number == 0) return TRUE;
if (number == 0) return true;
char **files = new char*[number];
text = (char*) data;
for ( i = 0; i < number; i++)
{
@@ -100,10 +105,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
text += len+1;
}
bool ret = OnDropFiles( x, y, 1, files );
bool ret = OnDropFiles( x, y, 1, files );
free( files );
return ret;
}
@@ -136,13 +141,13 @@ wxDropSource::wxDropSource( wxWindow *win )
wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
{
#if 0
g_blockEventsOnDrag = TRUE;
g_blockEventsOnDrag = true;
m_window = win;
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
m_data = &data;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
@@ -159,7 +164,7 @@ wxDropSource::~wxDropSource(void)
{
// if (m_data) delete m_data;
}
wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
{
// wxASSERT_MSG( m_data, "wxDragSource: no data" );
@@ -168,15 +173,15 @@ wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
#if 0
if (!m_data) return (wxDragResult) wxDragNone;
if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
RegisterWindow();
// TODO
UnregisterWindow();
g_blockEventsOnDrag = FALSE;
return m_retValue;
#endif
}
@@ -187,30 +192,30 @@ void wxDropSource::RegisterWindow(void)
if (!m_data) return;
wxString formats;
wxDataFormat df = m_data->GetPreferredFormat();
switch (df)
switch (df)
{
case wxDF_TEXT:
case wxDF_TEXT:
formats += "text/plain";
break;
break;
case wxDF_FILENAME:
formats += "file:ALL";
break;
break;
default:
break;
}
char *str = WXSTRINGCAST formats;
// TODO
}
void wxDropSource::UnregisterWindow(void)
{
if (!m_widget) return;
// TODO
}
#endif
@@ -219,7 +224,7 @@ wxPrivateDropTarget::wxPrivateDropTarget()
{
m_id = wxTheApp->GetAppName();
}
size_t wxPrivateDropTarget::GetFormatCount() const
{
return 1;