Changeset 176

Timestamp:

Jan 6, 2007, 1:10:17 PM (19 years ago)

Author:

cinc

Message:

Created an include file mess...

Location:

trunk

Files:

• desktop/class_c/wpdatafile.c (modified) (1 diff)
• desktop/class_c/wpnotebook.c (modified) (2 diffs)
• desktop/class_c/wpobject.c (modified) (14 diffs)
• desktop/idl/wpnotebook.idl (modified) (2 diffs)
• desktop/idl/wpobject.idl (modified) (2 diffs)
• desktop/include/desktoptypes.h (modified) (2 diffs)
• emx-wrapper/voyager-desktop.c (modified) (3 diffs)
• gui/class_c/nomwindow.c (modified) (1 diff)
• gui/idl/nomwindow.idl (modified) (1 diff)

trunk/desktop/class_c/wpdatafile.c

@@ -47 +47 @@
 #include "nomtk.h"
 
-#include "wpdatafile.ih"
+#include <gtk/gtk.h>
+#include "nomguitk.h"
 #include "helper.h"
 #include "desktop.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
+/* wpdatafile.ih includes some WPObject stuff and that needs these
+   includes. */
+#include "nomfolderwindow.h"
+
+#include "wpdatafile.ih"
 
 NOM_Scope CORBA_long NOMLINK impl_WPDataFile_wpQueryFileSize(WPDataFile* nomSelf, CORBA_Environment *ev)

trunk/desktop/class_c/wpnotebook.c

@@ -43 +43 @@
 #include <gtk/gtk.h>
 #include <nomguitk.h>
+#include "nomwindow.h"
+#include "desktoptypes.h"
 
+#include "nomfolderwindow.h"
 #include "wpnotebook.ih"
 
@@ -61 +64 @@
 }
 
+
+NOM_Scope void NOMLINK impl_WPNoteBook_wpSetWPObject(WPNoteBook* nomSelf, const PWPObject wpObject,
+                                                     CORBA_Environment *ev)
+{
+  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);
+  _wpObject=wpObject;
+
+}
+
+
+NOM_Scope PWPObject NOMLINK impl_WPNoteBook_wpQueryWPObject(WPNoteBook* nomSelf, CORBA_Environment *ev)
+{
+  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);
+
+  return _wpObject;
+}
+
+
+
+
 NOM_Scope void NOMLINK impl_WPNoteBook_nomInit(WPNoteBook* nomSelf, CORBA_Environment *ev)
 {
+  /* WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);  */
   GtkWidget* gtkWindow;
   NOMNoteBook* nomNoteBook;
-
-  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf); 
 
   WPNoteBook_nomInit_parent((NOMObject*)nomSelf,  ev);

trunk/desktop/class_c/wpobject.c

@@ -61 +61 @@
 #endif
 
-#ifndef WPObject
-typedef struct WPObject_struct {
-  struct nomMethodTabStruct  *mtab;
-  gulong body[1];
-} WPObjectObj;
-#define WPObject WPObjectObj
-typedef WPObject *PWPObject;
-#endif
-
 #include "nomwindow.h"
 #include "desktoptypes.h"
@@ -138 +129 @@
   WPObject_nomInit_parent((NOMObject*) nomSelf,  ev);
 
-  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s.\n",
-            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
+  //nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s.\n",
+  //        __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
 
   /* Initialize important data before letting subclasses do their stuff */
@@ -181 +172 @@
 }
 
+static
+gboolean defaultWPWindowDeleteHandler(GtkWidget* gtkWidget, GdkEvent* gdkEvent, gpointer pData)
+{
+  WPObject* wpObject;
+  WPNoteBook* wpNoteBook;
+  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);
+
+  g_return_val_if_fail(NULLHANDLE!=wpObject, FALSE);
+
+  WPObject_wpDeleteFromObjUseList(wpObject, pUseItem, NULLHANDLE);
+
+  return FALSE; /* Let other handlers run */
+}
 
 NOM_Scope gpointer NOMLINK impl_WPObject_wpOpen(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
@@ -196 +206 @@
         WPNoteBook* wpNoteBook;
         wpNoteBook=WPNoteBookNew();
+        WPNoteBook_wpSetWPObject(wpNoteBook, nomSelf, NULLHANDLE);
+
         _wpAddSettingsPages(nomSelf, wpNoteBook, ev);
 
@@ -207 +219 @@
         ((VIEWITEM*)pui)->ulView=VIEW_SETTINGS;
         ((VIEWITEM*)pui)->nomWindow=(NOMWindow*)wpNoteBook;
-        g_message("   in %s viewItem: %x wpNoteBook 0x%04X", __FUNCTION__, pui, wpNoteBook);
         pui--;
-
+        //g_message("   in %s wpNoteBook: %lx pui %lx", __FUNCTION__, wpNoteBook, pui);
+        g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),"delete-event", 
+                         G_CALLBACK(defaultWPWindowDeleteHandler), (gpointer) pui);
         WPObject_wpAddToObjUseList(nomSelf, pui, ev);
         WPNoteBook_show(wpNoteBook, ev);
@@ -228 +241 @@
 
 
-  if((nomRetval=WPObject_wpSwitchTo(nomSelf, ulView, ev))!=NULLHANDLE){
-    /* Bring the window to the foreground */
-    //  NOMWindow_show((NOMWindow*)nomRetval , ev);
+  if((nomRetval=WPObject_wpSwitchTo(nomSelf, ulView, ev))!=NULLHANDLE)
     return nomRetval;
-  }
-
-  g_message("   in %s with ulViev 0x%04X", __FUNCTION__, ulView);
+
   return WPObject_wpOpen(nomSelf, nomFolder, ulView, pParam, ev);
 }
@@ -242 +251 @@
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
   PVIEWITEM pViewItem;
-
-  g_message("   in %s with ulViev 0x%04X", __FUNCTION__, ulView);
 
   switch(ulView)
@@ -249 +256 @@
     case OPEN_SETTINGS:
       {
-        g_message("   in %s : OPEN_SETTINGS", __FUNCTION__);
         pViewItem=WPObject_wpFindViewItem(nomSelf, VIEW_SETTINGS, NULLHANDLE, ev);
         if(pViewItem){
-          g_message("   in %s : OPEN_SETTINGS returning %x %x ...", __FUNCTION__, pViewItem, pViewItem->nomWindow);
-          NOMWindow_show(pViewItem->nomWindow, ev);
-        return (gpointer)pViewItem->nomWindow;
+          //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;
@@ -282 +289 @@
     return FALSE;
 
-  g_message("   in %s : %x", __FUNCTION__, pUseItem);
+  //g_message("   in %s : %x", __FUNCTION__, pUseItem);
 
   WPObject_wpRequestObjectMutexSem(nomSelf, 0,ev);
@@ -302 +309 @@
 
   WPObject_wpRequestObjectMutexSem(nomSelf, 0,ev);
-
+  //g_message("   in %s %lx", __FUNCTION__, pUseItem);
   _glstObjectInUse=g_slist_remove( _glstObjectInUse, (gpointer)pUseItem);
 
@@ -322 +329 @@
 
   WPObject_wpRequestObjectMutexSem(nomSelf, 0,ev);
-  g_message("   in %s %d", __FUNCTION__, ulType);
+
   if(NULLHANDLE==pCurrentUseItem)
     tmpList=_glstObjectInUse;
@@ -334 +341 @@
       pUseItem=(PUSEITEM)tmpList->data;
 
-      g_message("     a in %s  type: %d", __FUNCTION__, pUseItem->type);
-
+      //g_message("     a in %s  type: %d", __FUNCTION__, pUseItem->type);
       if(pUseItem && ulType==pUseItem->type)
         break;
-      g_message("     b in %s  type: %d", __FUNCTION__, pUseItem->type);
+
       tmpList=g_slist_next(tmpList);
       pUseItem=NULLHANDLE;
@@ -358 +364 @@
   if(!flViews)
     return NULLHANDLE;
-  g_message("   in %s %d", __FUNCTION__, flViews);
+
   if(NULLHANDLE==pCurrentItem)
     pUseItem=WPObject_wpFindUseItem(nomSelf, USAGE_OPENVIEW,  NULLHANDLE, ev);
@@ -371 +377 @@
       pViewItem=(PVIEWITEM)pUseItem;
       pUseItem--;
-      g_message("        a in %s %d", __FUNCTION__, flViews);
+      //g_message("        a in %s %d", __FUNCTION__, flViews);
       if(pViewItem->ulView & flViews)
         break;
-      g_message("        b in %s %d", __FUNCTION__, flViews);
+
       pUseItem=WPObject_wpFindUseItem(nomSelf, USAGE_OPENVIEW,  pUseItem, ev);
       pViewItem=NULLHANDLE;

trunk/desktop/idl/wpnotebook.idl

@@ -36 +36 @@
 #define WPNOTEBOOK_IDL_INCLUDED
 
+#if 0
+#ifndef WPObject_defined
+#define WPObject_defined
+native PWPObject;
+#endif
+#endif
+
+#include <nomobj.idl>
+
+NOMCLASSNAME(WPNoteBook);
+
+#include "wpobject.idl"
 #include "nomnotebook.idl"
 
-NOMCLASSNAME(WPNoteBook);
 
 interface WPNoteBook : NOMWindow
@@ -46 +57 @@
   PNOMNoteBook wpQueryNoteBookObject();
   void wpSetNoteBookObject(in PNOMNoteBook nomNBook);
+  void wpSetWPObject(in PWPObject wpObject);
+  PWPObject wpQueryWPObject();
 
   NOMOVERRIDE(nomInit);
 
   NOMINSTANCEVAR(PNOMNoteBook nomNoteBook);
+  NOMINSTANCEVAR(PWPObject wpObject);
+
 };
 

trunk/desktop/idl/wpobject.idl

@@ -42 +42 @@
 #include "nommenu.idl"
 #include "nommenuitem.idl"
-#include "wpnotebook.idl"
 #include "nomwindow.idl"
 
@@ -51 +50 @@
 
 NOMCLASSNAME(WPObject);
+
+#include "wpnotebook.idl"
 
 interface WPObject : NOMObject

trunk/desktop/include/desktoptypes.h

@@ -12 +12 @@
   gpointer ptrUserinfo; /* Pointer to more menu item info for the user */
 }wpMenuItemInfo;
+
+#ifndef WPObject
+typedef struct WPObject_struct {
+  struct nomMethodTabStruct  *mtab;
+  gulong body[1];
+} WPObjectObj;
+#define WPObject WPObjectObj
+typedef WPObject *PWPObject;
+#endif
 
 /* Inuse lists */
@@ -68 +77 @@
   
 #endif /* DESKTOPTYPES_H_INCLUDED */
+

trunk/emx-wrapper/voyager-desktop.c

@@ -41 +41 @@
 #include <stdio.h>
 
+void * pMemInExe;
+
 int main( int   argc,
           char *argv[] )
@@ -51 +53 @@
   PFN proc;
 
+
+  fprintf(stderr, "%s: Memaddress for GC: %x\n", __FUNCTION__, (UINT)&pMemInExe);
   /*
     Initialize the garbage collector.
@@ -69 +73 @@
     }
   fprintf(stderr, "   Proc address for nomInitGarbageCollection() is: 0x%x\n", (int)proc);
-  proc();
+  proc(&pMemInExe);
 
   /*

trunk/gui/class_c/nomwindow.c

@@ -73 +73 @@
 {
   /* NOMWindowData* nomThis=NOMWindowGetData(nomSelf); */
-  gtk_widget_hide(NOMWindow_queryWindowHandle(nomSelf, NULLHANDLE));
+  gtk_widget_hide(NOMWindow_queryWindowHandle(nomSelf, ev));
 }
 
+NOM_Scope void NOMLINK impl_NOMWindow_present(NOMWindow* nomSelf, CORBA_Environment *ev)
+{
+/* NOMWindowData* nomThis=NOMWindowGetData(nomSelf); */
+
+  gtk_window_present(GTK_WINDOW(NOMWindow_queryWindowHandle(nomSelf, ev)));
+}
+

trunk/gui/idl/nomwindow.idl

@@ -54 +54 @@
   void show();
   void hide();
+  void present();
+
   NOMINSTANCEVAR(PGtkWidget _pgWindowHandle);
 };