Changeset 186 for trunk/gui/class_c/nomfolderwindow.c

Timestamp:

Jan 13, 2007, 12:36:01 PM (19 years ago)

Author:

cinc

Message:

Folder viws are working now. Load of fixes and enhancements for it to work.

File:

• trunk/gui/class_c/nomfolderwindow.c (modified) (7 diffs)

trunk/gui/class_c/nomfolderwindow.c

@@ -44 +44 @@
 #include <gtk/gtk.h>
 #include "nomguitk.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
 #include "nomfolderwindow.ih"
-
-#warning !!!!! nomIsObj() must be globaly defined !!!!!
-#define nomIsObj(a) ((a)!= 0)
-
 
 NOM_Scope PGtkWidget NOMLINK impl_NOMFolderWindow_queryContainerHandle(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -70 +69 @@
   NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
 
-  if(!nomIsObj(pWPFolderObject))
+  if(!nomIsObj((NOMObject*)pWPFolderObject))
     return;
 
@@ -83 +82 @@
 }
 
+#if 0
 static void
 itemActivated (GtkIconView *icon_view,
@@ -90 +90 @@
   DosBeep(1500, 100);
 }
+#endif
 
 /*
@@ -164 +165 @@
 }
 
-
+#if 0
 static gboolean
 handleEvent (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-  DosBeep(5000, 100);
+  DosBeep(500, 100);
   
   return FALSE;
 }
 
-extern gpointer *pGlobalMemInExe;
+static void
+itemActivated (GtkIconView *widget,
+                GtkTreePath *treePath,
+                gpointer     user_data)
+{
+  PNOMFolderWindow pWindow;
+  //  GtkTreePath* treePath;
+
+  pWindow=(NOMFolderWindow*)user_data;
+
+  g_message("%s: %x %s", __FUNCTION__, treePath , gtk_tree_path_to_string(treePath));
+
+  return;
+}
+#endif
+
 
 NOM_Scope void NOMLINK impl_NOMFolderWindow_nomInit(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -249 +265 @@
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
                                     GTK_SELECTION_MULTIPLE);
+#if 0
   /* Connect to the "item_activated" signal */
   g_signal_connect (icon_view, "item-activated",
                     G_CALLBACK (itemActivated), nomSelf);
+#endif
   //#endif
 
@@ -276 +294 @@
   gtk_widget_grab_focus (icon_view);
 
-  g_signal_connect (GTK_WIDGET(window), "size-request",
-                    G_CALLBACK (handleEvent), nomSelf);
+  //  g_signal_connect (GTK_WIDGET(window), "size-request",
+  //                G_CALLBACK (handleEvent), nomSelf);
 
   NOMFolderWindow_setWindowHandle(nomSelf, window, NULLHANDLE);