Changeset 152

Timestamp:

Dec 10, 2006, 10:16:55 AM (19 years ago)

Author:

cinc

Message:

Some menu improvememnts.

Location:

trunk/desktop

Files:

• class_c/wpobject.c (modified) (2 diffs)
• idl/wpobject.idl (modified) (2 diffs)

trunk/desktop/class_c/wpobject.c

@@ -47 +47 @@
 
 #include <string.h>
+#include <gtk/gtk.h>
+#include <nomguitk.h>
 #include "desktoptypes.h"
+
+/* We have to declare this here to make PNOMFolderWindow known
+   to wpDisplayMenu(). */
+#ifndef NOMFolderWindow
+typedef struct NOMFolderWindow_struct {
+  struct nomMethodTabStruct  *mtab;
+  gulong body[1];
+} NOMFolderWindowObj;
+#define NOMFolderWindow NOMFolderWindowObj
+typedef NOMFolderWindow *PNOMFolderWindow;
+#endif
+
 #include "wpobject.ih"
 
+#include "nomfolderwindow.h"
 
 NOM_Scope gpointer NOMLINK impl_WPObject_wpAllocMem(WPObject* nomSelf, const CORBA_unsigned_long cbBytes,
@@ -235 +250 @@
 }
 
+NOM_Scope PNOMMenu NOMLINK impl_WPObject_wpDisplayMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+                                                       const gpointer gReserved, const CORBA_unsigned_long ulMenuType,
+                                                       const CORBA_unsigned_long ulReserved, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  PNOMMenu nomMenu=NOMMenuNew();
+
+  /* Let classes insert menu items now */
+  WPObject_wpModifyMenu(nomSelf, nomFolder, nomMenu, ulMenuType, ev);
+
+  /* Let classes filter menu items now */
+  WPObject_wpFilterMenu(nomSelf, nomFolder, nomMenu, ulMenuType, 0, ev);
+
+  /* And finally show it */
+  gtk_menu_popup(GTK_MENU(NOMMenu_getMenuHandle(nomMenu,ev)), NULL, NULL, NULL, NULL, 0,
+                 gtk_get_current_event_time());
+  return nomMenu;
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpModifyMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder, const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpFilterMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder, const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType, const CORBA_unsigned_long ulFlags, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+}
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMenuItemSelected(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+                                                                 const PNOMMenu nomMenu,
+                                                                 const CORBA_unsigned_long ulMenuType,
+                                                                 CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  CORBA_boolean nomRetval;
+
+  return nomRetval;
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpInsertMenuItem(WPObject* nomSelf, const PNOMMenu nomMenu,
+                                                      const CORBA_unsigned_long ulId, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+}

trunk/desktop/idl/wpobject.idl

@@ -40 +40 @@
 #include "wpnativetypes.idl"
 #include "nomstring.idl"
+#include "nommenu.idl"
 
-//interface WPFolder;
+
+#ifndef NOMFolderWindow_defined
+#define NOMFolderWindow_defined
+native PNOMFolderWindow;
+#endif
 
 NOMCLASSNAME(WPObject);
@@ -76 +81 @@
   PNOMString wpQueryTitle();
 
+  PNOMMenu wpDisplayMenu(in PNOMFolderWindow 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,
+                    in unsigned long ulFlags);
+  boolean wpMenuItemSelected(in PNOMFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType);
+  void wpInsertMenuItem( in PNOMMenu nomMenu, in unsigned long ulId);
+
   /* Methods overriden by this class */
   NOMOVERRIDE(nomInit);