Changeset 179 for trunk/nom

Timestamp:

Jan 7, 2007, 5:25:48 PM (19 years ago)

Author:

cinc

Message:

Added nomGetClass()/new() methods to NOMObject. Header file fixes to resolve build issues.

Location:

trunk/nom

Files:

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

trunk/nom/class_c/nomobj.c

@@ -38 +38 @@
 #include <gtk/gtk.h>
 
-
 #include "nom.h"
 #include "nomtk.h"
 
 #include "nomobj.ih"
-
 
 
@@ -87 +85 @@
 }
 
+NOM_Scope PNOMClass NOMLINK impl_NOMObject_nomGetClass(NOMObject* nomSelf, CORBA_Environment *ev)
+{
+/* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
 
+  return nomSelf->mtab->nomClassObject;
+}
+
+/*
+  Create a new class of the kind the caller is. This method ensures that subclasses
+  are properly handled without the need to override this class in every subclass.
+ */
+NOM_Scope PNOMObject NOMLINK impl_NOMObject_new(NOMObject* nomSelf, CORBA_Environment *ev)
+{
+/* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
+  PNOMObject nomRetval;
+  NOMClass* nomCls;
+
+  /* We don't know which class we're actually. So we can't just create a new object using
+     <CkassName>New() here.
+     It is possible that we are called by a subclass. So get the class object and let the
+     class object create the correct class. */
+  nomCls=NOMObject_nomGetClass(nomSelf, NULLHANDLE);
+  return NOMClass_nomNew(nomCls, NULLHANDLE);
+}
+
+
+

trunk/nom/idl/nombase.idl

@@ -64 +64 @@
 
 /* Native types we want to use in the IDL */
+native PNOMObject;
+native PNOMClass;
+
 native  gint;
 native  gulong;

trunk/nom/idl/nomcls.idl

@@ -37 +37 @@
 #include "nomobj.idl"
 
+//NOMCLASSNAME(NOMClass);
+
 interface NOMClass:NOMObject
 {

trunk/nom/idl/nomobj.idl

@@ -37 +37 @@
 #include "nombase.idl"
 
+//NOMCLASSNAME(NOMObject);
+
 interface NOMObject
 {
 
-        NOMCLASSVERSION(1, 0 );
+  NOMCLASSVERSION(1, 0 );
 
-        void nomInit();
-        void nomUninit();
-        /* Return the size of the object. That is sizeof(mTab*)+sizeof(all instance vars) */
-        long nomGetSize();
+  void nomInit();
+  void nomUninit();
+  /* Return the size of the object. That is sizeof(mTab*)+sizeof(all instance vars) */
+  long nomGetSize();
   void delete();
+  PNOMClass nomGetClass();
+  PNOMObject new();
 #if 0
         NOMOVERRIDE(wpEchoString);

trunk/nom/include/nom.h

@@ -129 +129 @@
 
 
-#define NOMObject NOMAnyObj
-#define NOMClass NOMAnyObj
+#ifndef NOMClass
+typedef struct NOMClass_struct {
+  struct nomMethodTabStruct  *mtab;
+  gulong body[1];
+} NOMClassObj;
+#define NOMClass NOMClassObj
+typedef NOMClass *PNOMClass;
+#endif
+
+#ifndef NOMObject
+typedef struct NOMObject_struct {
+  struct nomMethodTabStruct  *mtab;
+  gulong body[1];
+} NOMObjectObj;
+#define NOMObject NOMObjectObj
+typedef NOMObject *PNOMObject;
+#endif
+
+//#define NOMObject NOMAnyObj
 #define NOMClassMgr NOMAnyObj