Changeset 163

Timestamp:

Jan 2, 2007, 11:56:34 AM (19 years ago)

Author:

cinc

Message:

Moved menu classes to gui tree.

Location:

trunk/gui

Files:

• Makefile (modified) (2 diffs)
• class_c/nomfolderwindow.c (modified) (10 diffs)
• class_c/nommenu.c (copied) (copied from trunk/foundation/class_c/nommenu.c )
• class_c/nommenuitem.c (copied) (copied from trunk/foundation/class_c/nommenuitem.c )
• class_c/nomwindow.c (modified) (3 diffs)
• exports.def (modified) (1 diff)
• idl/nomfolderwindow.idl (modified) (1 diff)
• idl/nommenu.idl (copied) (copied from trunk/foundation/idl/nommenu.idl )
• idl/nommenuitem.idl (copied) (copied from trunk/foundation/idl/nommenuitem.idl )
• idl/nomwindow.idl (modified) (1 diff)

trunk/gui/Makefile

@@ -26 +26 @@
                         -I $(FOUNDATIONPATH)/class_h -I $(FOUNDATIONPATH)/include
 
-ADDLIBS         =        -l$(OBJDIR)/nobjtk
+ADDLIBS         =        -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voywp
 
 # Define objects to build
@@ -32 +32 @@
 
 CLASSOBJECTS    =       $(OBJDIR)/nomwindow.o \
-                        $(OBJDIR)/nomfolderwindow.o
+                        $(OBJDIR)/nomfolderwindow.o \
+                        $(OBJDIR)/nommenu.o \
+                        $(OBJDIR)/nommenuitem.o
+
 
 .PRECIOUS:      $(CLASSINC)/%.ih $(CLASSCDIR)/%.c $(CDIR)/%.c

trunk/gui/class_c/nomfolderwindow.c

@@ -50 +50 @@
 
 
-NOM_Scope PGtkWidget NOMLINK impl_NOMFolderWindow_getContainerHandle(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
+NOM_Scope PGtkWidget NOMLINK impl_NOMFolderWindow_queryContainerHandle(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
 {
   NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
@@ -76 +76 @@
 }
 
-NOM_Scope PWPFolder NOMLINK impl_NOMFolderWindow_getWPFolderObject(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
+NOM_Scope PWPFolder NOMLINK impl_NOMFolderWindow_queryWPFolderObject(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
 {
   NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
@@ -136 +136 @@
           /* Click on white space */
           WPFolder* wpFolder;
-          wpFolder=NOMFolderWindow_getWPFolderObject(pWindow, NULLHANDLE);
+          wpFolder=NOMFolderWindow_queryWPFolderObject(pWindow, NULLHANDLE);
           g_message("%s: %s", __FUNCTION__, wpFolder->mtab->nomClassName);
+          WPObject_wpDisplayMenu(wpFolder, pWindow, NULL, 0, 0, NULL);
         }
       else
@@ -157 +158 @@
                              -1);
           g_message("%s: %s", __FUNCTION__, wpObject->mtab->nomClassName);
-
+          WPObject_wpDisplayMenu(wpObject, pWindow, NULL, 0, 0, NULL);
         }
-
-#if 0      
-      /* This is the folder object not the object on which a click occured */
-      WPObject *wpObject=(WPObject*)user_data;
-      if(nomIsObj(wpObject)){
-        nomPrintf("%s: %x->%s\n", __FUNCTION__, wpObject, wpObject->mtab->nomClassName);        
-      }
-
-      if(!somIsObj(wpObject))
-        return TRUE;
-
-      /* ptlPopupPt is NULLHANDLE because GTK automatically pick a useful position for the popup
-         menu. */
-      _wpDisplayMenu(wpObject, NULLHANDLE, (HWND) widget, NULLHANDLE, 0, (ULONG) 0);
-      return TRUE;
-#endif
     }
-
   return FALSE;
 }
+
+
+static gboolean
+handleEvent (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+  DosBeep(5000, 100);
+  
+  return FALSE;
+}
+
+extern gpointer *pGlobalMemInExe;
 
 NOM_Scope void NOMLINK impl_NOMFolderWindow_nomInit(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -188 +183 @@
   GtkWidget *tool_bar;
   GtkToolItem *up_button;
+  //  GtkWidget *menuBar, *file;
 
   NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
@@ -204 +200 @@
   gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
+  /* Make sure we have a reference to the class so the garbage collector
+     doesn't unload us */
+  g_object_set_data(G_OBJECT(window), NOMOBJECT_KEY_STRING, nomSelf);
+
+#if 0
+  menuBar=gtk_menu_bar_new();
+  file=gtk_menu_item_new_with_label("File");
+  //gtk_signal_connect(GTK_OBJECT(file), "destroy", GTK_SIGNAL_FUNC(tst), NULL);
+
+  gtk_container_add(GTK_CONTAINER(menuBar), file);
+  gtk_widget_show(menuBar);
+  gtk_widget_show(file);
+#endif
+
   vbox = gtk_vbox_new (FALSE, 0);
+
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   /* Create and pack the toolbar */
   tool_bar = gtk_toolbar_new ();
+  
+  //  gtk_box_pack_start (GTK_BOX (vbox), menuBar, FALSE, FALSE, 0); /* Don't expand the toolbar vertically if sized */
   gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0); /* Don't expand the toolbar vertically if sized */
   
@@ -231 +244 @@
   /* Create an icon view without model */
   icon_view = gtk_icon_view_new ();
-  _pgContainerHandle=icon_view;
-
+  NOMFolderWindow_setContainerHandle(nomSelf, icon_view, NULLHANDLE);
+                                     
   /* Allow multiple selection in icon view */
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
@@ -239 +252 @@
   g_signal_connect (icon_view, "item-activated",
                     G_CALLBACK (itemActivated), nomSelf);
+  //#endif
+
   /* This is for kb binding only */
 #if 0
@@ -244 +259 @@
                     G_CALLBACK (fldr_cbPopupMenu), nomSelf);
 #endif
+
   /* Handle mouse buttons */
   g_signal_connect (GTK_WIDGET(icon_view), "button-press-event",
@@ -259 +275 @@
 
   gtk_widget_grab_focus (icon_view);
+
+  g_signal_connect (GTK_WIDGET(window), "size-request",
+                    G_CALLBACK (handleEvent), nomSelf);
+
   NOMFolderWindow_setWindowHandle(nomSelf, window, NULLHANDLE);
   /* Window is hidden here and must be shown by the caller */

trunk/gui/class_c/nomwindow.c

@@ -49 +49 @@
 #include "nomwindow.ih"
 
-NOM_Scope PGtkWidget NOMLINK impl_NOMWindow_getWindowHandle(NOMWindow* nomSelf, CORBA_Environment *ev)
+NOM_Scope PGtkWidget NOMLINK impl_NOMWindow_queryWindowHandle(NOMWindow* nomSelf, CORBA_Environment *ev)
 {
   NOMWindowData* nomThis=NOMWindowGetData(nomSelf);
@@ -67 +67 @@
   /* NOMWindowData* nomThis=NOMWindowGetData(nomSelf); */
 
-  gtk_widget_show_all(NOMWindow_getWindowHandle(nomSelf, NULLHANDLE));
+  gtk_widget_show_all(NOMWindow_queryWindowHandle(nomSelf, NULLHANDLE));
 }
 
@@ -73 +73 @@
 {
   /* NOMWindowData* nomThis=NOMWindowGetData(nomSelf); */
-  gtk_widget_hide(NOMWindow_getWindowHandle(nomSelf, NULLHANDLE));
+  gtk_widget_hide(NOMWindow_queryWindowHandle(nomSelf, NULLHANDLE));
 }
 

trunk/gui/exports.def

@@ -12 +12 @@
         _NOMFolderWindowCClassData 
         NOMFolderWindowNewClass    
+
+        _NOMMenuClassData  
+        _NOMMenuCClassData 
+        NOMMenuNewClass    
+
+        _NOMMenuItemClassData  
+        _NOMMenuItemCClassData 
+        NOMMenuItemNewClass    

trunk/gui/idl/nomfolderwindow.idl

@@ -43 +43 @@
   NOMCLASSVERSION(1, 0);
 
-  PGtkWidget getContainerHandle();
+  PGtkWidget queryContainerHandle();
   void setContainerHandle(in PGtkWidget pgWidget);   
   void setWPFolderObject(in PWPFolder pWPFolderObject);
-  PWPFolder getWPFolderObject();
+  PWPFolder queryWPFolderObject();
 
   NOMOVERRIDE(nomInit);

trunk/gui/idl/nomwindow.idl

@@ -38 +38 @@
 #include "nomobj.idl"
 
+#ifndef PGtkWidget_defined
+#define PGtkWidget_defined
+/* This should be moved in a header file */
 native PGtkWidget;
+#endif
 interface NOMWindow : NOMObject
 {
   NOMCLASSVERSION(1, 0);
 
-  PGtkWidget getWindowHandle();   
+  PGtkWidget queryWindowHandle();   
   void setWindowHandle(in PGtkWidget pgWidget);   
   void show();