New wxWin.icc for monolithic build.

[wxWidgets.git] / src / gtk1 / dnd.cpp

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index fbd0ec5b86f7cee4c9b943c7449ef3455c7cc298..f1b6bf43e616fbdc12ddc583e0cd1d7e74dc9763 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -21,12 +21,12 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>

 
 

-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkselection.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -230,7 +230,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
     if (!ret)
     {
 
     if (!ret)
     {

-        wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
+        wxLogDebug( wxT( "Drop target: OnDrop returned FALSE") );

 
         /* cancel the whole thing */
         gtk_drag_finish( context,
 
         /* cancel the whole thing */
         gtk_drag_finish( context,


@@ -401,7 +401,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__

-        wxLogDebug("Drop target: drag has format: %s", format.GetId().c_str() );
+        wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() );

 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))
 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))


@@ -426,20 +426,6 @@ bool wxDropTarget::GetData()
     if (!m_dataObject->IsSupportedFormat( dragFormat ))
         return FALSE;
 
     if (!m_dataObject->IsSupportedFormat( dragFormat ))
         return FALSE;
 

-    if (dragFormat.GetType() == wxDF_TEXT)
-    {
-        wxTextDataObject *text_object = (wxTextDataObject*)m_dataObject;
-        text_object->SetText( (const char*)m_dragData->data );
-        return TRUE;
-    }
-
-    if (dragFormat.GetType() == wxDF_FILENAME)
-    {
-        wxFileDataObject *file_object = (wxFileDataObject*)m_dataObject;
-        file_object->SetData( 0, (const char*)m_dragData->data );
-        return TRUE;
-    }
-

     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
     return TRUE;
     m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
     return TRUE;


@@ -503,7 +489,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),

-                       GdkDragContext     *context,
+                       GdkDragContext     *WXUNUSED(context),

                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),
                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),


@@ -514,11 +500,11 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
     wxDataFormat format( selection_data->target );
 
     wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );
     wxDataFormat format( selection_data->target );
 
     wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );

-
+    

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

-
+    

     if (!data)
     {
         wxLogDebug( wxT("Drop source: no data object") );
     if (!data)
     {
         wxLogDebug( wxT("Drop source: no data object") );


@@ -566,9 +552,6 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 #endif
 
     delete[] d;
 #endif
 
     delete[] d;

-
-    /* so far only copy, no moves. TODO. */
-    drop_source->m_retValue = wxDragCopy;

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -577,13 +560,12 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
                                      GdkDragContext     *WXUNUSED(context),
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
                                      GdkDragContext     *WXUNUSED(context),

-                                     wxDropSource       *drop_source )
+                                     wxDropSource       *WXUNUSED(drop_source) )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-//  printf( "Delete the data!\n" );
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
 

-    drop_source->m_retValue = wxDragMove;
+    // printf( "Drag source: drag_data_delete\n" );

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -594,9 +576,10 @@ static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
                                GdkDragContext     *WXUNUSED(context),
                                wxDropSource       *WXUNUSED(drop_source) )
 {
                                GdkDragContext     *WXUNUSED(context),
                                wxDropSource       *WXUNUSED(drop_source) )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
 

-//  printf( "drag_begin.\n" );
+    // printf( "Drag source: drag_begin.\n" );

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -609,7 +592,7 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-//  printf( "drag_end.\n" );
+    // printf( "Drag source: drag_end.\n" );

 
     drop_source->m_waiting = FALSE;
 }
 
     drop_source->m_waiting = FALSE;
 }


@@ -628,7 +611,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
     if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
     if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 

-    source->GiveFeedback( action, FALSE );
+    source->GiveFeedback( action );

 
     return 0;
 }
 
     return 0;
 }


@@ -639,7 +622,6 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur
 
 wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
 {
 
 wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
 {

-    g_blockEventsOnDrag = TRUE;

     m_waiting = TRUE;
 
     m_iconWindow = (GtkWidget*) NULL;
     m_waiting = TRUE;
 
     m_iconWindow = (GtkWidget*) NULL;


@@ -674,7 +656,6 @@ wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &ico
 
 wxDropSource::~wxDropSource()
 {
 
 wxDropSource::~wxDropSource()
 {

-    g_blockEventsOnDrag = FALSE;

 }
 
 void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
 }
 
 void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )


@@ -711,9 +692,9 @@ void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
     gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y );
 }
 
     gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y );
 }
 

-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop( bool allowMove )

 {
 {

-    wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
+    wxASSERT_MSG( m_data, wxT("Drop source: no data") );

 
     if (!m_data)
         return (wxDragResult) wxDragNone;
 
     if (!m_data)
         return (wxDragResult) wxDragNone;


@@ -734,7 +715,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
         GdkAtom atom = array[i];
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
         GdkAtom atom = array[i];

-        wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) );
+        wxLogDebug( wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ) );

         gtk_target_list_add( target_list, atom, 0, 0 );
     }
     delete[] array;
         gtk_target_list_add( target_list, atom, 0, 0 );
     }
     delete[] array;


@@ -748,7 +729,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     event.x = x;
     event.y = y;
     event.state = state;
     event.x = x;
     event.y = y;
     event.state = state;

-    event.time = GDK_CURRENT_TIME;
+    event.time = (guint32)GDK_CURRENT_TIME;

 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;


@@ -764,9 +745,11 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     /* don't start dragging if no button is down */
     if (button_number)
     {
     /* don't start dragging if no button is down */
     if (button_number)
     {

+        GdkDragAction action = GDK_ACTION_COPY;
+       if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY);

         GdkDragContext *context = gtk_drag_begin( m_widget,
                                               target_list,
         GdkDragContext *context = gtk_drag_begin( m_widget,
                                               target_list,

-                                              (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE),
+                                             action,

                                               button_number,  /* number of mouse button which started drag */
                                               (GdkEvent*) &event );
 
                                               button_number,  /* number of mouse button which started drag */
                                               (GdkEvent*) &event );
 


@@ -774,7 +757,12 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 
         PrepareIcon( 0, 0, context );
 
 
         PrepareIcon( 0, 0, context );
 

-        while (m_waiting) gtk_main_iteration();;
+        while (m_waiting) gtk_main_iteration();
+       
+       if (context->action == GDK_ACTION_COPY)
+            m_retValue = wxDragCopy;
+       if (context->action == GDK_ACTION_MOVE)
+            m_retValue = wxDragMove;

     }
 
 #if wxUSE_THREADS
     }
 
 #if wxUSE_THREADS


@@ -792,7 +780,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;

-
+    

     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
                       GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
                       GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",


@@ -819,5 +807,4 @@ void wxDropSource::UnregisterWindow()
 }
 
 #endif
 }
 
 #endif

-

       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP