Changeset 242

Timestamp:

Mar 6, 2007, 8:47:37 PM (18 years ago)

Author:

cinc

Message:

WC2007 patches for drag and drop implementation.

Location:

trunk/nom

Files:

• Makefile (modified) (1 diff)
• class_c/nomclassmanager.c (modified) (2 diffs)
• class_c/nomcls.c (modified) (1 diff)
• idl/nombase.idl (modified) (1 diff)
• include/nom.h (modified) (1 diff)

trunk/nom/Makefile

@@ -23 +23 @@
 GCLIB           =       ./../../../o/gc.a
 
-ADDLIBS         =       -l$(OBJDIR)/voyfcls
+ADDLIBS         =
+#       -l$(OBJDIR)/voyfcls
 
 # Define objects to build

trunk/nom/class_c/nomclassmanager.c

@@ -261 +261 @@
 {
 /* NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf); */
+#if 0
+  /* We have a circular reference here to the voyfcls.dll containing NOMPath, which needs nomtk.a
+     to be built. */
   NOMPath* thePath;
 
@@ -272 +275 @@
   thePath=NOMPath_assignCString(thePath, g_get_current_dir(), NULL);
   thePath=NOMPath_appendCString(thePath, "classlist.ini", NULL);
+#endif
 
   return NULL;

trunk/nom/class_c/nomcls.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.
 *

trunk/nom/idl/nombase.idl

@@ -75 +75 @@
 native  PGTree;
 
+native  PGdkPixmap;
+native  PGdkBitmap;
+
+native  PGArray;
+native  PGdkDragContext;
+native  GdkDragAction;
+
 native  nomId; /* This is a typedef for a GQuark */
 native  pnomId;/* ...and the pointer on it.      */

trunk/nom/include/nom.h

@@ -113 +113 @@
 typedef gulong* pgulong;
 typedef GTree*  PGTree;
+typedef GArray* PGArray;
+
 
 typedef gchar **nomID;                 /* This will be reomoved later. Don't use anymore */