Changeset 188

Timestamp:

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

Author:

cinc

Message:

Created WPFolderWindow class. NOMFolderClass deleted.

Location:

trunk

Files:

• desktop/Makefile (modified) (1 diff)
• desktop/class_c/wpfolder.c (modified) (13 diffs)
• desktop/class_c/wpfolderwindow.c (added)
• desktop/class_c/wpobject.c (modified) (8 diffs)
• desktop/exports.def (modified) (1 diff)
• desktop/idl/wpfolder.idl (modified) (2 diffs)
• desktop/idl/wpfolderwindow.idl (added)
• desktop/idl/wpnotebook.idl (modified) (1 diff)
• desktop/idl/wpobject.idl (modified) (5 diffs)
• gui/class_c/nomfolderwindow.c (deleted)
• gui/idl/nomfolderwindow.idl (deleted)

trunk/desktop/Makefile

@@ -41 +41 @@
                         $(OBJDIR)/wpwindow.o \
                         $(OBJDIR)/wpnotebook.o \
+                        $(OBJDIR)/wpfolderwindow.o \
                         $(OBJDIR)/wpclassmanager.o \
                         $(OBJDIR)/helper.o

trunk/desktop/class_c/wpfolder.c

@@ -65 +65 @@
 #include "desktoptypes.h"
 
-#include "nomfolderwindow.h"
+#ifndef WPFolder
+typedef struct WPFolder_struct {
+  struct nomMethodTabStruct  *mtab;
+  gulong body[1];
+} WPFolderObj;
+#define WPFolder WPFolderObj
+typedef WPFolder *PWPFolder;
+#endif
+
+#include "wpfolderwindow.h"
 
 #include "wpfolder.ih"
@@ -242 +251 @@
   return FALSE;
 }
-/* Insert an object into the folders object list */
-void tst_insertObject(WPFolder* nomSelf, WPObject* wpObject, gchar* chrName)
-{
-  WPFolderData* nomThis=WPFolderGetData(nomSelf); 
-
-  g_tree_insert(_fldrObjects, chrName, wpObject);
-}
 #endif
 
@@ -270 +272 @@
     wpDataFile=(WPDataFile*)pValue->wpObject;
 
-    if(nomIsObj((PNOMObject)wpDataFile))
+    if(nomIsObj(wpDataFile))
       {
         gtk_list_store_append (store, &iter);
@@ -443 +445 @@
 {
   WPObject* wpObject;
-  NOMFolderWindow* wpWindow;
+  WPFolderWindow* wpWindow;
 
   PUSEITEM pUseItem=(PUSEITEM) pData;
 
   /* This is also in the use item */
-  wpWindow=(NOMFolderWindow*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
+  wpWindow=(WPFolderWindow*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
 
   g_return_val_if_fail(NULLHANDLE!=wpWindow, FALSE);
@@ -465 +467 @@
 
 
-NOM_Scope gpointer NOMLINK impl_WPFolder_wpOpen(WPFolder* nomSelf, const PNOMFolderWindow nomFolder,
+NOM_Scope gpointer NOMLINK impl_WPFolder_wpOpen(WPFolder* nomSelf, const PWPFolderWindow nomFolder,
                                                 const gulong ulView, const gpointer pParam,
                                                 CORBA_Environment *ev)
@@ -478 +480 @@
         PUSEITEM pui;
         ULONG ulError;
-        NOMFolderWindow * nomFldrWindow;
+        WPFolderWindow * wpFldrWindow;
         gchar* pszPath;
         PPRIVFOLDERDATA priv;
@@ -488 +490 @@
 
 
-        nomFldrWindow=WPFolder_wpCreateFolderWindow(nomSelf, ev);
-#warning !!!!! There is WPWindow now. Use that for any WPS windows, Then this call must be changed
-        NOMFolderWindow_setWPFolderObject(nomFldrWindow, nomSelf, NULLHANDLE);
+        wpFldrWindow=WPFolder_wpCreateFolderWindow(nomSelf, NULLHANDLE);
+        WPFolderWindow_wpSetWPObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
 
         /* Insert it into inuse list */
@@ -499 +500 @@
         pui++;
         ((VIEWITEM*)pui)->ulView=VIEW_CONTENTS;
-        ((VIEWITEM*)pui)->nomWindow=(NOMWindow*)nomFldrWindow;
+        ((VIEWITEM*)pui)->nomWindow=(NOMWindow*)wpFldrWindow;
         pui--;
 #warning !!!!! Folder window must be inserted into inuse list !!!!!
         /* Make sure the view item is removed when the window is closed */
-        g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)nomFldrWindow, NULLHANDLE)),"delete-event", 
+        g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpFldrWindow, NULLHANDLE)),"delete-event", 
                          G_CALLBACK(tempWPWindowDeleteHandler), (gpointer) pui);
         WPFolder_wpAddToObjUseList(nomSelf, pui, NULLHANDLE);
@@ -536 +537 @@
         g_object_unref (gStore);
         
-        return nomFldrWindow;
+        return wpFldrWindow;
       }/* default */
     default:
@@ -572 +573 @@
                 gpointer     user_data)
 {
-  PNOMFolderWindow pWindow;
-
-  pWindow=(NOMFolderWindow*)user_data;
+  PWPFolderWindow pWindow;
+
+  pWindow=(WPFolderWindow*)user_data;
 
   if(NULL!=treePath)
@@ -598 +599 @@
   models and stuff.
 */
-NOM_Scope PNOMFolderWindow NOMLINK impl_WPFolder_wpCreateFolderWindow(WPFolder* nomSelf, CORBA_Environment *ev)
-{
-  NOMFolderWindow * nomFldrWindow;
+NOM_Scope PWPFolderWindow NOMLINK impl_WPFolder_wpCreateFolderWindow(WPFolder* nomSelf, CORBA_Environment *ev)
+{
+  WPFolderWindow * wpFldrWindow;
   PPRIVFOLDERDATA priv;
   WPFolderData *nomThis = WPFolderGetData(nomSelf);
@@ -606 +607 @@
   priv=(PPRIVFOLDERDATA)_privFolderData;
 
-  nomFldrWindow=NOMFolderWindowNew();
+  wpFldrWindow=WPFolderWindowNew();
 
 #warning !!!!! This is only for testing !!!!!
-  priv->gtkIconView=NOMFolderWindow_queryContainerHandle(nomFldrWindow, ev);
+  priv->gtkIconView=WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, ev);
 
   /* Connect to the "item_activated" signal */
@@ -615 +616 @@
                     G_CALLBACK (itemActivated), nomSelf);
 
-  gtk_window_set_title (GTK_WINDOW (NOMFolderWindow_queryWindowHandle(nomFldrWindow, NULLHANDLE)),
+  gtk_window_set_title (GTK_WINDOW (WPFolderWindow_queryWindowHandle(wpFldrWindow, NULLHANDLE)),
                         NOMString_queryCString(WPFolder_wpQueryTitle(nomSelf, NULLHANDLE), NULLHANDLE));
   /* Show the new window */
-  NOMFolderWindow_show(nomFldrWindow, ev);
-
-  return nomFldrWindow;
+  WPFolderWindow_show(wpFldrWindow, ev);
+
+  return wpFldrWindow;
 }
 

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)

trunk/desktop/exports.def

@@ -41 +41 @@
         WPWindowNewClass
 
+        _WPFolderWindowClassData
+        _WPFolderWindowCClassData
+        WPFolderWindowNewClass
+
 ;IMPORTS

trunk/desktop/idl/wpfolder.idl

@@ -44 +44 @@
 /*#include "nomfolderwindow.idl"*/
 
-#ifndef NOMFolderWindow_defined
-#define NOMFolderWindow_defined
-native PNOMFolderWindow;
+#ifndef WPFolderWindow_defined
+#define WPFolderWindow_defined
+native PWPFolderWindow;
 #endif
 
@@ -58 +58 @@
                      in string pszPath,
                      in boolean fFoldersOnly);
-  PNOMFolderWindow wpCreateFolderWindow();
+  PWPFolderWindow wpCreateFolderWindow();
 
 #if 0

trunk/desktop/idl/wpnotebook.idl

@@ -51 +51 @@
 #include "nomnotebook.idl"
 
-
 interface WPNoteBook : WPWindow
 {

trunk/desktop/idl/wpobject.idl

@@ -46 +46 @@
 #include "nomwindow.idl"
 
-#ifndef NOMFolderWindow_defined
-#define NOMFolderWindow_defined
-native PNOMFolderWindow;
+#if 0
+#ifndef WPFolderWindow_defined
+#define WPFolderWindow_defined
+native PWPFolderWindow;
+#endif
+#endif
+
+#ifndef WPFLDRWINDOW_IDL_INCLUDED
+native PWPFolderWindow;
 #endif
 
@@ -62 +68 @@
 #endif
 
+#if 0
+#ifndef WPNOTEBOOK_IDL_INCLUDED
+native PWPNoteBook;
+#endif
+#endif
 //NOMCLASSNAME(WPObject);
 
@@ -76 +87 @@
   void     wpInitData();
   void     wpUnInitData();
-  gpointer wpOpen(in PNOMFolderWindow nomFolder, in gulong ulView, in gpointer pParam);
+  gpointer wpOpen(in PWPFolderWindow nomFolder, in gulong ulView, in gpointer pParam);
   void     wpLockObject();
   boolean  wpUnlockObject();
@@ -87 +98 @@
   PNOMString wpQueryTitle();
 
-  PNOMMenu wpDisplayMenu(in PNOMFolderWindow nomFolder, in gpointer gReserved, in unsigned long ulMenuType,
+  PNOMMenu wpDisplayMenu(in PWPFolderWindow nomFolder, in gpointer gReserved, in unsigned long ulMenuType,
                          in unsigned long ulReserved);
-  void wpModifyMenu(in PNOMFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType);
-  void wpFilterMenu(in PNOMFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType,
+  void wpModifyMenu(in PWPFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType);
+  void wpFilterMenu(in PWPFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType,
                     in unsigned long ulFlags);
-  boolean wpMenuItemSelected(in PNOMFolderWindow nomFolder, in PNOMMenuItem nomMenuItem);
+  boolean wpMenuItemSelected(in PWPFolderWindow nomFolder, in PNOMMenuItem nomMenuItem);
   void wpInsertMenuItem( in PNOMMenu nomMenu, in PNOMMenuItem nomMenuItem, in unsigned long ulPosition);
 
@@ -100 +111 @@
   unsigned long wpAddObjectGeneralPage(in PWPNoteBook wpNoteBook);
 
-  gpointer wpViewObject(in PNOMFolderWindow nomFolder, in gulong ulView, in gpointer pParam);
+  gpointer wpViewObject(in PWPFolderWindow nomFolder, in gulong ulView, in gpointer pParam);
   gpointer wpSwitchTo(in gulong ulView);
   boolean wpRegisterView(in PNOMWindow pWindow, in PNOMString nomStrViewTitle);