Changeset 172

Timestamp:

Jan 4, 2007, 6:53:35 PM (19 years ago)

Author:

cinc

Message:

New methods wpViewObject()/wpSwitchTo(). wpOpen() improved.

Location:

trunk/desktop

Files:

• class_c/wpfolder.c (modified) (2 diffs)
• class_c/wpnotebook.c (modified) (1 diff)
• class_c/wpobject.c (modified) (5 diffs)
• idl/wpnativetypes.idl (modified) (1 diff)
• idl/wpobject.idl (modified) (2 diffs)

trunk/desktop/class_c/wpfolder.c

@@ -231 +231 @@
 }
 
-NOM_Scope gpointer NOMLINK impl_WPFolder_wpOpen(WPFolder* nomSelf, const gpointer ptrReserved,
-                                                const CORBA_unsigned_long ulView, const gpointer ptrParams,
+NOM_Scope gpointer NOMLINK impl_WPFolder_wpOpen(WPFolder* nomSelf, const PNOMFolderWindow nomFolder,
+                                                const gulong ulView, const gpointer pParam,
                                                 CORBA_Environment *ev)
 {
@@ -277 +277 @@
       }/* default */
     default:
-      g_return_val_if_reached(NULLHANDLE);
       break;
     }/* switch */
-  return NULLHANDLE;
+
+  return WPFolder_wpOpen_parent(nomSelf, nomFolder, ulView, pParam, ev);
 }
 

trunk/desktop/class_c/wpnotebook.c

@@ -72 +72 @@
   /* Create the toplevel window */
   gtkWindow=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_container_set_border_width(GTK_CONTAINER(gtkWindow), 5);
+  gtk_container_set_border_width(GTK_CONTAINER(gtkWindow), 1);
   /* Make sure we have a reference to the class so the garbage collector
      doesn't unload us */

trunk/desktop/class_c/wpobject.c

@@ -167 +167 @@
 }
 
-NOM_Scope gpointer NOMLINK impl_WPObject_wpOpen(WPObject* nomSelf, const gpointer ptrReserved, const CORBA_unsigned_long ulView, const gpointer ptrParams, CORBA_Environment *ev)
+
+NOM_Scope gpointer NOMLINK impl_WPObject_wpOpen(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+                                                const gulong ulView, const gpointer pParam, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  switch(ulView)
+    {
+    case OPEN_SETTINGS:
+      {
+        WPNoteBook* wpNoteBook;
+        wpNoteBook=WPNoteBookNew();
+        _wpAddSettingsPages(nomSelf, wpNoteBook, ev);
+        WPNoteBook_show(wpNoteBook, ev);
+        return (gpointer) wpNoteBook;
+      }
+    default:
+      /* We are the very last in the chain of classes being called */
+      g_return_val_if_reached(NULLHANDLE);
+      break;
+    }
+  return NULLHANDLE;
+}
+
+NOM_Scope gpointer NOMLINK impl_WPObject_wpViewObject(WPObject* nomSelf, const PNOMFolderWindow nomFolder, const gulong ulView, const gpointer pParam, CORBA_Environment *ev)
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
   gpointer nomRetval=NULLHANDLE;
 
-  return nomRetval;
+
+  if((nomRetval=WPObject_wpSwitchTo(nomSelf, ulView, ev))!=NULLHANDLE)
+    return nomRetval;
+
+  return WPObject_wpOpen(nomSelf, nomFolder, ulView, pParam, ev);
+}
+
+NOM_Scope gpointer NOMLINK impl_WPObject_wpSwitchTo(WPObject* nomSelf, const gulong ulView, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  g_message("Method wpSwitchTo() not implemented.");
+
+  return NULLHANDLE;
 }
 
@@ -306 +343 @@
 
   gtk_widget_show_all (vbox);
-  //  GUIProperties *tst=GUIPropertiesNew();
-
-  /*  _addNotebookPage(tst, vbox, "Icon");
-      _show(tst);*/
-  
-  gtk_notebook_prepend_page (GTK_NOTEBOOK (
-                                           NOMNoteBook_queryWindowHandle(
-                                           WPNoteBook_wpQueryNoteBookObject(wpNoteBook, ev), ev)), vbox, label);
+
+  NOMNoteBook_prependPage(WPNoteBook_wpQueryNoteBookObject(wpNoteBook, ev), vbox, label, ev);
 
   return 1234;
@@ -389 +420 @@
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-  CORBA_boolean nomRetval=FALSE;
 
   /* We only handle items with in own name space */
@@ -398 +428 @@
         case WPMENUID_PROPERTIES:
           {
-            WPNoteBook* wpNoteBook;
-            wpNoteBook=WPNoteBookNew();
-            _wpAddSettingsPages(nomSelf, wpNoteBook, ev);
-            WPNoteBook_show(wpNoteBook, ev);
-            break;
+            WPObject_wpViewObject(nomSelf, nomFolder,
+                            OPEN_SETTINGS, NULLHANDLE, ev);
+            return TRUE; /* We always return TRUE to show, we handled the menu item. It doesn't
+                          matter if we actually succeeded with creating the settings notebook. */
           }
         default:
@@ -408 +437 @@
         }
     }
-  return nomRetval;
+  return FALSE;
 }
 

trunk/desktop/idl/wpnativetypes.idl

@@ -37 +37 @@
 
 native PPRIVFOLDERDATA;
-native gint;
+/*native gint;*/
 native PGMutex; /* For the object mutex */
 native HMUX;    /* This one will be removed when a threaded glib is avail */

trunk/desktop/idl/wpobject.idl

@@ -61 +61 @@
   void     wpInitData();
   void     wpUnInitData();
-  gpointer wpOpen(in gpointer ptrReserved, in unsigned long ulView, in gpointer ptrParams);
+  gpointer wpOpen(in PNOMFolderWindow nomFolder, in gulong ulView, in gpointer pParam);
   void     wpLockObject();
   boolean  wpUnlockObject();
@@ -85 +85 @@
   unsigned long wpInsertSettingsPage(in PWPNoteBook wpNoteBook, in gpointer ppageinfo);
   unsigned long wpAddObjectGeneralPage(in PWPNoteBook wpNoteBook);
-
+  gpointer wpViewObject(in PNOMFolderWindow nomFolder, in gulong ulView, in gpointer pParam);
+  gpointer wpSwitchTo(in gulong ulView);
 
   /* Methods overriden by this class */