Changeset 194 for trunk/desktop/class_c/wpfolderwindow.c

Timestamp:

Jan 16, 2007, 8:32:50 PM (19 years ago)

Author:

cinc

Message:

Improvements to folders

File:

• trunk/desktop/class_c/wpfolderwindow.c (modified) (5 diffs)

trunk/desktop/class_c/wpfolderwindow.c

@@ -36 +36 @@
  *
  */
+#define METHOD_DEBUG
+
 #include <os2.h>
 
@@ -52 +54 @@
 #include "wpfolderwindow.ih"
 #include "wpobject.h"
+#include "exception.h"
 
 NOM_Scope PGtkWidget NOMLINK impl_WPFolderWindow_wpQueryContainerHandle(WPFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -100 +103 @@
 fldr_handleButtonEvent (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-  if(fldr_checkContextButton(event))
-    {
-      PWPFolderWindow pWindow;
-      GtkTreePath* treePath;
-
-      DosBeep(5000, 100);
-      pWindow=(WPFolderWindow*)user_data;
-
-      treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(widget), event->x, event->y );
-      if(NULL==treePath)
-        {
-          /* Click on white space */
-          WPFolder* wpFolder;
-          wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);
-          g_message("%s: %s", __FUNCTION__, wpFolder->mtab->nomClassName);
-          WPObject_wpDisplayMenu((WPObject*)wpFolder, pWindow, NULL, MENU_OPENVIEWPOPUP, 0, NULL);
-        }
-      else
-        {
-          GtkTreeIter iter;
-          GtkTreeModel* model;
-          WPObject *wpObject;
-          /* Click on an icon */
-
-          g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
-
-          model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
-          g_message("%s: model: %x", __FUNCTION__, (UINT)model);
-
-          gtk_tree_model_get_iter(model , &iter, treePath);
-
-          gtk_tree_model_get(model, &iter,
-                             0, &wpObject,
-                             -1);
-          g_message("%s: %s", __FUNCTION__, wpObject->mtab->nomClassName);
-          WPObject_wpDisplayMenu((WPObject*)wpObject, pWindow, NULL, MENU_OBJECTPOPUP, 0, NULL);
-        }
-    }
+  
+
+  TRY(FLDR_BUTTONEVENT) {
+    if(fldr_checkContextButton(event))
+      {
+        PWPFolderWindow pWindow;
+        GtkTreePath* treePath;
+        DosBeep(5000, 100);
+        pWindow=(WPFolderWindow*)user_data;
+        TST_OBJECT(pWindow);
+        treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(widget), event->x, event->y );
+        if(NULL==treePath)
+          {
+            /* Click on white space */
+            WPFolder* wpFolder;
+            wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);
+            TST_OBJECT(wpFolder);
+            
+            if(nomIsObj(wpFolder))
+              WPObject_wpDisplayMenu((WPObject*)wpFolder, pWindow, NULL, MENU_OPENVIEWPOPUP, 0, NULL);
+            else
+              g_message("%d %s: WPFolder object not valid!", __LINE__, __FUNCTION__);
+          }
+        else
+          {
+            GtkTreeIter iter;
+            GtkTreeModel* model;
+            WPObject *wpObject;
+            /* Click on an icon */
+            
+            g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
+            
+            model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
+            g_message("%s: model: %x", __FUNCTION__, (UINT)model);
+            
+            gtk_tree_model_get_iter(model , &iter, treePath);            
+            gtk_tree_model_get(model, &iter, 0, &wpObject, -1);
+
+            TST_OBJECT(wpObject);
+
+            if(nomIsObj(wpObject)){
+              g_message("%s: %s calling wpDisplayMenu()", __FUNCTION__, wpObject->mtab->nomClassName);
+              WPObject_wpDisplayMenu((WPObject*)wpObject, pWindow, NULL, MENU_OBJECTPOPUP, 0, NULL);
+            }
+            else
+              g_message("%d %s: WPDataFile object not valid!", __LINE__, __FUNCTION__);
+
+          }
+      }/* if() */
+  }CATCH{    
+    //LOUD;
+    g_message("Line %d: Trap in %s", __LINE__, __FUNCTION__);  
+  }  END_CATCH(FLDR_BUTTONEVENT);
+
   return FALSE;
 }
@@ -210 +229 @@
   /* Create an icon view without model */
   icon_view = gtk_icon_view_new ();
-  WPFolderWindow_wpSetContainerHandle(nomSelf, icon_view, NULLHANDLE);
-                                     
+
   /* Allow multiple selection in icon view */
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
@@ -239 +257 @@
                     G_CALLBACK (up_clicked), store);
 #endif
+
+  WPFolderWindow_wpSetContainerHandle(nomSelf, icon_view, NULLHANDLE);
+
   /* Add icon view as child to the scroll window created earlier */
   gtk_container_add (GTK_CONTAINER (sw), icon_view);