Changeset 243 for trunk

Timestamp:

Mar 6, 2007, 9:07:54 PM (19 years ago)

Author:

cinc

Message:

More WC2007 patches for drag and drop implementation.

Location:

trunk/desktop

Files:

• class_c/wpfilesystem.c (modified) (3 diffs)
• idl/wpfilesystem.idl (modified) (2 diffs)

trunk/desktop/class_c/wpfilesystem.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.
 *
@@ -91 +91 @@
     }
 
-  /* We area folder somwhere in the chain */
+  /* We are a folder somwhere in the chain */
   nomRetval=WPFileSystem_wpQueryFileName((WPFileSystem*)wpParent, bFullPath, NULLHANDLE);
   nomPath=NOMPathNew();
@@ -99 +99 @@
 }
 
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPFileSystem_wpMoveObject(WPFileSystem* nomSelf,
+                                                               const PWPFolder wpTargetFolder,
+                                                               CORBA_Environment *ev)
+{
+/* WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf); */
+
+  return WPFileSystem_wpMoveObject_parent(nomSelf, wpTargetFolder,  ev);
+  return FALSE;
+}
+
+
+NOM_Scope PWPObject NOMLINK impl_WPFileSystem_wpCopyObject(WPFileSystem* nomSelf,
+                                                           const PWPFolder wpTargetFolder,
+                                                           const CORBA_boolean fLock,
+                                                           CORBA_Environment *ev)
+{
+/* WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf); */
+
+  return WPFileSystem_wpCopyObject_parent(nomSelf, wpTargetFolder, fLock, ev);
+
+  return NULLHANDLE;
+}
+

trunk/desktop/idl/wpfilesystem.idl

@@ -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.
 *
@@ -52 +52 @@
   PNOMPath wpQueryFileName(in boolean bFullPath);
 
-#if 0
-  ULONG cbEASize;
-#endif
+  NOMOVERRIDE(wpMoveObject);
+  NOMOVERRIDE(wpCopyObject);
+
   NOMINSTANCEVAR(string pszFullPath);  /* ONLY FOR TESTING!!! */  
   NOMINSTANCEVAR(string pszType);