Changeset 206 for trunk/desktop/class_c


Ignore:
Timestamp:
Jan 20, 2007, 11:16:33 PM (19 years ago)
Author:
cinc
Message:

Added code to cope with changed *.ih file format.

Location:
trunk/desktop/class_c
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/desktop/class_c/m_wpdatafile.c

    r200 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_M_WPDataFile_IMPLEMENTATION_FILE
     38#define NOM_M_WPDataFile_IMPLEMENTATION_FILE
     39#endif
     40
    3741#define INCL_DOS
    3842#include <os2.h>
    … …  
    5054
    5155/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
    52 NOM_Scope PNOMString NOMLINK impl_M_WPDataFile_wpclsQueryTitle(M_WPDataFile* nomSelf, CORBA_Environment *ev)
     56NOM_Scope CORBA_string NOMLINK impl_M_WPDataFile_wpclsQueryTitle(M_WPDataFile* nomSelf, CORBA_Environment *ev)
    5357{
    5458  M_WPDataFileData* nomThis=M_WPDataFileGetData(nomSelf);
    … …  
    5660  if(!_nomStringTitle)
    5761    {
    58       _nomStringTitle=NOMStringNew();
    59       NOMString_assignCString(_nomStringTitle, "Data file ", NULLHANDLE);
     62      _nomStringTitle="Data file ";
    6063    }
    6164

  • trunk/desktop/class_c/m_wpfilesystem.c

    r200 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_M_WPFileSystem_IMPLEMENTATION_FILE
     38#define NOM_M_WPFileSystem_IMPLEMENTATION_FILE
     39#endif
     40
    3741#define INCL_DOS
    3842#include <os2.h>
    … …  
    4852#include "m_wpfilesystem.ih"
    4953
     54NOM_Scope CORBA_string NOMLINK impl_M_WPFileSystem_wpclsQueryInstanceFilter(M_WPFileSystem* nomSelf,
     55                                                                            CORBA_Environment *ev)
     56{
     57/* M_WPFileSystemData* nomThis=M_WPFileSystemGetData(nomSelf); */
     58
     59  return NULL;
     60}
    5061
    5162/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
    52 NOM_Scope PNOMString NOMLINK impl_M_WPFileSystem_wpclsQueryTitle(M_WPFileSystem* nomSelf, CORBA_Environment *ev)
     63NOM_Scope CORBA_string NOMLINK impl_M_WPFileSystem_wpclsQueryTitle(M_WPFileSystem* nomSelf, CORBA_Environment *ev)
    5364{
    5465  M_WPFileSystemData* nomThis=M_WPFileSystemGetData(nomSelf);
    … …  
    5667  if(!_nomStringTitle)
    5768    {
    58       _nomStringTitle=NOMStringNew();
    59       NOMString_assignCString(_nomStringTitle, "File system", NULLHANDLE);
     69      _nomStringTitle="FileSystem";
    6070    }
    6171

  • trunk/desktop/class_c/m_wpfolder.c

    r200 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_M_WPFolder_IMPLEMENTATION_FILE
     38#define NOM_M_WPFolder_IMPLEMENTATION_FILE
     39#endif
     40
    3741#define INCL_DOS
    3842#include <os2.h>
    … …  
    7579
    7680/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
    77 NOM_Scope PNOMString NOMLINK impl_M_WPFolder_wpclsQueryTitle(M_WPFolder* nomSelf, CORBA_Environment *ev)
     81NOM_Scope CORBA_string NOMLINK impl_M_WPFolder_wpclsQueryTitle(M_WPFolder* nomSelf, CORBA_Environment *ev)
    7882{
    7983  M_WPFolderData* nomThis=M_WPFolderGetData(nomSelf);
    … …  
    8185  if(!_nomStringTitle)
    8286    {
    83       _nomStringTitle=NOMStringNew();
    84       NOMString_assignCString(_nomStringTitle, "Data file ", NULLHANDLE);
     87      _nomStringTitle="Folder";
    8588    }
    8689

  • trunk/desktop/class_c/m_wpobject.c

    r200 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_M_WPObject_IMPLEMENTATION_FILE
     38#define NOM_M_WPObject_IMPLEMENTATION_FILE
     39#endif
     40
    3741#define INCL_DOS
    3842#include <os2.h>
    … …  
    5761}
    5862
    59 NOM_Scope PNOMString NOMLINK impl_M_WPObject_wpclsQueryTitle(M_WPObject* nomSelf, CORBA_Environment *ev)
     63NOM_Scope CORBA_string NOMLINK impl_M_WPObject_wpclsQueryTitle(M_WPObject* nomSelf, CORBA_Environment *ev)
    6064{
    6165  M_WPObjectData* nomThis=M_WPObjectGetData(nomSelf);
    … …  
    8791      gchar *gchrIconName=NULLHANDLE;
    8892
    89       _nomStringTitle=NOMStringNew();
    90       NOMString_assignCString(_nomStringTitle, "Object", NULLHANDLE);
     93      _nomStringTitle="Object";
    9194     
    9295      /* Load default wpObject icon */

  • trunk/desktop/class_c/wpclassmanager.c

    r166 r206  
    3838 * And remember, phase 3 is near...
    3939 */
     40#ifndef NOM_WPClassMgr_IMPLEMENTATION_FILE
     41#define NOM_WPClassMgr_IMPLEMENTATION_FILE
     42#endif
    4043
    4144#define INCL_DOS

  • trunk/desktop/class_c/wpdatafile.c

    r200 r206  
    3333* ***** END LICENSE BLOCK ***** */
    3434/*
    35  * This file was generated by orbit-idl-2 for Voyager
    36  *
    37  *
    3835 * And remember, phase 3 is near...
    3936 */
    40 
     37#ifndef NOM_WPDataFile_IMPLEMENTATION_FILE
     38#define NOM_WPDataFile_IMPLEMENTATION_FILE
     39#endif
    4140#define INCL_DOS
    4241#include <os2.h>
    … …  
    6463{
    6564/* WPDataFileData* nomThis=WPDataFileGetData(nomSelf); */
    66   CORBA_long nomRetval;
    6765
    68   return nomRetval;
     66  return 0;
    6967}
    7068
    … …  
    7270{
    7371/* WPDataFileData* nomThis=WPDataFileGetData(nomSelf); */
    74   CORBA_long nomRetval;
    7572
    76   return nomRetval;
     73  return 0;
    7774}
    7875
    7976NOM_Scope gpointer NOMLINK impl_WPDataFile_wpQueryIcon(WPDataFile* nomSelf, CORBA_Environment *ev)
    8077{
    81   static const gchar *gchrIconName=NULLHANDLE;
    82   static gpointer ptrIcon=NULLHANDLE;
    83   GError *error=NULL;
    84 
    8578  /* WPDataFileData* nomThis=WPDataFileGetData(nomSelf); */
    8679
    8780  return   WPDataFile_wpQueryIcon_parent(nomSelf, NULLHANDLE);
    8881
    89 #if 0
    90   /* Load default wpObject icon */
    91   if(!gchrIconName){
    92     gchrIconName=g_build_filename(priv_getIconDir(), WPOBJECT_ICON_FILE, NULL);
    93    
    94     g_return_val_if_fail(g_file_test (gchrIconName, G_FILE_TEST_EXISTS), NULLHANDLE);
    95     nomPrintf("IconFile: %s\n", gchrIconName); 
    96     //  _hPointerCls = (HPOINTER)gdk_pixbuf_new_from_file (gchrIconName, &error);
    97     ptrIcon=gdk_pixbuf_new_from_file (gchrIconName, &error);
    98   }
    99 #warning !!!!! Dont create an icon for each object !!!!!
    100   if(ptrIcon)
    101     return ptrIcon;
    102   else
    103     return gdk_pixbuf_new_from_file (gchrIconName, &error);
    104 #endif
    10582#if 0
    10683  /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 84 */

  • trunk/desktop/class_c/wpfilesystem.c

    r194 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_WPFileSystem_IMPLEMENTATION_FILE
     38#define NOM_WPFileSystem_IMPLEMENTATION_FILE
     39#endif
    3740
    3841#define INCL_DOS

  • trunk/desktop/class_c/wpfolder.c

    r200 r206  
    3838 * And remember, phase 3 is near...
    3939 */
     40#ifndef NOM_M_WPFolder_IMPLEMENTATION_FILE
     41#define NOM_M_WPFolder_IMPLEMENTATION_FILE
     42#endif
    4043
    4144#define INCL_DOS

  • trunk/desktop/class_c/wpfolderwindow.c

    r194 r206  
    3636 *
    3737 */
     38#ifndef NOM_WPFolderWindow_IMPLEMENTATION_FILE
     39#define NOM_WPFolderWindow_IMPLEMENTATION_FILE
     40#endif
     41
     42#define INCL_DOS
     43
    3844#define METHOD_DEBUG
    3945

  • trunk/desktop/class_c/wpnotebook.c

    r189 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_WPNoteBook_IMPLEMENTATION_FILE
     38#define NOM_WPNoteBook_IMPLEMENTATION_FILE
     39#endif
     40
     41#define INCL_DOS
    3742#include <os2.h>
    3843

  • trunk/desktop/class_c/wpobject.c

    r200 r206  
    3838 * And remember, phase 3 is near...
    3939 */
     40#ifndef NOM_WPObject_IMPLEMENTATION_FILE
     41#define NOM_WPObject_IMPLEMENTATION_FILE
     42#endif
     43
    4044#define INCL_DOS
    4145#define INCL_DOSERRORS

  • trunk/desktop/class_c/wpwindow.c

    r191 r206  
    3535 * And remember, phase 3 is near...
    3636 */
     37#ifndef NOM_WPWindow_IMPLEMENTATION_FILE
     38#define NOM_WPWindow_IMPLEMENTATION_FILE
     39#endif
     40
     41#define INCL_DOS
    3742#include <os2.h>
    3843
Note: See TracChangeset for help on using the changeset viewer.