Changeset 186 for trunk/desktop/class_c/wpobject.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/desktop/class_c/wpobject.c (modified) (5 diffs)

trunk/desktop/class_c/wpobject.c

@@ -185 +185 @@
 {
   WPObject* wpObject;
-  WPNoteBook* wpNoteBook;
+  WPWindow* wpWindow;
+
   PUSEITEM pUseItem=(PUSEITEM) pData;
 
-  wpNoteBook=(WPNoteBook*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
-
-  g_return_val_if_fail(NULLHANDLE!=wpNoteBook, FALSE);
-
-  wpObject=WPNoteBook_wpQueryWPObject(wpNoteBook, NULLHANDLE);
+  wpWindow=(WPWindow*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
+
+  g_return_val_if_fail(NULLHANDLE!=wpWindow, FALSE);
+
+  /* This is also in the use item */
+  wpObject=WPNoteBook_wpQueryWPObject(wpWindow, NULLHANDLE);
 
   g_return_val_if_fail(NULLHANDLE!=wpObject, FALSE);
@@ -232 +234 @@
         pui--;
         //g_message("   in %s wpNoteBook: %lx pui %lx", __FUNCTION__, wpNoteBook, pui);
+        /* Make sure the view item is removed when the window is closed */
         g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),"delete-event", 
                          G_CALLBACK(defaultWPWindowDeleteHandler), (gpointer) pui);
@@ -268 +271 @@
       {
         pViewItem=WPObject_wpFindViewItem(nomSelf, VIEW_SETTINGS, NULLHANDLE, ev);
+        if(pViewItem){
+          //g_message("   in %s : OPEN_SETTINGS returning %x %x ...", __FUNCTION__, pViewItem, pViewItem->nomWindow);
+          /* Bring the window to the foreground */
+          NOMWindow_present(pViewItem->nomWindow, ev);
+          return (gpointer)pViewItem->nomWindow;
+        }
+        break;
+      }
+    case OPEN_CONTENTS:
+      {
+#warning !!!!! This belongs into WPFolder !!!!!
+        pViewItem=WPObject_wpFindViewItem(nomSelf, VIEW_CONTENTS, NULLHANDLE, ev);
         if(pViewItem){
           //g_message("   in %s : OPEN_SETTINGS returning %x %x ...", __FUNCTION__, pViewItem, pViewItem->nomWindow);
@@ -449 +464 @@
 }
 
-NOM_Scope PNOMString NOMLINK impl_WPObject_wpSetTitle(WPObject* nomSelf, const PNOMString pnomStrNewTitle, CORBA_Environment *ev)
-{
-  WPObjectData* nomThis=WPObjectGetData(nomSelf);
-  PNOMString tmpString=NOMStringNew();
+NOM_Scope void NOMLINK impl_WPObject_wpSetTitle(WPObject* nomSelf, const PNOMString pnomStrNewTitle,
+                                                      CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+  PNOMString tmpString=(PNOMString)NOMString_new(pnomStrNewTitle, NULLHANDLE);
   gpointer tmpPtr;
 
   /* Create a new title */
-  NOMString_assign(tmpString, pnomStrNewTitle, ev);
+  NOMString_assign(tmpString, pnomStrNewTitle, NULLHANDLE);
 
   /* It may happen that someone changed the title from another thread. We may either
@@ -468 +484 @@
     tmpPtr=g_atomic_pointer_get(&_pnomStringTitle);
   }while(!g_atomic_pointer_compare_and_exchange((gpointer*)&_pnomStringTitle, tmpPtr, (gpointer) tmpString));
-
-  return pnomStrNewTitle;
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpSetTitleFromCString(WPObject* nomSelf, const CORBA_char * chrNewTitle,
+                                                           CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+  PNOMString orgTitle;
+  PNOMString tmpString;
+
+  orgTitle=(PNOMString)g_atomic_pointer_get(&_pnomStringTitle);
+  tmpString=(PNOMString)NOMString_new(orgTitle, NULLHANDLE);
+
+  NOMString_assignCString(tmpString, chrNewTitle, NULLHANDLE);
+  do{
+    /* Get old NOMString containing old title */
+    orgTitle=(PNOMString)g_atomic_pointer_get(&_pnomStringTitle);
+  }while(!g_atomic_pointer_compare_and_exchange((gpointer*)&_pnomStringTitle,
+                                                (gpointer)orgTitle, (gpointer) tmpString));
 }