Changeset 241

Timestamp:

Mar 6, 2007, 8:47:20 PM (19 years ago)

Author:

cinc

Message:

WC2007 patches for drag and drop implementation.

Location:

trunk

Files:

• desktop/class_c/wpfolder.c (modified) (9 diffs)
• desktop/class_c/wpfolderwindow.c (modified) (16 diffs)
• desktop/class_c/wpobject.c (modified) (3 diffs)
• desktop/idl/wpobject.idl (modified) (1 diff)
• desktop/src/vdesktop.c (modified) (2 diffs)
• foundation/Makefile (modified) (1 diff)
• foundation/class_c/nomstring.c (modified) (1 diff)
• gui/Makefile (modified) (2 diffs)
• gui/class_c/nomdraginfo.c (added)
• gui/class_c/nomdragwindow.c (added)
• gui/exports.def (modified) (1 diff)
• gui/idl/nomdraginfo.idl (added)
• gui/idl/nomdragwindow.idl (added)

trunk/desktop/class_c/wpfolder.c

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 /*
- * This file was generated by orbit-idl-2 for Voyager
- *
- *
  * And remember, phase 3 is near...
  */
@@ -77 +74 @@
 #include "helper.h"
 #include "exception.h"
+
+#include "nomdraginfo.h"
 
 typedef struct _FLDRGTREEVALUE
@@ -111 +110 @@
 /*************** Local vars ************************************/
 
+/* This ID is used as a namespace */
 static nomId WPFolderNomId;
 
@@ -520 +520 @@
   WPFolderWindow_wpSetWindowTitle(wpFldrWindow, WPFolder_wpQueryTitle(nomSelf, NULLHANDLE), NULLHANDLE);
 
-
   /* Show the new window */
   WPFolderWindow_show(wpFldrWindow, ev);
@@ -527 +526 @@
 }
 
+
 NOM_Scope gulong NOMLINK impl_WPFolder_wpQueryFldrFlags(WPFolder* nomSelf, CORBA_Environment *ev)
 {
@@ -533 +533 @@
   return g_atomic_int_get(&_ulFldrFlags);
 }
+
 
 NOM_Scope CORBA_boolean NOMLINK impl_WPFolder_wpSetFldrFlags(WPFolder* nomSelf, const gulong ulFlags,
@@ -547 +548 @@
   return TRUE;
 }
+
+
+/* FIXME: type and name of containerHandle is wrong */
+NOM_Scope gulong NOMLINK impl_WPFolder_wpDragOver(WPFolder* nomSelf, const gpointer containerHandle,
+                                                  const gpointer pDragInfo, CORBA_Environment *ev)
+{
+  /* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
+  gulong ulNumItems, ulLoop;
+  NOMDragInfo* nomDragInfo=(NOMDragInfo*)pDragInfo;
+
+  if(!nomIsObj(nomDragInfo))
+    return DOR_NODROP;
+
+  ulNumItems=NOMDragInfo_queryNumDragItems(nomDragInfo, NULLHANDLE);
+
+  /* No items? */
+  if(0==ulNumItems)
+    return DOR_NODROP;
+
+  for(ulLoop=0; ulLoop<ulNumItems; ulLoop++)
+    {
+      /* We only accept desktop objects for now */
+      if(!NOMDragInfo_queryIsItemWPObject(nomDragInfo, ulLoop, NULLHANDLE))
+        return DOR_NODROP;
+      /* No dropping on the source folder for now */
+      if(nomSelf==(WPFolder*)
+         NOMDragInfo_querySourceWPObject(nomDragInfo, ulLoop, NULLHANDLE))
+        return DOR_NODROP;
+      /* No dropping on itself */
+      if(nomSelf==(WPFolder*)
+         NOMDragInfo_queryWPObjectFromItemList(nomDragInfo, ulLoop, NULLHANDLE))
+        return DOR_NODROP;
+    }
+
+  return GDK_ACTION_MOVE;
+  
+#if 0
+  WPFolder_wpDragOver_parent(nomSelf,  ev);
+#endif
+}
+
 
 #if 0
@@ -580 +622 @@
 }
 
+
 NOM_Scope void NOMLINK impl_WPFolder_wpInitData(WPFolder* nomSelf, CORBA_Environment *ev)
 {
@@ -599 +642 @@
      which may be searched using the name of the file/directory */
   //_fldrObjects=g_tree_new((GCompareFunc)strcmp);
-  _fldrObjects=g_tree_new_full((GCompareFunc)strcmp, nomSelf, NULL, (GDestroyNotify) fldrCatchDuplicates);
-}
-
-
-/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
-NOM_Scope gulong NOMLINK impl_WPFolder_wpDragOver(WPFolder* nomSelf, const gpointer containerHandle,
-                                                  const gpointer pDragInfo, CORBA_Environment *ev)
+  _fldrObjects=g_tree_new_full((GCompareFunc)strcmp, nomSelf, NULL,
+                               (GDestroyNotify) fldrCatchDuplicates);
+}
+
+NOM_Scope gulong NOMLINK impl_WPFolder_wpDrop(WPFolder* nomSelf,
+                                              const gpointer containerHandle,
+                                              const gpointer pDragInfo,
+                                              CORBA_Environment *ev)
 {
 /* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
-
-  return GDK_ACTION_COPY;
-  
+  gulong ulNumItems, ulLoop;
+  GdkDragAction gda;
+
+  NOMDragInfo* nomDragInfo=(NOMDragInfo*)pDragInfo;
+
+  g_message("%s", __FUNCTION__);
+
+  if(!nomIsObj(nomDragInfo))
+    return 0;
+
+  ulNumItems=NOMDragInfo_queryNumDragItems(nomDragInfo, NULLHANDLE);
+
+  /* No items? */
+  if(0==ulNumItems)
+    return 0;
+
+  gda=NOMDragInfo_queryChosenDropAction(nomDragInfo, NULLHANDLE);
+
+  for(ulLoop=0; ulLoop<ulNumItems; ulLoop++)
+    {
+      WPObject* wpObject;
+
+      wpObject=NOMDragInfo_querySourceWPObject(nomDragInfo, ulLoop, NULLHANDLE);
+      g_message("Source folder is: %s",
+                NOMPath_queryCString(WPFolder_wpQueryFileName(wpObject, TRUE, NULLHANDLE),
+                                     NULLHANDLE));
+      wpObject=NOMDragInfo_queryWPObjectFromItemList(nomDragInfo, ulLoop, NULLHANDLE);
+      g_message("Dropped object is: %s",
+                NOMPath_queryCString(WPFolder_wpQueryFileName(wpObject, TRUE, NULLHANDLE),
+                                     NULLHANDLE));
+
+      g_message("%s: drop action: %d", __FUNCTION__, gda);
+
+      wpObject=NOMDragInfo_queryWPObjectFromItemList(nomDragInfo, ulLoop, NULLHANDLE);
+      switch(gda)
+        {
+        case GDK_ACTION_MOVE:
+          {
+            WPObject_wpMoveObject(wpObject, nomSelf, NULLHANDLE);
+            break;
+          }
+        default:
+          {
+            WPObject_wpCopyObject(wpObject, nomSelf, FALSE, NULLHANDLE);
+            break;
+          }
+        }
+    }
+
+
+
 #if 0
-  /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 119 */
-  WPFolder_wpDragOver_parent(nomSelf,  ev);
-#endif
-}
-
-
+  WPFolder_wpDrop_parent(nomSelf,  ev);
+#endif
+  return 0;
+}
+
+
+
+
+
+
+

trunk/desktop/class_c/wpfolderwindow.c

@@ -62 +62 @@
 #include "exception.h"
 
+#include "nomdragwindow.h"
+#include "nomdraginfo.h"
+
 NOM_Scope PGtkWidget NOMLINK impl_WPFolderWindow_wpQueryContainerHandle(WPFolderWindow* nomSelf, CORBA_Environment *ev)
 {
@@ -70 +73 @@
 
 NOM_Scope void NOMLINK impl_WPFolderWindow_wpSetContainerHandle(WPFolderWindow* nomSelf, const PGtkWidget pgWidget,
-                                                              CORBA_Environment *ev)
+                                                                CORBA_Environment *ev)
 {
   WPFolderWindowData* nomThis=WPFolderWindowGetData(nomSelf);
@@ -116 +119 @@
         PWPFolderWindow pWindow;
         GtkTreePath* treePath;
-        //DosBeep(5000, 100);
+
         pWindow=(WPFolderWindow*)user_data;
         //TST_OBJECT(pWindow);
@@ -182 +185 @@
 };
 
+static NOMDragWindow *nomDragWindow=NULL;
+static NOMDragInfo   *nomDragInfo=NULL;
 
 /*
   This callback handles the drop of an item on an object.
  */
-static gboolean fldrWindowHandleDragDrop(GtkWidget * wgtThis, GdkDragContext* dragContext, gint x, gint y,
+static gboolean fldrWindowHandleDragDrop(GtkWidget * wgtThis, GdkDragContext* dragContext,
+                                         gint x, gint y,
                          guint t, gpointer ptrUserData)
 {
-  DosBeep(500, 10);
-  g_message("%s", __FUNCTION__);
-  g_message("  action: %d", dragContext->action );
-
+  GtkTreePath* treePath;
+  PWPFolderWindow pWindow;
+  gulong rc=0;
+  WPObject *wpObject;
+
+  //g_message("   %s", __FUNCTION__);
+  //g_message("   action: %d", dragContext->action );
+
+  /* Find the object beneath the pointer */
+  treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(wgtThis), x, y );
+  if(NULL==treePath)
+    {      
+
+      /* White space, so ask the folder */
+      
+      pWindow=(WPFolderWindow*)ptrUserData;
+      if(!nomIsObj(pWindow))
+        return FALSE;
+
+      wpObject=WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);     
+
+      if(!nomIsObj(wpObject))
+        return FALSE;
+    }
+  else
+    {
+      GtkTreeIter iter;
+      GtkTreeModel* model;
+
+      /* Over an icon */
+      
+      model=gtk_icon_view_get_model(GTK_ICON_VIEW(wgtThis));            
+      gtk_tree_model_get_iter(model , &iter, treePath);            
+      gtk_tree_model_get(model, &iter, 0, &wpObject, -1);
+
+      //TST_OBJECT(wpObject);
+
+      if(!nomIsObj(wpObject))
+        return FALSE;
+    }
+  rc=WPObject_wpDragOver(wpObject, wgtThis, nomDragInfo, NULL);
+  g_message("rc: %d", rc);
   if(dragContext->targets)
     {
       GdkAtom targetType;
       targetType=GDK_POINTER_TO_ATOM(g_list_nth_data(dragContext->targets, WPOBJECT_TARGET_OBJECT));
-      g_message("  calling gtk_drag_get_data()..." );
+      //    g_message("  calling gtk_drag_get_data()..." );
       gtk_drag_get_data(wgtThis, dragContext, targetType, t);
+
+      /* FIXME:
+         We don't use the returned data for now but use our own draginfo stuff. This is
+         broken.
+         The following may be moved to dragDataReceived later. */
+      if(rc) {
+        //        g_message("Now call wpDrop() actions: %d action: %d sugg %d", dragContext->action,
+        //        dragContext->action, dragContext->suggested_action);
+
+        WPObject_wpDrop( wpObject, wgtThis, nomDragInfo, NULLHANDLE);
+        
+        gtk_drag_finish(dragContext, TRUE, FALSE, t);
+        return TRUE;
+      }
+
     }
   return FALSE;
@@ -208 +267 @@
 {
   GdkPixmap *pixMapDrag;
-  
   gdk_pixbuf_render_pixmap_and_mask(pixBufStop, &pixMapDrag, NULL, 128);
   gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
   g_object_unref(pixMapDrag);
   gtk_widget_queue_draw(wgtDrag);
-
-  g_message("%s", __FUNCTION__);
-
-  return;
-}
-#endif
-
-static GtkWidget *wgtDrag=NULL;
-
-static GdkPixmap *pixMapDrag=NULL;
-static GdkPixmap *pixMapStop=NULL;
-
-/*
-  Callback which loads a pixmap into the drag widget as soon as it's realized.
- */
-static void fldrWidgetRealize(GtkWidget * wgtDrag, gpointer ptrUserData)
-{
-  gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
-
   g_message("%s", __FUNCTION__);
   return;
 }
+#endif
+
 /**
    Callback for the drag-begin signal.
  */
 static void fldrWindowHandleDragBegin(GtkWidget * widget, GdkDragContext* dragContext,
-                    gpointer ptrUserData)
-{
-  if(NULLHANDLE==wgtDrag)
-    {
-      GdkPixbuf *pixBufDrag;
-      GdkPixbuf *pixBufStop;
-
-      wgtDrag=gtk_window_new(GTK_WINDOW_POPUP);
-
-      /*
-        FIXME:
-        In GTK 2.8 use *_HINT_DND instead.
-       */
-#warning move this somewhere else. Maybe into WPClassMgr 
-      gtk_window_set_type_hint(GTK_WINDOW(wgtDrag), GDK_WINDOW_TYPE_HINT_MENU);
-      gtk_widget_set_app_paintable(GTK_WIDGET(wgtDrag), TRUE);
-
-      pixBufDrag=gtk_widget_render_icon(wgtDrag, GTK_STOCK_DND, GTK_ICON_SIZE_DND, NULL);
-      gdk_pixbuf_render_pixmap_and_mask(pixBufDrag, &pixMapDrag, NULL, 128);
-
-      gtk_widget_set_size_request(wgtDrag, gdk_pixbuf_get_width(pixBufDrag), gdk_pixbuf_get_height(pixBufDrag));
-
-      g_object_unref(pixBufDrag);
-
-      pixBufStop=gtk_widget_render_icon(wgtDrag, GTK_STOCK_STOP, GTK_ICON_SIZE_DND, NULL);
-      gdk_pixbuf_render_pixmap_and_mask(pixBufStop, &pixMapStop, NULL, 128);
-      g_object_unref(pixBufStop);
-
-      if(!pixMapDrag)
-        g_warning("Cannot load pixbuf");
-      if(!pixMapStop)
-        g_warning("Cannot load stop pixbuf");
-
-      //      gdk_pixbuf_render_pixmap_and_mask(pixBufDrag, &pixMapDrag, NULL, 128);
-      //    gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
-      //      g_object_unref(pixMapDrag);
-      g_signal_connect_after(GTK_WIDGET(wgtDrag), "realize", G_CALLBACK(fldrWidgetRealize), NULL);
-    }
-  DosBeep(1000, 10);
-  g_message("%s", __FUNCTION__);
-  //  if(wgtDrag->window)
-  //gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
-
-  gtk_drag_set_icon_widget(dragContext, wgtDrag, 0, 0);
-
+                                      gpointer ptrUserData)
+{
+  GtkTreePath* treePath;
+  gint x, y;
+
+  /* Create the drag window displayed to the user */
+  if(NULLHANDLE==nomDragWindow)
+    {
+      nomDragWindow=NOMDragWindowNew();
+    }
+
+  if(NULLHANDLE==nomDragInfo)
+    {
+      nomDragInfo=NOMDragInfoNew();
+    }
+
+  if(!dragContext)
+    return;
+
+  /* Make sure we have no leftovers... */
+  NOMDragInfo_deleteAllDragItems(nomDragInfo, NULLHANDLE);
+  NOMDragInfo_setGdkDragContextPointer(nomDragInfo, dragContext, NULLHANDLE);
+
+  /* Get the object beneath the pointer if any */
+  gtk_widget_get_pointer(widget, &x, &y);
+  treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(widget), x, y );
+
+  if(NULL==treePath)
+    {
+      /* Click on white space */
+      //    NOMDragWindow_hide(nomDragWindow, NULLHANDLE);
+      g_message("%d %s: White space!", __LINE__, __FUNCTION__);
+    }
+  else
+    {
+      GtkTreeIter iter;
+      GtkTreeModel* model;
+      WPObject *wpObject;
+      WPFolderWindow *wpFolderWindow=(WPFolderWindow*)ptrUserData;
+
+      /* Click on an icon occurred */
+
+      if(!nomIsObj(wpFolderWindow))
+        return; //Oops...
+      
+      g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
+      
+      /* Get the object belonging to the tree path */
+      model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
+      gtk_tree_model_get_iter(model , &iter, treePath);            
+      gtk_tree_model_get(model, &iter, 0, &wpObject, -1);
+      
+      //  TST_OBJECT(wpObject);
+      
+      if(nomIsObj(wpObject)){
+        g_message("%s: %s begin DnD", __FUNCTION__, wpObject->mtab->nomClassName);
+
+        /* Add the object to the list of items for this drag */
+        NOMDragInfo_addWPObjectToItemList(nomDragInfo, wpObject,
+                                       (PWPFolder)WPFolderWindow_wpQueryWPObject(wpFolderWindow, NULLHANDLE),
+                                       widget, NULLHANDLE);
+      }
+      else
+        g_message("%d %s: WPDataFile object not valid!", __LINE__, __FUNCTION__);
+  
+     NOMDragWindow_show(nomDragWindow, NULLHANDLE);
+    }
+
+
+  /* Tell GTK to use our drag window as an 'icon' while dragging. */
+  gtk_drag_set_icon_widget(dragContext,
+                           NOMDragWindow_queryWindowHandle(nomDragWindow, NULLHANDLE), 0, 0);   
+
+  // gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);
+  //NOMDragWindow_hide(nomDragWindow, NULLHANDLE);
   return;
 }
@@ -293 +364 @@
   GtkTreePath* treePath;
   PWPFolderWindow pWindow;
+  WPObject *wpObject;
   gulong rc=0;
-  static gulong oldRc=0;
+  static gulong oldRc=0xff;/* Make sure we at last one time have an rc!=oldRc so the icon is
+                              set properly below */
 
   if(dragContext==NULL)
@@ -303 +376 @@
 
   /* This does not work for some reason */
-  gtk_drag_highlight(wgtThis);
-  gtk_widget_queue_draw(wgtThis);
+  //  gtk_drag_highlight(wgtThis);
+  //gtk_widget_queue_draw(wgtThis);
+
 
   if(dragContext)
     {
-      g_message("  Actions: %x %x" , dragContext->actions, dragContext->suggested_action);
+      //        g_message("  Actions: %x %x" , dragContext->actions, dragContext->suggested_action);
     }
 
@@ -323 +397 @@
 #endif
 
+  /* Find the object beneath the pointer */
   treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(wgtThis), x, y );
-
   if(NULL==treePath)
     {      
-      PWPFolder wpFolder;
-      /* White space */
+      /* White space, so ask the folder */
 
       pWindow=(WPFolderWindow*)ptrUserData;
@@ -334 +407 @@
         return FALSE;
 
-      wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);     
-
-      if(!nomIsObj(wpFolder))
+      wpObject=WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);     
+
+      if(!nomIsObj(wpObject))
         return FALSE;
-
-      rc=WPObject_wpDragOver((WPObject*)wpFolder, wgtThis, dragContext, NULL);
     }
   else
@@ -345 +416 @@
       GtkTreeIter iter;
       GtkTreeModel* model;
-      WPObject *wpObject;
+
       /* Over an icon */
       
-      //   g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
-      //    gtk_icon_view_item_activated(GTK_ICON_VIEW(wgtThis), treePath);
-
       model=gtk_icon_view_get_model(GTK_ICON_VIEW(wgtThis));
             
@@ -358 +426 @@
       //TST_OBJECT(wpObject);
 
-      //if(nomIsObj(wpObject))
-      rc=WPObject_wpDragOver((WPObject*)wpObject, wgtThis, dragContext, NULL);
-    }
-
+      if(!nomIsObj(wpObject))
+        return FALSE;
+      //g_message("Over an icon");
+    }
+  rc=WPObject_wpDragOver(wpObject, wgtThis, nomDragInfo, NULL);
+  //g_message("rc: %d oldRc %d", rc, oldRc);
+
+  /* Change the drag icon if necesary. Note that this will not change the
+     cursor. */
   if(oldRc!=rc)
     {
@@ -367 +440 @@
       switch(rc)
         {
-        case 0:
+        case DOR_NODROP:
           {
             /* Don't drop */    
-            gdk_window_set_back_pixmap(wgtDrag->window, pixMapStop, FALSE);
+            NOMDragWindow_displayStopImage(nomDragWindow, NULLHANDLE);
+            //     gdk_drag_status(dragContext, 0, t);
             break;
           }
         default:
           {
-            gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
+            NOMDragWindow_displayDragImage(nomDragWindow, NULLHANDLE);
+            //  gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);
+           break;
+          }
+        } 
+      /* Tell GTK to redraw the drag window */
+      gtk_widget_queue_draw(NOMDragWindow_queryWindowHandle(nomDragWindow, NULLHANDLE));
+    }
+  oldRc=rc;
+
+  switch(dragContext->actions)
+    {  
+    case GDK_ACTION_COPY:
+      {
+        gdk_drag_status(dragContext, GDK_ACTION_COPY, t);
+        break;
+      }
+    case GDK_ACTION_MOVE:
+      {
+        gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);
+        break;
+      }
+    case GDK_ACTION_LINK:
+      {
+        gdk_drag_status(dragContext, GDK_ACTION_LINK, t);
+        break;
+      }
+    default:
+      {
+        if(dragContext->actions & GDK_ACTION_MOVE) //FIXME
+          gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);        
+        break;
+      }
+    }
+#if 0
+  /* Now change the cursor */
+  switch(rc & DOR_ALLFLAGS)
+    {
+    case DOR_NODROP:
+      {
+        /* Don't drop */    
+        gdk_drag_status(dragContext, 0, t);
+        break;
+      }
+    default:
+      {
+        switch(rc & DO_ALLFLAGS)
+          {
+          case DO_MOVE:
+            {
+              gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);
+              break;
+            }
+          case DO_COPY:
+            {
+              gdk_drag_status(dragContext, GDK_ACTION_COPY, t);
+              break;
+            }
+          case DO_LINK:
+            {
+              gdk_drag_status(dragContext, GDK_ACTION_LINK, t);
+              break;
+            }
+
+          default:
+            if(dragContext->actions & GDK_ACTION_MOVE) //FIXME
+              gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);
             break;
           }
-        } 
-      gtk_widget_queue_draw(wgtDrag);
-    }
-  oldRc=rc;
-
+        break;
+      }
+    }/* switch() */
+#endif
+ 
   return FALSE;
 }
@@ -390 +530 @@
                           guint info, guint uiTime, gpointer ptrUserData)
 {
-  DosBeep(5000, 100);
   g_message("%s", __FUNCTION__);
   //  gdk_drag_status(dragContext, GDK_ACTION_COPY, uiTime);
@@ -397 +536 @@
 
 
-
 /*
 
@@ -424 +562 @@
       break;
     };
-  //  
+
   return;
 }
@@ -525 +663 @@
                    G_CALLBACK(fldrWindowHandleDragDrop), nomSelf);
   g_signal_connect(GTK_WIDGET(icon_view), "drag_data_received",
-                   G_CALLBACK(fldrWindowHandleDragDataReceived), NULL);
+                   G_CALLBACK(fldrWindowHandleDragDataReceived), nomSelf);
   g_signal_connect(GTK_WIDGET(icon_view), "drag_data_get",
-                   G_CALLBACK(fldrWindowHandleDragDataGet), NULL);
+                   G_CALLBACK(fldrWindowHandleDragDataGet), nomSelf);
 
   /* Prepare drag and drop */
   gtk_drag_source_set(GTK_WIDGET(icon_view), GDK_BUTTON3_MASK, targetEntries,
-                      G_N_ELEMENTS(targetEntries) ,
-                      GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
-  gtk_drag_dest_set(GTK_WIDGET(icon_view), GTK_DEST_DEFAULT_ALL, targetEntries, 1 ,
-                      GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
+                      G_N_ELEMENTS(targetEntries),
+                      GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
+  gtk_drag_dest_set(GTK_WIDGET(icon_view), GTK_DEST_DEFAULT_ALL, targetEntries, 1,
+                      GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
 
 #if 0

trunk/desktop/class_c/wpobject.c

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 /*
- * This file was generated by orbit-idl-2 for Voyager
- *
- *
  * And remember, phase 3 is near...
  */
@@ -801 +798 @@
                                                   const gpointer pDragInfo, CORBA_Environment *ev)
 {
-/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
 
   return 0; /* Don't allow drop */
@@ -809 +806 @@
                                               const gpointer pDragInfo, CORBA_Environment *ev)
 {
-/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-
-  DosBeep(500, 100);
+  /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  g_message("Calling %s", __FUNCTION__);
   return 0;
 }
 
-
+NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMoveObject(WPObject* nomSelf,
+                                                           const PWPFolder wpTargetFolder,
+                                                           CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  g_message("Calling %s, not implemented yet", __FUNCTION__);
+
+  return FALSE;
+}
+
+NOM_Scope PWPObject NOMLINK impl_WPObject_wpCopyObject(WPObject* nomSelf,
+                                                       const PWPFolder wpTargetFolder,
+                                                       const CORBA_boolean fLock,
+                                                       CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  g_message("Calling %s, not implmnted yet", __FUNCTION__);
+  return FALSE;
+}
+

trunk/desktop/idl/wpobject.idl

@@ -347 +347 @@
 
   gulong wpDrop(in gpointer containerHandle, in gpointer pDragInfo);
+
+  /**
+    Move an object to a new location.
+    
+    \par How to override:
+    This method is overriden by classes which need special processing when
+    objects are moved.
+
+    \param wpTargetFolder The new folder into which the object will be moved.
+
+    \return TRUE when success.
+
+    \sa wpCopyObject()
+  */
+  boolean wpMoveObject(in PWPFolder wpTargetFolder);
+
+  /**
+    Copy an object to a new location.
+    
+    \par How to override:
+    This method is overriden by classes which need special processing when
+    objects are copied. An override can also be used to keep track of created
+    objects.
+
+    \param wpTargetFolder The new folder into which the object will be moved.
+    \param fLock If set TRUE the created object will be locked after creation.
+    A call to wpUnlockObject() is necessary so the object can go dormant. If
+    set to FALSE the object will be made dormant if the object is no longer used
+    and the folder containing it is closed.
+
+    \return TRUE when success.
+
+    \sa wpMoveObject()
+  */
+
+  PWPObject wpCopyObject(in PWPFolder wpTargetFolder, in boolean fLock);
+
   /* Methods overriden by this class */
 

trunk/desktop/src/vdesktop.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -36 +36 @@
 #define INCL_DOSPROFILE
 #define INCL_DOSERRORS
-#define INCL_PM
 
 #include <os2.h>

trunk/foundation/Makefile

@@ -25 +25 @@
 
 
-ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
+ADDLIBS         =        -l$(OBJDIR)/nobjtk
+# -l$(OBJDIR)/voywp
 
 # Define objects to build

trunk/foundation/class_c/nomstring.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2006
+* Portions created by the Initial Developer are Copyright (C) 2006-2007
 * the Initial Developer. All Rights Reserved.
 *

trunk/gui/Makefile

@@ -28 +28 @@
                         -I $(FOUNDATIONPATH)/class_h -I $(FOUNDATIONPATH)/include
 
-ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
+ADDLIBS         =        -l$(OBJDIR)/nobjtk
+# -l$(OBJDIR)/voywp
 
 # Define objects to build
@@ -36 +37 @@
                         $(OBJDIR)/nommenu.o \
                         $(OBJDIR)/nommenuitem.o \
-                        $(OBJDIR)/nomnotebook.o
+                        $(OBJDIR)/nomnotebook.o \
+                        $(OBJDIR)/nomdragwindow.o \
+                        $(OBJDIR)/nomdraginfo.o
+
 #                       $(OBJDIR)/nomfolderwindow.o \
 

trunk/gui/exports.def

@@ -24 +24 @@
         _NOMNoteBookCClassData 
         NOMNoteBookNewClass    
+
+        _NOMDragWindowClassData  
+        _NOMDragWindowCClassData 
+        NOMDragWindowNewClass
+
+        _NOMDragInfoClassData  
+        _NOMDragInfoCClassData 
+        NOMDragInfoNewClass
+