Compile in IFF stuff.

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index f165dd169313211e7248472a509ed4cb181a1aa7..6b529bd31e60f4795692a7a868c7cdd449fdd26a 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -201,18 +201,18 @@ private:                                        \
     static const wxString sm_className;         \
 public:                                         \
     name##PluginSentinel();                     \
     static const wxString sm_className;         \
 public:                                         \
     name##PluginSentinel();                     \

-    ~##name##PluginSentinel();                  \
+    ~name##PluginSentinel();                    \

 };                                              \
 name##PluginSentinel  m_pluginsentinel;
 
 #define _IMPLEMENT_DL_SENTINEL(name)                                \
  const wxString name::name##PluginSentinel::sm_className(#name);    \
  name::name##PluginSentinel::name##PluginSentinel() {               \
 };                                              \
 name##PluginSentinel  m_pluginsentinel;
 
 #define _IMPLEMENT_DL_SENTINEL(name)                                \
  const wxString name::name##PluginSentinel::sm_className(#name);    \
  name::name##PluginSentinel::name##PluginSentinel() {               \

-    wxDLManifestEntry *e = (wxDLManifestEntry*) wxDLManifestEntry::ms_classes.Get(#name);   \
+    wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name);   \

     if( e != 0 ) { e->RefObj(); }                                      \
  }                                                                  \
     if( e != 0 ) { e->RefObj(); }                                      \
  }                                                                  \

- name::name##PluginSentinel::~##name##PluginSentinel() {            \
-    wxDLManifestEntry *e = (wxDLManifestEntry*) wxDLManifestEntry::ms_classes.Get(#name);   \
+ name::name##PluginSentinel::~name##PluginSentinel() {            \
+    wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name);   \

     if( e != 0 ) { e->UnrefObj(); }                                 \
  }
 #else
     if( e != 0 ) { e->UnrefObj(); }                                 \
  }
 #else