Changeset 102 for trunk/desktop/src/vdesktop.c

Timestamp:

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

Author:

cinc

Message:

Implemented wpInitData() for desktop classes

File:

• trunk/desktop/src/vdesktop.c (modified) (7 diffs)

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!!! */