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

Timestamp:

Jan 16, 2007, 8:32:50 PM (19 years ago)

Author:

cinc

Message:

Improvements to folders

File:

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

trunk/desktop/src/vdesktop.c

@@ -114 +114 @@
   g_assert(nomRegisterDLLByName(hReg, "NOBJTK.DLL"));
   g_assert(nomRegisterDLLByName(hReg, "VDESKTOP.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "VOYFCLS.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "VOYWP.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "VOYGUITK.DLL"));
+  //  g_assert(nomRegisterDLLByName(hReg, "PBL-PNG.DLL"));
+  //  g_assert(nomRegisterDLLByName(hReg, "BASIC-FC.DLL"));
   /* Add Pango here? */
-
+  g_assert(nomRegisterDLLByName(hReg, "PANGO.DLL"));
   nomEndRegisterDLLWithGC(hReg);
 
@@ -156 +161 @@
   np=NOMPath_queryPathBegin(nomPath, NULLHANDLE);
   wpRootFolder=WPFolderNew();
+  WPFolder_wpLockObject(wpRootFolder, NULLHANDLE);
   WPFolder_tstSetFullPath(wpRootFolder, NOMPath_queryCString(NOMPath_queryRoot(np, NULLHANDLE),NULLHANDLE),
                           NULLHANDLE);
@@ -172 +178 @@
 
       wpFolder=WPFolderNew();
+      WPFolder_wpLockObject(wpFolder, NULLHANDLE);
       WPFolder_tstSetFullPath(wpFolder, NOMPath_queryCString(np,NULLHANDLE),
                               NULLHANDLE);
@@ -177 +184 @@
       WPFolder_wpSetTitleFromCString((WPObject*)wpFolder, chrDisplayName, NULLHANDLE);
       WPFolder_wpSetFolder(wpFolder, wpTempFolder, NULLHANDLE);
+      
       /* insert into contents list */
       WPFolder_wpAddToContent(wpTempFolder, (WPObject*) wpFolder, 
-                              NOMPath_copyCString(wpFolder, NULLHANDLE), NULLHANDLE);
+                              NOMPath_copyCString(np, NULLHANDLE), NULLHANDLE);
       
       wpTempFolder=wpFolder;
@@ -221 +229 @@
   return 0;
 }
-
-
-/*
-  Just a test function for making noise...
- */
-void _System theBeep(void)
-{
-  DosBeep(2500,400);
-  DosBeep(500,200);
-  DosBeep(1500,200);
-  DosBeep(2500,400);
-  DosBeep(1500,200);
-  DosBeep(500,200);
-  DosBeep(2500,400);
-}