Changeset 209


Ignore:
Timestamp:
Jan 21, 2007, 4:57:47 PM (19 years ago)
Author:
cinc
Message:

Integration of nomUnInit() with the garbage collector using finalizers.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/desktop/class_c/m_wpfolder.c

    r206 r209  
    5858{
    5959/* M_WPFolderData* nomThis=M_WPFolderGetData(nomSelf); */
    60   g_message("-----------> %s" , __FUNCTION__);
     60
    6161  /* Load default  icon */
    6262  if(!pIconCls){

  • trunk/desktop/class_c/m_wpobject.c

    r206 r209  
    122122
    123123/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
    124 NOM_Scope void NOMLINK impl_M_WPObject_nomUninit(M_WPObject* nomSelf, CORBA_Environment *ev)
     124NOM_Scope void NOMLINK impl_M_WPObject_nomUnInit(M_WPObject* nomSelf, CORBA_Environment *ev)
    125125{
    126126/* M_WPObjectData* nomThis=M_WPObjectGetData(nomSelf); */
    … …  
    128128  M_WPObject_wpclsUnInitData(nomSelf, NULLHANDLE);
    129129
    130   M_WPObject_nomUninit_parent((NOMObject*)nomSelf,  ev);
     130  M_WPObject_nomUnInit_parent((NOMObject*)nomSelf,  ev);
    131131}
    132132

  • trunk/desktop/class_c/wpobject.c

    r206 r209  
    135135}
    136136
    137 NOM_Scope void NOMLINK impl_WPObject_nomUninit(WPObject* nomSelf, CORBA_Environment *ev)
     137NOM_Scope void NOMLINK impl_WPObject_nomUnInit(WPObject* nomSelf, CORBA_Environment *ev)
    138138{
    139139  WPObjectData* nomThis=WPObjectGetData(nomSelf);
    … …  
    143143  //g_mutex_free(_gObjectMutex);
    144144  DosCloseMutexSem(_gObjectMutex);
    145   WPObject_nomUninit_parent((NOMObject*)nomSelf, ev);
     145  WPObject_nomUnInit_parent((NOMObject*)nomSelf, ev);
    146146}
    147147

  • trunk/desktop/idl/m_wpobject.idl

    r206 r209  
    5555  /* Methods overriden by this class */
    5656  NOMOVERRIDE(nomInit);
    57   NOMOVERRIDE(nomUninit);
     57  NOMOVERRIDE(nomUnInit);
    5858
    5959  /* Instance variables of this class. Theses are not

  • trunk/desktop/idl/wpobject.idl

    r203 r209  
    124124  /* Methods overriden by this class */
    125125  NOMOVERRIDE(nomInit);
    126   NOMOVERRIDE(nomUninit);
     126  NOMOVERRIDE(nomUnInit);
    127127
    128128  /* Instancce variables of this class. Theses are not

  • trunk/foundation/class_c/nomfilepath.c

    r207 r209  
    4242#include <os2.h>
    4343
     44#include <nom.h>
     45#include <nomtk.h>
     46
    4447#include <string.h>
    4548#include <glib.h>

  • trunk/foundation/class_c/nomstring.c

    r207 r209  
    4141#define INCL_DOS
    4242#include <os2.h>
     43
     44#include <nom.h>
     45#include <nomtk.h>
    4346
    4447#include <string.h>
    … …  
    178181}
    179182
    180 
    181 
    182 NOM_Scope void NOMLINK impl_NOMString_nomUninit(NOMString* nomSelf, CORBA_Environment *ev)
     183#if 0
     184NOM_Scope void NOMLINK impl_NOMString_nomUnInit(NOMString* nomSelf, CORBA_Environment *ev)
    183185{
    184186  NOMStringData* nomThis=NOMStringGetData(nomSelf);
    … …  
    187189  g_string_free(_gString, TRUE);
    188190
    189   NOMString_nomUninit_parent((NOMObject*)nomSelf,  ev);
    190 
     191  NOMString_nomUnInit_parent((NOMObject*)nomSelf,  ev);
    191192}
    192 
     193#endif

  • trunk/foundation/idl/nomstring.idl

    r180 r209  
    6161  /* Init and uninit the GString */
    6262  NOMOVERRIDE(nomInit);
    63   NOMOVERRIDE(nomUninit);
     63
    6464  /* The GString holding the data */
    6565  NOMINSTANCEVAR(PGString gString);

  • trunk/gui/class_c/nommenu.c

    r207 r209  
    7777
    7878/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
    79 NOM_Scope void NOMLINK impl_NOMMenu_nomUninit(NOMMenu* nomSelf, CORBA_Environment *ev)
     79NOM_Scope void NOMLINK impl_NOMMenu_nomUnInit(NOMMenu* nomSelf, CORBA_Environment *ev)
    8080{
    8181/* NOMMenuData* nomThis=NOMMenuGetData(nomSelf); */
     82  g_message("%s: empty method. Remove it!", __FUNCTION__);
    8283
    83 #if 0
    84   /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 119 */
    85   NOMMenu_nomUninit_parent(nomSelf,  ev);
    86 #endif
     84  NOMMenu_nomUnInit_parent(nomSelf,  ev);
    8785}
    8886

  • trunk/gui/idl/nommenu.idl

    r163 r209  
    5454
    5555  NOMOVERRIDE(nomInit);
    56   NOMOVERRIDE(nomUninit);
     56  NOMOVERRIDE(nomUnInit);
    5757
    5858  NOMINSTANCEVAR(PGtkWidget _pgMenuHandle);
Note: See TracChangeset for help on using the changeset viewer.