Changeset 200

Timestamp:

Jan 19, 2007, 11:28:11 PM (19 years ago)

Author:

cinc

Message:

Created metaclasses for current set of desktop classes.

Location:

trunk/desktop

Files:

• Makefile (modified) (1 diff)
• class_c/m_wpdatafile.c (added)
• class_c/m_wpfilesystem.c (added)
• class_c/m_wpfolder.c (added)
• class_c/m_wpobject.c (added)
• class_c/wpdatafile.c (modified) (2 diffs)
• class_c/wpfolder.c (modified) (3 diffs)
• class_c/wpobject.c (modified) (1 diff)
• exports.def (modified) (1 diff)
• idl/m_wpdatafile.idl (added)
• idl/m_wpfilesystem.idl (added)
• idl/m_wpfolder.idl (added)
• idl/m_wpobject.idl (added)
• idl/wpfolder.idl (modified) (1 diff)
• idl/wpobject.idl (modified) (1 diff)
• src/vdesktop.c (modified) (1 diff)

trunk/desktop/Makefile

@@ -43 +43 @@
                         $(OBJDIR)/wpfolderwindow.o \
                         $(OBJDIR)/wpclassmanager.o \
+                        $(OBJDIR)/m_wpobject.o \
+                        $(OBJDIR)/m_wpfilesystem.o \
+                        $(OBJDIR)/m_wpdatafile.o \
+                        $(OBJDIR)/m_wpfolder.o \
                         $(OBJDIR)/helper.o
 

trunk/desktop/class_c/wpdatafile.c

@@ -85 +85 @@
   /* WPDataFileData* nomThis=WPDataFileGetData(nomSelf); */
 
+  return   WPDataFile_wpQueryIcon_parent(nomSelf, NULLHANDLE);
+
+#if 0
   /* Load default wpObject icon */
   if(!gchrIconName){
@@ -99 +102 @@
   else
     return gdk_pixbuf_new_from_file (gchrIconName, &error);
-
+#endif
 #if 0
   /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 84 */

trunk/desktop/class_c/wpfolder.c

@@ -68 +68 @@
 #include "wpfolderwindow.h"
 #include "wpfolder.ih"
+#include "m_wpfolder.h"
 #include "wpdatafile.h"
 #include "desktop.h"
@@ -425 +426 @@
 NOM_Scope gpointer NOMLINK impl_WPFolder_wpQueryIcon(WPFolder* nomSelf, CORBA_Environment *ev)
 {
+
+  return M_WPFolder_wpclsQueryIcon( _nomGetClass((NOMObject*)nomSelf, NULLHANDLE), NULLHANDLE);
+
+#if 0
   static const gchar *gchrIconName=NULLHANDLE;
   static gpointer ptrIcon=NULLHANDLE;
@@ -443 +448 @@
 
   /*  WPFolder_wpQueryIcon_parent(nomSelf,  ev); */
+#endif
 }
 

trunk/desktop/class_c/wpobject.c

@@ -471 +471 @@
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
 
-  return NULLHANDLE;
+  //g_message("%d %s !!! Achtung explicit metaclass nicht in mtab ---> %x %x", __LINE__, __FUNCTION__,
+  //        _nomGetClass((NOMObject*)nomSelf, NULLHANDLE), _WPObject);
+  return M_WPObject_wpclsQueryIcon(_nomGetClass((NOMObject*)nomSelf, NULLHANDLE), NULLHANDLE);
+  // return M_WPObject_wpclsQueryIcon(_WPObject, NULLHANDLE);
 }
 

trunk/desktop/exports.def

@@ -8 +8 @@
         _WPObjectCClassData 
         WPObjectNewClass    
-;       _M_WPObjectClassData
-;       _M_WPObjectCClassData
-;       M_WPObjectNewClass
+        _M_WPObjectClassData
+        _M_WPObjectCClassData
+        M_WPObjectNewClass
 
         _WPFileSystemClassData
         _WPFileSystemCClassData
         WPFileSystemNewClass
-;       _M_WPFileSystemClassData
-;       _M_WPFileSystemCClassData
-;       M_WPFileSystemNewClass
+        _M_WPFileSystemClassData
+        _M_WPFileSystemCClassData
+        M_WPFileSystemNewClass
 
         _WPFolderClassData
         _WPFolderCClassData
         WPFolderNewClass
-;       _M_WPFolderClassData
-;       _M_WPFolderCClassData
-;       M_WPFolderNewClass
+        _M_WPFolderClassData
+        _M_WPFolderCClassData
+        M_WPFolderNewClass
 
         _WPDataFileClassData
         _WPDataFileCClassData
         WPDataFileNewClass
-;       _M_WPDataFileClassData
-;       _M_WPDataFileCClassData
-;       M_WPDataFileNewClass
+        _M_WPDataFileClassData
+        _M_WPDataFileCClassData
+        M_WPDataFileNewClass
 
         _WPNoteBookClassData

trunk/desktop/idl/wpfolder.idl

@@ -43 +43 @@
 #include "nomfilepath.idl"
 
+/*NOMMETACLASS("M_WPFolder");*/
+const string METACLASS_TO_USE_51 = "M_WPFolder";
+
 interface WPFolder : WPFileSystem
 {

trunk/desktop/idl/wpobject.idl

@@ -61 +61 @@
 #include "wpnotebook.idl"
 #endif
+
+NOMMETACLASS("M_WPObject");
 
 interface WPObject : NOMObject

trunk/desktop/src/vdesktop.c

@@ -115 +115 @@
   g_assert(nomRegisterDLLByName(hReg, "VDESKTOP.DLL"));
   g_assert(nomRegisterDLLByName(hReg, "VOYFCLS.DLL"));
-  g_assert(nomRegisterDLLByName(hReg, "VOYWP.DLL"));
+  //g_assert(nomRegisterDLLByName(hReg, "VOYWP.DLL"));
   g_assert(nomRegisterDLLByName(hReg, "VOYGUITK.DLL"));
   //  g_assert(nomRegisterDLLByName(hReg, "PBL-PNG.DLL"));