Changeset 200 for trunk/desktop/class_c

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/class_c

Files:

• m_wpdatafile.c (added)
• m_wpfilesystem.c (added)
• m_wpfolder.c (added)
• m_wpobject.c (added)
• wpdatafile.c (modified) (2 diffs)
• wpfolder.c (modified) (3 diffs)
• wpobject.c (modified) (1 diff)

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);
 }