Committing in .

added some #ifdef __WXDEBUG__ in the proper places around
wxLogTrace(TRACE_DND... statements

  Modified Files:
 	wxWidgets/src/gtk/dnd.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 2a147ae6824693f850a2b422fc657fc8727ce64c..0733a6e2e4fcc084b9632161c692e3e34d640534 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -334,8 +334,10 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
     if (!ret)
     {
 
     if (!ret)
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );

-
+#endif
+       

         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */
         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */


@@ -344,8 +346,10 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     else
     {
     }
     else
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );

-
+#endif
+       

 #if wxUSE_THREADS
         /* disable GUI threads */
 #endif
 #if wxUSE_THREADS
         /* disable GUI threads */
 #endif


@@ -412,8 +416,10 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
         return;
     }
 
         return;
     }
 

+#ifdef __WXDEBUG__

     wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );
     wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );

-
+#endif
+   

     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );


@@ -422,15 +428,19 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );

-
+#endif
+       

         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );

-
+#endif
+       

         /* tell GTK that data transfer was not successful */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
         /* tell GTK that data transfer was not successful */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }


@@ -601,29 +611,37 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
     wxDataFormat format( selection_data->target );
 
 
     wxDataFormat format( selection_data->target );
 

+#ifdef __WXDEBUG__

     wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
                format.GetId().c_str());
     wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
                format.GetId().c_str());

-
+#endif
+   

     drop_source->m_retValue = wxDragCancel;
 
     wxDataObject *data = drop_source->GetDataObject();
 
     if (!data)
     {
     drop_source->m_retValue = wxDragCancel;
 
     wxDataObject *data = drop_source->GetDataObject();
 
     if (!data)
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
         wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );

-        return;
+#endif
+       return;

     }
 
     if (!data->IsSupportedFormat(format))
     {
     }
 
     if (!data->IsSupportedFormat(format))
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
         wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );

-        return;
+#endif
+       return;

     }
 
     if (data->GetDataSize(format) == 0)
     {
     }
 
     if (data->GetDataSize(format) == 0)
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
         wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );

-        return;
+#endif
+       return;

     }
 
     size_t size = data->GetDataSize(format);
     }
 
     size_t size = data->GetDataSize(format);


@@ -861,8 +879,10 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     for (size_t i = 0; i < count; i++)
     {
         GdkAtom atom = array[i];
     for (size_t i = 0; i < count; i++)
     {
         GdkAtom atom = array[i];

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
         wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));

-        gtk_target_list_add( target_list, atom, 0, 0 );
+#endif
+       gtk_target_list_add( target_list, atom, 0, 0 );

     }
     delete[] array;
 
     }
     delete[] array;