reSWIGged

[wxWidgets.git] / src / common / dynload.cpp

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index a1e4bafe6383511af054beb6ad9b7b43d0861bf8..9494d42fb97f701cfe8388f8edb0a213cecab97a 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -10,7 +10,7 @@
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dynload.h"
 #endif
 
 #pragma implementation "dynload.h"
 #endif
 


@@ -58,7 +58,7 @@ public:
     // TODO: create ms_classes on demand, why always preallocate it?
     virtual bool OnInit()
     {
     // TODO: create ms_classes on demand, why always preallocate it?
     virtual bool OnInit()
     {

-        wxPluginLibrary::ms_classes = new wxDLImports(wxKEY_STRING);
+        wxPluginLibrary::ms_classes = new wxDLImports;

         wxPluginManager::CreateManifest();
         return TRUE;
     }
         wxPluginManager::CreateManifest();
         return TRUE;
     }


@@ -159,16 +159,6 @@ void wxPluginLibrary::UpdateClassInfo()
             (*ms_classes)[info->m_className] = this;
         }
     }
             (*ms_classes)[info->m_className] = this;
         }
     }

-
-#if wxUSE_EXTENDED_RTTI == 0
-    for(info = m_after; info != m_before; info = info->m_next)
-    {
-        if( info->m_baseClassName1 )
-            info->m_baseInfo1 = (wxClassInfo *)t->Get(info->m_baseClassName1);
-        if( info->m_baseClassName2 )
-            info->m_baseInfo2 = (wxClassInfo *)t->Get(info->m_baseClassName2);
-    }
-#endif

 }
 
 void wxPluginLibrary::RestoreClassInfo()
 }
 
 void wxPluginLibrary::RestoreClassInfo()


@@ -531,6 +521,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
         info = info->m_next;
     }
 
         info = info->m_next;
     }
 

+#if !wxUSE_EXTENDED_RTTI

     // Set base pointers for each wxClassInfo
     info = first;
     while (info)
     // Set base pointers for each wxClassInfo
     info = first;
     while (info)


@@ -541,6 +532,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
             info->m_baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
         info = info->m_next;
     }
             info->m_baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
         info = info->m_next;
     }

+#endif

 }
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 }
 
 void *wxLibrary::GetSymbol(const wxString& symbname)