Changeset 188 for trunk/desktop/class_c/wpobject.c

Timestamp:

Jan 13, 2007, 11:54:02 PM (19 years ago)

Author:

cinc

Message:

Created WPFolderWindow class. NOMFolderClass deleted.

File:

• trunk/desktop/class_c/wpobject.c (modified) (8 diffs)

trunk/desktop/class_c/wpobject.c

@@ -52 +52 @@
 /* We have to declare this here to make PNOMFolderWindow known
    to wpDisplayMenu(). */
-#ifndef NOMFolderWindow
-typedef struct NOMFolderWindow_struct {
+#ifndef WPFolderWindow
+typedef struct WPFolderWindow_struct {
   struct nomMethodTabStruct  *mtab;
   gulong body[1];
-} NOMFolderWindowObj;
-#define NOMFolderWindow NOMFolderWindowObj
-typedef NOMFolderWindow *PNOMFolderWindow;
+} WPFolderWindowObj;
+#define WPFolderWindow WPFolderWindowObj
+typedef WPFolderWindow *PWPFolderWindow;
 #endif
 
@@ -74 +74 @@
 
 #include "wpobject.ih"
-#include "nomfolderwindow.h"
+#include "wpfolderwindow.h"
 #include "wpnotebook.h"
 
@@ -205 +205 @@
 }
 
-NOM_Scope gpointer NOMLINK impl_WPObject_wpOpen(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+NOM_Scope gpointer NOMLINK impl_WPObject_wpOpen(WPObject* nomSelf, const PWPFolderWindow nomFolder,
                                                 const gulong ulView, const gpointer pParam, CORBA_Environment *ev)
 {
@@ -249 +249 @@
 }
 
-NOM_Scope gpointer NOMLINK impl_WPObject_wpViewObject(WPObject* nomSelf, const PNOMFolderWindow nomFolder, const gulong ulView, const gpointer pParam, CORBA_Environment *ev)
+NOM_Scope gpointer NOMLINK impl_WPObject_wpViewObject(WPObject* nomSelf, const PWPFolderWindow nomFolder,
+                                                      const gulong ulView, const gpointer pParam,
+                                                      CORBA_Environment *ev)
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
@@ -590 +592 @@
 
 
-NOM_Scope PNOMMenu NOMLINK impl_WPObject_wpDisplayMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+NOM_Scope PNOMMenu NOMLINK impl_WPObject_wpDisplayMenu(WPObject* nomSelf, const PWPFolderWindow nomFolder,
                                                        const gpointer gReserved, const CORBA_unsigned_long ulMenuType,
                                                        const CORBA_unsigned_long ulReserved, CORBA_Environment *ev)
@@ -610 +612 @@
 }
 
-NOM_Scope void NOMLINK impl_WPObject_wpModifyMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder, 
+NOM_Scope void NOMLINK impl_WPObject_wpModifyMenu(WPObject* nomSelf, const PWPFolderWindow nomFolder, 
                                                   const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType,
                                                   CORBA_Environment *ev)
@@ -627 +629 @@
 }
 
-NOM_Scope void NOMLINK impl_WPObject_wpFilterMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+NOM_Scope void NOMLINK impl_WPObject_wpFilterMenu(WPObject* nomSelf, const PWPFolderWindow nomFolder,
                                                   const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType,
                                                   const CORBA_unsigned_long ulFlags, CORBA_Environment *ev)
@@ -635 +637 @@
 }
 
-NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMenuItemSelected(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMenuItemSelected(WPObject* nomSelf, const PWPFolderWindow nomFolder,
                                                                  const PNOMMenuItem nomMenuItem,
                                                                  CORBA_Environment *ev)