Replaced osgDB::RegisterDotOsgWrapperProxy usage with REGISTER_DOTOSGWRAPPER proxy to aid static linking

2010-01-19 13:31:06 +00:00
parent 29b73591a6
commit 78280fa1ed
90 changed files with 115 additions and 104 deletions
--- a/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp
@@ -154,7 +154,7 @@ bool  AnimationPathCallback_writeLocalData(const osg::Object &obj, osgDB::Output


 // register the read and write functions with the osgDB::Registry.
-osgDB::RegisterDotOsgWrapperProxy  AnimationPathCallback_Proxy
+REGISTER_DOTOSGWRAPPER(AnimationPathCallback_Proxy)
 (
    new osg::AnimationPathCallback,
    "AnimationPathCallback",
--- a/src/osgWrappers/deprecated-dotosg/osg/TransferFunction.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osg/TransferFunction.cpp
@@ -16,7 +16,7 @@
 bool TransferFunction1D_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool TransferFunction1D_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy TransferFunction1D_Proxy
+REGISTER_DOTOSGWRAPPER(TransferFunction1D_Proxy)
 (
    new osg::TransferFunction1D,
    "TransferFunction1D",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp
@@ -7,7 +7,7 @@
 bool AnisotropicLighting_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool AnisotropicLighting_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy AnisotropicLighting_Proxy
+REGISTER_DOTOSGWRAPPER(AnisotropicLighting_Proxy)
 (
    new osgFX::AnisotropicLighting,
    "osgFX::AnisotropicLighting",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_BumpMapping.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_BumpMapping.cpp
@@ -7,7 +7,7 @@
 bool BumpMapping_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool BumpMapping_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy BumpMapping_Proxy
+REGISTER_DOTOSGWRAPPER(BumpMapping_Proxy)
 (
    new osgFX::BumpMapping,
    "osgFX::BumpMapping",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp
@@ -8,7 +8,7 @@
 bool Cartoon_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Cartoon_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Cartoon_Proxy
+REGISTER_DOTOSGWRAPPER(Cartoon_Proxy)
 (
    new osgFX::Cartoon,
    "osgFX::Cartoon",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp
@@ -7,7 +7,7 @@
 bool Effect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Effect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Effect_Proxy
+REGISTER_DOTOSGWRAPPER(Effect_Proxy)
 (
    0,
    "osgFX::Effect",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp
@@ -7,7 +7,7 @@
 bool MultiTextureControl_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool MultiTextureControl_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy MultiTextureControl_Proxy
+REGISTER_DOTOSGWRAPPER(MultiTextureControl_Proxy)
 (
    new osgFX::MultiTextureControl,
    "osgFX::MultiTextureControl",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp
@@ -31,7 +31,7 @@ bool Outline_readLocalData(osg::Object& obj, osgDB::Input& fr);
 bool Outline_writeLocalData(const osg::Object& obj, osgDB::Output& fw);


-osgDB::RegisterDotOsgWrapperProxy Outline_Proxy
+REGISTER_DOTOSGWRAPPER(Outline_Proxy)
 (
    new osgFX::Outline,
    "osgFX::Outline",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp
@@ -8,7 +8,7 @@
 bool Scribe_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Scribe_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Scribe_Proxy
+REGISTER_DOTOSGWRAPPER(Scribe_Proxy)
 (
    new osgFX::Scribe,
    "osgFX::Scribe",
--- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp
@@ -8,7 +8,7 @@
 bool SpecularHighlights_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool SpecularHighlights_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy SpecularHighlights_Proxy
+REGISTER_DOTOSGWRAPPER(SpecularHighlights_Proxy)
 (
    new osgFX::SpecularHighlights,
    "osgFX::SpecularHighlights",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AccelOperator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AccelOperator.cpp
@@ -12,7 +12,7 @@
 bool  AccelOperator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  AccelOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  AccelOperator_Proxy
+REGISTER_DOTOSGWRAPPER(AccelOperator_Proxy)
 (
    new osgParticle::AccelOperator,
    "AccelOperator",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AngularAccelOperator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AngularAccelOperator.cpp
@@ -12,7 +12,7 @@
 bool  AngularAccelOperator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  AngularAccelOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  AngularAccelOperator_Proxy
+REGISTER_DOTOSGWRAPPER(AngularAccelOperator_Proxy)
 (
    new osgParticle::AngularAccelOperator,
    "AngularAccelOperator",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp
@@ -10,7 +10,7 @@
 bool  BoxPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  BoxPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  BoxPlacer_Proxy
+REGISTER_DOTOSGWRAPPER(BoxPlacer_Proxy)
 (
    new osgParticle::BoxPlacer,
    "BoxPlacer",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_CenteredPlacer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_CenteredPlacer.cpp
@@ -12,7 +12,7 @@
 bool  CenteredPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  CenteredPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  CenteredPlacer_Proxy
+REGISTER_DOTOSGWRAPPER(CenteredPlacer_Proxy)
 (
    0,
    "CenteredPlacer",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConnectedParticleSystem.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConnectedParticleSystem.cpp
@@ -16,7 +16,7 @@ extern void  write_particle(const osgParticle::Particle &P, osgDB::Output &fw);
 bool  ConnectedParticleSystem_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ConnectedParticleSystem_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ConnectedParticleSystem_Proxy
+REGISTER_DOTOSGWRAPPER(ConnectedParticleSystem_Proxy)
 (
    new osgParticle::ConnectedParticleSystem,
    "ConnectedParticleSystem",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConstantRateCounter.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConstantRateCounter.cpp
@@ -9,7 +9,7 @@
 bool  ConstantRateCounter_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ConstantRateCounter_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ConstantRateCounter_Proxy
+REGISTER_DOTOSGWRAPPER(ConstantRateCounter_Proxy)
 (
    new osgParticle::ConstantRateCounter,
    "ConstantRateCounter",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Emitter.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Emitter.cpp
@@ -13,7 +13,7 @@ extern void  write_particle(const osgParticle::Particle &P, osgDB::Output &fw);
 bool  Emitter_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  Emitter_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  Emitter_Proxy
+REGISTER_DOTOSGWRAPPER(Emitter_Proxy)
 (
    0,
    "Emitter",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionDebrisEffect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionDebrisEffect.cpp
@@ -8,7 +8,7 @@
 bool  ExplosionDebrisEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ExplosionDebrisEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ExplosionDebrisEffect_Proxy
+REGISTER_DOTOSGWRAPPER(ExplosionDebrisEffect_Proxy)
 (
    new osgParticle::ExplosionDebrisEffect(false),
    "ExplosionDebrisEffect",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionEffect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionEffect.cpp
@@ -8,7 +8,7 @@
 bool  ExplosionEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ExplosionEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ExplosionEffect_Proxy
+REGISTER_DOTOSGWRAPPER(ExplosionEffect_Proxy)
 (
    new osgParticle::ExplosionEffect(false),
    "ExplosionEffect",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FireEffect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FireEffect.cpp
@@ -8,7 +8,7 @@
 bool  FireEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  FireEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  FireEffect_Proxy
+REGISTER_DOTOSGWRAPPER(FireEffect_Proxy)
 (
    new osgParticle::FireEffect(false),
    "FireEffect",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidFrictionOperator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidFrictionOperator.cpp
@@ -12,7 +12,7 @@
 bool  FluidFrictionOperator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  FluidFrictionOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  FluidFrictionOperator_Proxy
+REGISTER_DOTOSGWRAPPER(FluidFrictionOperator_Proxy)
 (
    new osgParticle::FluidFrictionOperator,
    "FluidFrictionOperator",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidProgram.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidProgram.cpp
@@ -14,7 +14,7 @@
 bool  FluidProgram_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  FluidProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  FluidProgram_Proxy
+REGISTER_DOTOSGWRAPPER(FluidProgram_Proxy)
 (
    new osgParticle::FluidProgram,
    "FluidProgram",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ForceOperator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ForceOperator.cpp
@@ -12,7 +12,7 @@
 bool  ForceOperator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ForceOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ForceOperator_Proxy
+REGISTER_DOTOSGWRAPPER(ForceOperator_Proxy)
 (
    new osgParticle::ForceOperator,
    "ForceOperator",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_LinearInterpolator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_LinearInterpolator.cpp
@@ -8,7 +8,7 @@
 bool  LinearInterpolator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  LinearInterpolator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  LinearInterpolator_Proxy
+REGISTER_DOTOSGWRAPPER(LinearInterpolator_Proxy)
 (
    new osgParticle::LinearInterpolator,
    "LinearInterpolator",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularEmitter.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularEmitter.cpp
@@ -11,7 +11,7 @@
 bool  ModularEmitter_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ModularEmitter_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ModularEmitter_Proxy
+REGISTER_DOTOSGWRAPPER(ModularEmitter_Proxy)
 (
    new osgParticle::ModularEmitter,
    "ModularEmitter",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularProgram.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularProgram.cpp
@@ -11,7 +11,7 @@
 bool  ModularProgram_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ModularProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ModularProgram_Proxy
+REGISTER_DOTOSGWRAPPER(ModularProgram_Proxy)
 (
    new osgParticle::ModularProgram,
    "ModularProgram",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_MultiSegmentPlacer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_MultiSegmentPlacer.cpp
@@ -12,7 +12,7 @@
 bool  MultiSegmentPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  MultiSegmentPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  MultiSegmentPlacer_Proxy
+REGISTER_DOTOSGWRAPPER(MultiSegmentPlacer_Proxy)
 (
    new osgParticle::MultiSegmentPlacer,
    "MultiSegmentPlacer",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp
@@ -10,7 +10,7 @@
 bool  ParticleEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ParticleEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ParticleEffect_Proxy
+REGISTER_DOTOSGWRAPPER(ParticleEffect_Proxy)
 (
    0,
    "ParticleEffect",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleProcessor.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleProcessor.cpp
@@ -16,7 +16,7 @@ extern void  write_particle(const osgParticle::Particle &P, osgDB::Output &fw);
 bool  ParticleProcessor_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ParticleProcessor_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ParticleProcessor_Proxy
+REGISTER_DOTOSGWRAPPER(ParticleProcessor_Proxy)
 (
    0,
    "ParticleProcessor",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystem.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystem.cpp
@@ -16,7 +16,7 @@ extern void  write_particle(const osgParticle::Particle &P, osgDB::Output &fw);
 bool  ParticleSystem_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  ParticleSystem_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  ParticleSystem_Proxy
+REGISTER_DOTOSGWRAPPER(ParticleSystem_Proxy)
 (
    new osgParticle::ParticleSystem,
    "ParticleSystem",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystemUpdater.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystemUpdater.cpp
@@ -9,7 +9,7 @@
 bool  PSU_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  PSU_writeLocalData(const osg::Object &obj, osgDB::Output &fr);

-osgDB::RegisterDotOsgWrapperProxy PSU_Proxy
+REGISTER_DOTOSGWRAPPER(PSU_Proxy)
 (
    new osgParticle::ParticleSystemUpdater,
    "ParticleSystemUpdater",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_PointPlacer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_PointPlacer.cpp
@@ -8,7 +8,7 @@
 bool  PointPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  PointPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  PointPlacer_Proxy
+REGISTER_DOTOSGWRAPPER(PointPlacer_Proxy)
 (
    new osgParticle::PointPlacer,
    "PointPlacer",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Program.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Program.cpp
@@ -8,7 +8,7 @@
 bool  IOProgram_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  IOProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  g_IOProgramProxy
+REGISTER_DOTOSGWRAPPER(g_IOProgramProxy)
 (
    0,
    "osgParticle::Program",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RadialShooter.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RadialShooter.cpp
@@ -9,7 +9,7 @@
 bool  RadialShooter_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  RadialShooter_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  RadialShooter_Proxy
+REGISTER_DOTOSGWRAPPER(RadialShooter_Proxy)
 (
    new osgParticle::RadialShooter,
    "RadialShooter",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RandomRateCounter.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RandomRateCounter.cpp
@@ -10,7 +10,7 @@
 bool  RandomRateCounter_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  RandomRateCounter_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  RandomRateCounter_Proxy
+REGISTER_DOTOSGWRAPPER(RandomRateCounter_Proxy)
 (
    new osgParticle::RandomRateCounter,
    "RandomRateCounter",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp
@@ -10,7 +10,7 @@
 bool  SectorPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  SectorPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  SectorPlacer_Proxy
+REGISTER_DOTOSGWRAPPER(SectorPlacer_Proxy)
 (
    new osgParticle::SectorPlacer,
    "SectorPlacer",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp
@@ -12,7 +12,7 @@
 bool  SegmentPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  SegmentPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  SegmentPlacer_Proxy
+REGISTER_DOTOSGWRAPPER(SegmentPlacer_Proxy)
 (
    new osgParticle::SegmentPlacer,
    "SegmentPlacer",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp
@@ -8,7 +8,7 @@
 bool  SmokeEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  SmokeEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  SmokeEffect_Proxy
+REGISTER_DOTOSGWRAPPER(SmokeEffect_Proxy)
 (
    new osgParticle::SmokeEffect(false),
    "SmokeEffect",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeTrailEffect.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeTrailEffect.cpp
@@ -8,7 +8,7 @@
 bool  SmokeTrailEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  SmokeTrailEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  SmokeTrailEffect_Proxy
+REGISTER_DOTOSGWRAPPER(SmokeTrailEffect_Proxy)
 (
    new osgParticle::SmokeTrailEffect(false),
    "SmokeTrailEffect",
--- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_VariableRateCounter.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_VariableRateCounter.cpp
@@ -10,7 +10,7 @@
 bool  VariableRateCounter_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool  VariableRateCounter_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy  VariableRateCounter_Proxy
+REGISTER_DOTOSGWRAPPER(VariableRateCounter_Proxy)
 (
    0,
    "VariableRateCounter",
--- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowMap.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowMap.cpp
@@ -15,7 +15,7 @@
 bool ShadowMap_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ShadowMap_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ShadowMap_Proxy
+REGISTER_DOTOSGWRAPPER(ShadowMap_Proxy)
 (
    new osgShadow::ShadowMap,
    "ShadowMap",
--- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTechnique.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTechnique.cpp
@@ -15,7 +15,7 @@
 bool ShadowTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ShadowTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ShadowTechnique_Proxy
+REGISTER_DOTOSGWRAPPER(ShadowTechnique_Proxy)
 (
    new osgShadow::ShadowTechnique,
    "ShadowTechnique",
--- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTexture.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTexture.cpp
@@ -15,7 +15,7 @@
 bool ShadowTexture_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ShadowTexture_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ShadowTexture_Proxy
+REGISTER_DOTOSGWRAPPER(ShadowTexture_Proxy)
 (
    new osgShadow::ShadowTexture,
    "ShadowTexture",
--- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowVolume.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowVolume.cpp
@@ -15,7 +15,7 @@
 bool ShadowVolume_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ShadowVolume_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ShadowVolume_Proxy
+REGISTER_DOTOSGWRAPPER(ShadowVolume_Proxy)
 (
    new osgShadow::ShadowVolume,
    "ShadowVolume",
--- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowedScene.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowedScene.cpp
@@ -15,7 +15,7 @@
 bool ShadowedScene_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ShadowedScene_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ShadowedScene_Proxy
+REGISTER_DOTOSGWRAPPER(ShadowedScene_Proxy)
 (
    new osgShadow::ShadowedScene,
    "ShadowedScene",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_BlinkSequence.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_BlinkSequence.cpp
@@ -14,7 +14,7 @@ using namespace osgSim;
 bool BlinkSequence_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool BlinkSequence_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy BlinkSequence_Proxy
+REGISTER_DOTOSGWRAPPER(BlinkSequence_Proxy)
 (
    new BlinkSequence,
    "BlinkSequence",
@@ -87,7 +87,7 @@ bool BlinkSequence_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
 bool BlinkSequence_SequenceGroup_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool BlinkSequence_SequenceGroup_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy BlinkSequence_SequenceGroup_Proxy
+REGISTER_DOTOSGWRAPPER(BlinkSequence_SequenceGroup_Proxy)
 (
    new SequenceGroup,
    "SequenceGroup",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_DOFTransform.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_DOFTransform.cpp
@@ -15,7 +15,7 @@ bool DOFTransform_readLocalData(Object& obj, Input& fr);
 bool DOFTransform_writeLocalData(const Object& obj, Output& fw);

 // register the read and write functions with the osgDB::Registry.
-RegisterDotOsgWrapperProxy g_DOFTransformProxy
+REGISTER_DOTOSGWRAPPER(g_DOFTransformProxy)
 (
    new osgSim::DOFTransform,
    "DOFTransform",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_Impostor.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_Impostor.cpp
@@ -12,7 +12,7 @@ bool Impostor_readLocalData(osg::Object& obj, Input& fr);
 bool Impostor_writeLocalData(const osg::Object& obj, Output& fw);

 // register the read and write functions with the osgDB::Registry.
-RegisterDotOsgWrapperProxy g_ImpostorProxy
+REGISTER_DOTOSGWRAPPER(g_ImpostorProxy)
 (
    new osgSim::Impostor,
    "Impostor",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_LightPointNode.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_LightPointNode.cpp
@@ -17,7 +17,7 @@ using namespace osgSim;
 bool LightPointNode_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool LightPointNode_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy LightPointNode_Proxy
+REGISTER_DOTOSGWRAPPER(LightPointNode_Proxy)
 (
    new LightPointNode,
    "LightPointNode",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_MultiSwitch.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_MultiSwitch.cpp
@@ -13,7 +13,7 @@ bool MultiSwitch_readLocalData(Object& obj, Input& fr);
 bool MultiSwitch_writeLocalData(const Object& obj, Output& fw);

 // register the read and write functions with the osgDB::Registry.
-RegisterDotOsgWrapperProxy g_simSwitchProxy
+REGISTER_DOTOSGWRAPPER(g_simSwitchProxy)
 (
    new osgSim::MultiSwitch,
    "MultiSwitch",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp
@@ -14,7 +14,7 @@
 bool ObjectRecordData_readLocalData( osg::Object &obj, osgDB::Input &fr );
 bool ObjectRecordData_writeLocalData( const osg::Object &obj, osgDB::Output &fw );

-osgDB::RegisterDotOsgWrapperProxy ObjectRecordData_Proxy
+REGISTER_DOTOSGWRAPPER(ObjectRecordData_Proxy)
 (
    new osgSim::ObjectRecordData,
    "ObjectRecordData",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_OverlayNode.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_OverlayNode.cpp
@@ -14,7 +14,7 @@ bool OverlayNode_readLocalData(Object& obj, Input& fr);
 bool OverlayNode_writeLocalData(const Object& obj, Output& fw);

 // register the read and write functions with the osgDB::Registry.
-RegisterDotOsgWrapperProxy g_OverlayNodeProxy
+REGISTER_DOTOSGWRAPPER(g_OverlayNodeProxy)
 (
    new OverlayNode,
    "OverlayNode",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp
@@ -12,7 +12,7 @@
 bool AzimSector_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool AzimSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy AzimSector_Proxy
+REGISTER_DOTOSGWRAPPER(AzimSector_Proxy)
 (
    new osgSim::AzimSector,
    "AzimSector",
@@ -57,7 +57,7 @@ bool AzimSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
 bool ElevationSector_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ElevationSector_Proxy
+REGISTER_DOTOSGWRAPPER(ElevationSector_Proxy)
 (
    new osgSim::ElevationSector,
    "ElevationSector",
@@ -106,7 +106,7 @@ bool ElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
 bool AzimElevationSector_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool AzimElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy AzimElevationSector_Proxy
+REGISTER_DOTOSGWRAPPER(AzimElevationSector_Proxy)
 (
    new osgSim::AzimElevationSector,
    "AzimElevationSector",
@@ -170,7 +170,7 @@ bool AzimElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &f
 bool ConeSector_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ConeSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ConeSector_Proxy
+REGISTER_DOTOSGWRAPPER(ConeSector_Proxy)
 (
    new osgSim::ConeSector,
    "ConeSector",
@@ -227,7 +227,7 @@ bool ConeSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
 bool DirectionalSector_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool DirectionalSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy DirectionalSector_Proxy
+REGISTER_DOTOSGWRAPPER(DirectionalSector_Proxy)
 (
    new osgSim::DirectionalSector,
    "DirectionalSector",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp
@@ -13,7 +13,7 @@ using namespace osgSim;
 bool ShapeAttributeList_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ShapeAttributeList_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ShapeAttributeList_Proxy
+REGISTER_DOTOSGWRAPPER(ShapeAttributeList_Proxy)
 (
    new ShapeAttributeList,
    "ShapeAttributeList",
--- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp
@@ -13,7 +13,7 @@ bool VisibilityGroup_readLocalData(Object& obj, Input& fr);
 bool VisibilityGroup_writeLocalData(const Object& obj, Output& fw);

 // register the read and write functions with the osgDB::Registry.
-RegisterDotOsgWrapperProxy g_VisibilityGroupProxy
+REGISTER_DOTOSGWRAPPER(g_VisibilityGroupProxy)
 (
    new VisibilityGroup,
    "VisibilityGroup",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp
@@ -29,7 +29,7 @@
 bool CompositeLayer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool CompositeLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy CompositeLayer_Proxy
+REGISTER_DOTOSGWRAPPER(CompositeLayer_Proxy)
 (
    new osgTerrain::CompositeLayer,
    "CompositeLayer",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp
@@ -16,7 +16,7 @@
 bool GeometryTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool GeometryTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy GeometryTechnique_Proxy
+REGISTER_DOTOSGWRAPPER(GeometryTechnique_Proxy)
 (
    new osgTerrain::GeometryTechnique,
    "GeometryTechnique",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp
@@ -16,7 +16,7 @@
 bool HeightFieldLayer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool HeightFieldLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy HeightFieldLayer_Proxy
+REGISTER_DOTOSGWRAPPER(HeightFieldLayer_Proxy)
 (
    new osgTerrain::HeightFieldLayer,
    "HeightFieldLayer",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/ImageLayer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/ImageLayer.cpp
@@ -19,7 +19,7 @@
 bool ImageLayer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ImageLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ImageLayer_Proxy
+REGISTER_DOTOSGWRAPPER(ImageLayer_Proxy)
 (
    new osgTerrain::ImageLayer,
    "ImageLayer",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp
@@ -20,7 +20,7 @@ bool Layer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
 bool Layer_matchFilterStr(const char* str, osg::Texture::FilterMode& filter);
 const char* Layer_getFilterStr(osg::Texture::FilterMode filter);

-osgDB::RegisterDotOsgWrapperProxy Layer_Proxy
+REGISTER_DOTOSGWRAPPER(Layer_Proxy)
 (
    new osgTerrain::Layer,
    "Layer",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/Locator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/Locator.cpp
@@ -16,7 +16,7 @@
 bool Locator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Locator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Locator_Proxy
+REGISTER_DOTOSGWRAPPER(Locator_Proxy)
 (
    new osgTerrain::Locator,
    "Locator",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/SwitchLayer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/SwitchLayer.cpp
@@ -29,7 +29,7 @@
 bool SwitchLayer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool SwitchLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy SwitchLayer_Proxy
+REGISTER_DOTOSGWRAPPER(SwitchLayer_Proxy)
 (
    new osgTerrain::SwitchLayer,
    "SwitchLayer",
--- a/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp
@@ -16,7 +16,7 @@
 bool TerrainTile_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool TerrainTile_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy TerrainTile_Proxy
+REGISTER_DOTOSGWRAPPER(TerrainTile_Proxy)
 (
    new osgTerrain::TerrainTile,
    "TerrainTile",
--- a/src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp
@@ -16,7 +16,7 @@
 bool Text_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Text_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Text_Proxy
+REGISTER_DOTOSGWRAPPER(Text_Proxy)
 (
    new osgText::Text,
    "Text",
--- a/src/osgWrappers/deprecated-dotosg/osgText/IO_Text3D.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_Text3D.cpp
@@ -16,7 +16,7 @@
 bool Text3D_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Text3D_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Text3D_Proxy
+REGISTER_DOTOSGWRAPPER(Text3D_Proxy)
 (
    new osgText::Text3D,
    "Text3D",
--- a/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp
@@ -16,7 +16,7 @@
 bool TextBase_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool TextBase_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy TextBase_Proxy
+REGISTER_DOTOSGWRAPPER(TextBase_Proxy)
 (
    /*new osgText::Text*/NULL,
    "TextBase",
--- a/src/osgWrappers/deprecated-dotosg/osgViewer/CompositeViewer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgViewer/CompositeViewer.cpp
@@ -11,7 +11,7 @@
 bool CompositeViewer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool CompositeViewer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy CompositeViewer_Proxy
+REGISTER_DOTOSGWRAPPER(CompositeViewer_Proxy)
 (
    new osgViewer::CompositeViewer,
    "CompositeViewer",
--- a/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp
@@ -12,7 +12,7 @@
 bool View_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool View_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy View_Proxy
+REGISTER_DOTOSGWRAPPER(View_Proxy)
 (
    new osgViewer::View,
    "View",
--- a/src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp
@@ -11,7 +11,7 @@
 bool Viewer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Viewer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Viewer_Proxy
+REGISTER_DOTOSGWRAPPER(Viewer_Proxy)
 (
    new osgViewer::Viewer,
    "Viewer",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/CompositeProperty.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/CompositeProperty.cpp
@@ -16,7 +16,7 @@
 bool CompositeProperty_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool CompositeProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy CompositeProperty_Proxy
+REGISTER_DOTOSGWRAPPER(CompositeProperty_Proxy)
 (
    new osgVolume::CompositeProperty,
    "CompositeProperty",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp
@@ -16,7 +16,7 @@
 bool FixedFunctionTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool FixedFunctionTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy FixedFunctionTechnique_Proxy
+REGISTER_DOTOSGWRAPPER(FixedFunctionTechnique_Proxy)
 (
    new osgVolume::FixedFunctionTechnique,
    "FixedFunctionTechnique",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/ImageLayer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/ImageLayer.cpp
@@ -20,7 +20,7 @@
 bool ImageLayer_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ImageLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ImageLayer_Proxy
+REGISTER_DOTOSGWRAPPER(ImageLayer_Proxy)
 (
    new osgVolume::ImageLayer,
    "ImageLayer",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp
@@ -20,7 +20,7 @@ bool Layer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
 bool Layer_matchFilterStr(const char* str, osg::Texture::FilterMode& filter);
 const char* Layer_getFilterStr(osg::Texture::FilterMode filter);

-osgDB::RegisterDotOsgWrapperProxy Layer_Proxy
+REGISTER_DOTOSGWRAPPER(Layer_Proxy)
 (
    new osgVolume::Layer,
    "Layer",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/Locator.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Locator.cpp
@@ -16,7 +16,7 @@
 bool Locator_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Locator_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Locator_Proxy
+REGISTER_DOTOSGWRAPPER(Locator_Proxy)
 (
    new osgVolume::Locator,
    "Locator",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp
@@ -16,7 +16,7 @@
 bool Property_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Property_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Property_Proxy
+REGISTER_DOTOSGWRAPPER(Property_Proxy)
 (
    new osgVolume::Property,
    "Property",
@@ -25,7 +25,7 @@ osgDB::RegisterDotOsgWrapperProxy Property_Proxy
    Property_writeLocalData
 );

-osgDB::RegisterDotOsgWrapperProxy MaximumImageProjectionProperty_Proxy
+REGISTER_DOTOSGWRAPPER(MaximumImageProjectionProperty_Proxy)
 (
    new osgVolume::MaximumIntensityProjectionProperty,
    "MaximumIntensityProjectionProperty",
@@ -34,7 +34,7 @@ osgDB::RegisterDotOsgWrapperProxy MaximumImageProjectionProperty_Proxy
    Property_writeLocalData
 );

-osgDB::RegisterDotOsgWrapperProxy LightingProperty_Proxy
+REGISTER_DOTOSGWRAPPER(LightingProperty_Proxy)
 (
    new osgVolume::LightingProperty,
    "LightingProperty",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp
@@ -16,7 +16,7 @@
 bool PropertyAdjustmentCallback_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool PropertyAdjustmentCallback_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy PropertyAdjustmentCallback_Proxy
+REGISTER_DOTOSGWRAPPER(PropertyAdjustmentCallback_Proxy)
 (
    new osgVolume::PropertyAdjustmentCallback,
    "PropertyAdjustmentCallback",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp
@@ -16,7 +16,7 @@
 bool RayTracedTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool RayTracedTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy RayTracedTechnique_Proxy
+REGISTER_DOTOSGWRAPPER(RayTracedTechnique_Proxy)
 (
    new osgVolume::RayTracedTechnique,
    "RayTracedTechnique",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/ScalarProperty.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/ScalarProperty.cpp
@@ -16,7 +16,7 @@
 bool ScalarProperty_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool ScalarProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy ScalarProperty_Proxy
+REGISTER_DOTOSGWRAPPER(ScalarProperty_Proxy)
 (
    0,
    "ScalarProperty",
@@ -25,7 +25,7 @@ osgDB::RegisterDotOsgWrapperProxy ScalarProperty_Proxy
    ScalarProperty_writeLocalData
 );

-osgDB::RegisterDotOsgWrapperProxy IsoSurfaceProperty_Proxy
+REGISTER_DOTOSGWRAPPER(IsoSurfaceProperty_Proxy)
 (
    new osgVolume::IsoSurfaceProperty,
    "IsoSurfaceProperty",
@@ -34,7 +34,7 @@ osgDB::RegisterDotOsgWrapperProxy IsoSurfaceProperty_Proxy
    ScalarProperty_writeLocalData
 );

-osgDB::RegisterDotOsgWrapperProxy AlphaFuncProperty_Proxy
+REGISTER_DOTOSGWRAPPER(AlphaFuncProperty_Proxy)
 (
    new osgVolume::AlphaFuncProperty,
    "AlphaFuncProperty",
@@ -43,7 +43,7 @@ osgDB::RegisterDotOsgWrapperProxy AlphaFuncProperty_Proxy
    ScalarProperty_writeLocalData
 );

-osgDB::RegisterDotOsgWrapperProxy SampleDensityProperty_Proxy
+REGISTER_DOTOSGWRAPPER(SampleDensityProperty_Proxy)
 (
    new osgVolume::SampleDensityProperty,
    "SampleDensityProperty",
@@ -52,7 +52,7 @@ osgDB::RegisterDotOsgWrapperProxy SampleDensityProperty_Proxy
    ScalarProperty_writeLocalData
 );

-osgDB::RegisterDotOsgWrapperProxy TransparencyProperty_Proxy
+REGISTER_DOTOSGWRAPPER(TransparencyProperty_Proxy)
 (
    new osgVolume::TransparencyProperty,
    "TransparencyProperty",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/SwitchProperty.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/SwitchProperty.cpp
@@ -16,7 +16,7 @@
 bool SwitchProperty_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool SwitchProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy SwitchProperty_Proxy
+REGISTER_DOTOSGWRAPPER(SwitchProperty_Proxy)
 (
    new osgVolume::SwitchProperty,
    "SwitchProperty",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/TransferFunctionProperty.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/TransferFunctionProperty.cpp
@@ -16,7 +16,7 @@
 bool TransferFunctionProperty_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool TransferFunctionProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy TransferFunctionProperty_Proxy
+REGISTER_DOTOSGWRAPPER(TransferFunctionProperty_Proxy)
 (
    new osgVolume::TransferFunctionProperty,
    "TransferFunctionProperty",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp
@@ -16,7 +16,7 @@
 bool Volume_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool Volume_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy Volume_Proxy
+REGISTER_DOTOSGWRAPPER(Volume_Proxy)
 (
    new osgVolume::Volume,
    "Volume",
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/VolumeTile.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/VolumeTile.cpp
@@ -16,7 +16,7 @@
 bool VolumeTile_readLocalData(osg::Object &obj, osgDB::Input &fr);
 bool VolumeTile_writeLocalData(const osg::Object &obj, osgDB::Output &fw);

-osgDB::RegisterDotOsgWrapperProxy VolumeTile_Proxy
+REGISTER_DOTOSGWRAPPER(VolumeTile_Proxy)
 (
    new osgVolume::VolumeTile,
    "VolumeTile",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp
@@ -97,7 +97,8 @@ bool Model_writeData(const osg::Object& obj, osgDB::Output& fw) {
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_ModelProxy(
+REGISTER_DOTOSGWRAPPER(g_ModelProxy)
+(
 	new osgCal::Model,
 	"Model",
 	"Object Node Model",
@@ -106,7 +107,8 @@ osgDB::RegisterDotOsgWrapperProxy g_ModelProxy(
 );
 */

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_BoxProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_BoxProxy)
+(
 	new osgWidget::Box("unset"),
 	"osgWidget::Box",
 	"Object Node Group Transform MatrixTransform osgWidget::Box",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp
@@ -23,7 +23,8 @@ bool osgWidget_EmbeddedWindow_writeData(const osg::Object& /*obj*/, osgDB::Outpu
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_EmbeddedWindowProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_EmbeddedWindowProxy)
+(
 	new osgWidget::Window::EmbeddedWindow("unset"),
 	"osgWidget::Window::EmbeddedWindow",
 	"Object Drawable Geometry osgWidget::Widget osgWidget::Window::EmbeddedWindow",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp
@@ -23,7 +23,8 @@ bool osgWidget_Frame_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_FrameProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_FrameProxy)
+(
 	new osgWidget::Frame("unset"),
 	"osgWidget::Frame",
 	"Object Node Group Transform MatrixTransform osgWidget::Table osgWidget::Frame",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp
@@ -23,7 +23,8 @@ bool osgWidget_Input_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_InputProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_InputProxy)
+(
 	new osgWidget::Input("unset"),
 	"osgWidget::Input",
 	"Object Drawable Geometry osgWidget::Widget osgWidget::Input",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp
@@ -23,7 +23,8 @@ bool osgWidget_Label_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_LabelProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_LabelProxy)
+(
 	new osgWidget::Label("unset"),
 	"osgWidget::Label",
 	"Object Drawable Geometry osgWidget::Widget osgWidget::Label",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp
@@ -22,7 +22,8 @@ bool osgWidget_Table_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_TableProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_TableProxy)
+(
 	new osgWidget::Table("unset"),
 	"osgWidget::Table",
 	"Object Node Group Transform MatrixTransform osgWidget::Table",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp
@@ -56,7 +56,8 @@ bool osgWidget_NullWidget_writeData(const osg::Object& /*obj*/, osgDB::Output& f
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_WidgetProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_WidgetProxy)
+(
 	new osgWidget::Widget("unset"),
 	"osgWidget::Widget",
 	"Object Drawable Geometry osgWidget::Widget",
@@ -64,7 +65,8 @@ osgDB::RegisterDotOsgWrapperProxy g_osgWidget_WidgetProxy(
 	&osgWidget_Widget_writeData
 );

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_NotifyWidgetProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_NotifyWidgetProxy)
+(
 	new osgWidget::NotifyWidget("unset"),
 	"osgWidget::NotifyWidget",
 	"Object Drawable Geometry osgWidget::Widget osgWidget::NotifyWidget",
@@ -72,7 +74,8 @@ osgDB::RegisterDotOsgWrapperProxy g_osgWidget_NotifyWidgetProxy(
 	&osgWidget_NotifyWidget_writeData
 );

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_NullWidgetProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_NullWidgetProxy)
+(
 	new osgWidget::Widget("unset"),
 	"osgWidget::NullWidget",
 	"Object Drawable Geometry osgWidget::Widget osgWidget::NullWidget",
--- a/src/osgWrappers/deprecated-dotosg/osgWidget/WindowManager.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgWidget/WindowManager.cpp
@@ -23,7 +23,8 @@ bool osgWidget_WindowManager_writeData(const osg::Object& /*obj*/, osgDB::Output
 	return true;
 }

-osgDB::RegisterDotOsgWrapperProxy g_osgWidget_WindowManagerProxy(
+REGISTER_DOTOSGWRAPPER(g_osgWidget_WindowManagerProxy)
+(
 	new osgWidget::WindowManager(),
 	"osgWidget::WindowManager",
 	"Object Node Group Switch osgWidget::WindowManager",