Added a few non-threads compile fixes,
Removed strcasecmp defines from db.cpp and dbtable.cpp, Added more stand-alone makefiles, wxDropSource::DoDraDrop()'s return values works now (wxDragNone, -Copy, -Move). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -125,9 +125,12 @@ unsigned char g_palette[64*3] =
|
||||
extern void wxFlushResources();
|
||||
|
||||
/* forward declaration */
|
||||
gint wxapp_idle_callback( gpointer WXUNUSED(data) );
|
||||
void wxapp_install_idle_handler();
|
||||
static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
|
||||
gint wxapp_idle_callback( gpointer WXUNUSED(data) );
|
||||
void wxapp_install_idle_handler();
|
||||
|
||||
#if wxUSE_THREADS
|
||||
gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxExit
|
||||
@@ -248,7 +251,7 @@ void wxapp_uninstall_thread_wakeup()
|
||||
wxTheApp->m_wakeUpTimerTag = 0;
|
||||
}
|
||||
|
||||
static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
|
||||
gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
|
||||
{
|
||||
wxapp_uninstall_thread_wakeup();
|
||||
|
||||
|
@@ -475,7 +475,9 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
|
||||
/* store requested format to be asked for by callbacks */
|
||||
m_targetRequested = format;
|
||||
|
||||
/*
|
||||
wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() );
|
||||
*/
|
||||
|
||||
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
|
||||
|
||||
|
@@ -359,7 +359,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
|
||||
|
||||
// disable the debug message from GetMatchingPair() - there are too many
|
||||
// of them otherwise
|
||||
#if 0 //def __WXDEBUG__
|
||||
#ifdef __WXDEBUG__
|
||||
wxLogNull noLog;
|
||||
#endif // Debug
|
||||
|
||||
@@ -763,6 +763,11 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
|
||||
PrepareIcon( 0, 0, context );
|
||||
|
||||
while (m_waiting) gtk_main_iteration();;
|
||||
|
||||
if (context->action == GDK_ACTION_COPY)
|
||||
return m_retValue = wxDragCopy;
|
||||
if (context->action == GDK_ACTION_MOVE)
|
||||
return m_retValue = wxDragMove;
|
||||
}
|
||||
|
||||
#if wxUSE_THREADS
|
||||
|
Reference in New Issue
Block a user