Changeset 151 for trunk/foundation

Timestamp:

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

Author:

cinc

Message:

Some menu improvememnts.

Location:

trunk/foundation

Files:

• Makefile (modified) (1 diff)
• class_c/nommenu.c (modified) (2 diffs)
• idl/nommenu.idl (modified) (2 diffs)
• idl/nommenuitem.idl (modified) (2 diffs)

trunk/foundation/Makefile

@@ -24 +24 @@
 
 
-ADDLIBS         =        -l$(OBJDIR)/nobjtk
+ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
 
 # Define objects to build

trunk/foundation/class_c/nommenu.c

@@ -50 +50 @@
 #include "nommenu.ih"
 
-NOM_Scope void NOMLINK impl_NOMMenu_appendMenuItem(NOMMenu* nomSelf, CORBA_Environment *ev)
+
+NOM_Scope PGtkWidget NOMLINK impl_NOMMenu_getMenuHandle(NOMMenu* nomSelf, CORBA_Environment *ev)
 {
-/* NOMMenuData* nomThis=NOMMenuGetData(nomSelf); */
+  NOMMenuData* nomThis=NOMMenuGetData(nomSelf);
 
+  return _pgMenuHandle;
 }
 
@@ -61 +63 @@
 {
   NOMMenuData* nomThis=NOMMenuGetData(nomSelf);
+  GtkWidget* menuItem;
 
   NOMMenu_nomInit_parent(nomSelf,  ev);
   _pgMenuHandle=gtk_menu_new();
+
+  /* This is only for testing... */
+  menuItem=gtk_menu_item_new_with_label("Blabbla");
+  gtk_widget_show(menuItem);
+  gtk_menu_shell_append(GTK_MENU_SHELL(_pgMenuHandle), menuItem);
 }
 

trunk/foundation/idl/nommenu.idl

@@ -41 +41 @@
 NOMCLASSNAME(NOMMenu);
 
+#ifndef PGtkWidget_defined
+#define PGtkWidget_defined
 /* This should be moved in a header file */
 native PGtkWidget;
+#endif
 
 interface NOMMenu : NOMObject
@@ -48 +51 @@
   NOMCLASSVERSION(1, 0);
 
-  void appendMenuItem();
-
+  PGtkWidget getMenuHandle();
   NOMOVERRIDE(nomInit);
   NOMOVERRIDE(nomUninit);

trunk/foundation/idl/nommenuitem.idl

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 
-#ifndef NOMMENU_IDL_INCLUDED
-#define NOMMENU_IDL_INCLUDED
+#ifndef NOMMENUITEM_IDL_INCLUDED
+#define NOMMENUITEM_IDL_INCLUDED
 
 #include "nomobj.idl"
@@ -55 +55 @@
 };
 
-#endif  /* NOMMENU_IDL_INCLUDED */
+#endif  /* NOMMENUITEM_IDL_INCLUDED */