Changeset 102

Timestamp:

Nov 25, 2006, 5:37:43 PM (19 years ago)

Author:

cinc

Message:

Implemented wpInitData() for desktop classes

Location:

trunk/desktop

Files:

• Makefile (modified) (1 diff)
• class_c/wpfolder.c (modified) (2 diffs)
• class_c/wpobject.c (modified) (2 diffs)
• idl/wpfolder.idl (modified) (1 diff)
• src/vdesktop.c (modified) (7 diffs)

trunk/desktop/Makefile

@@ -22 +22 @@
 INC             =       ./include -I ./class_h -I $(NOMPATH)/class_h -I $(NOMPATH)/include
 
-ADDLIBS         =       -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
+ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
 CLASSDLLLIBS    =       -l$(OBJDIR)/nobjtk
 

trunk/desktop/class_c/wpfolder.c

@@ -42 +42 @@
 #include <os2.h>
 
+#include "nom.h"
+#include <nomtk.h>
+
 #include <string.h>
 #include "wpfolder.ih"
 
+
+/* pszPath contains the fully qualified path (checked with WPS) */
 NOM_Scope CORBA_boolean NOMLINK impl_WPFolder_wpPopulate(WPFolder* nomSelf, const CORBA_unsigned_long ulReserved, const CORBA_char * pszPath, const CORBA_boolean fFoldersOnly, CORBA_Environment *ev)
 {
@@ -50 +55 @@
   CORBA_boolean nomRetval;
 
+  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s. Path is %s\n",
+            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName, pszPath);
+
   return nomRetval;
+}
+
+
+NOM_Scope void NOMLINK impl_WPFolder_wpInitData(WPFolder* nomSelf, CORBA_Environment *ev)
+{
+/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
+
+  /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 84 */
+  WPFolder_wpInitData_parent(nomSelf,  ev);
+
+  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s.\n",
+            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
+
+
 }
 

trunk/desktop/class_c/wpobject.c

@@ -41 +41 @@
 #include <os2.h>
 
+#include <nom.h>
+#include <nomtk.h>
+
 #include <string.h>
 #include "wpobject.ih"
@@ -64 +67 @@
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
 
-#if 0
   /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 84 */
   WPObject_nomInit_parent(nomSelf,  ev);
-#endif
+
+  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s.\n",
+            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
+
+  _wpInitData(nomSelf, ev);
 }
 

trunk/desktop/idl/wpfolder.idl

@@ -53 +53 @@
 #endif
 
+  NOMOVERRIDE(wpInitData);
 };
 

trunk/desktop/src/vdesktop.c

@@ -43 +43 @@
 #include "nomtk.h"
 #include "wpobject.h"
+#include "wpfolder.h"
 
 int createQuitWindow(void);
@@ -49 +50 @@
 NOMClassMgr *NOMClassMgrObject;
 
-#if 0
+
 /* Desktop folder */
 WPFolder *wpDesktop;
-#endif
+
 
 /*
@@ -66 +67 @@
 
   /* Create a window with a 'quit' button to terminate us */
-  createQuitWindow();
+ createQuitWindow();
 
 
   /* Query current dir */
   g_strlcpy(desktopDir, g_get_current_dir(), sizeof(desktopDir));
-  nomPrintf("Desktop: %s\n", desktopDir);
+  dbgPrintf("Desktop: %s", desktopDir);
 
     /*
@@ -77 +78 @@
      */
     pEnv=nomTkInit();
-    dbgPrintf( "nomTKinit returned: %x", pEnv);
+    //dbgPrintf( "nomTKinit returned: %x", pEnv);
 
     if(!pEnv) {
@@ -86 +87 @@
     /* Init SOM */
     NOMClassMgrObject=nomEnvironmentNew();
-    dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
+    //dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
 
 
@@ -92 +93 @@
     WPObject* wpObject;
     wpObject=WPObjectNew();
-    dbgPrintf( "wpObject: %x", wpObject);
+    //dbgPrintf( "wpObject: %x", wpObject);
+
+    /* Create desktop folder */
+    wpDesktop=WPFolderNew();
+    dbgPrintf( "Created desktop object: %x", wpDesktop);
+
+    WPFolder_wpPopulate(wpDesktop, 0, desktopDir, 0,  NULL);
+    /*    WPFolder_wpPopulate(wpObject, 0,"blabla 2", 0,  NULL);  */
+
+    
 #if 0
     /* Base classes */
@@ -100 +110 @@
     somPrintf("  -> Classname is: %s\n", _somGetClassName(wpObject));
 
-    /* Create desktop folder */
-    wpDesktop=WPFolderNew();
-    dbgPrintf( "Created desktop object: %x", wpDesktop);
 
     /* Test only!!! */