* Fixed two memory leaks.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 6a49d9bc3a3d2f6abd70c082d397c5e16dcd2efa..db17f823d469a2e09f154ea9960dea2f3c6957b7 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -22,7 +22,7 @@
 // System dependent include
 // ---------------------------------------------------------------------------
 
 // System dependent include
 // ---------------------------------------------------------------------------
 

-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__ 

 #include <dlfcn.h>
 #endif
 
 #include <dlfcn.h>
 #endif
 


@@ -63,7 +63,7 @@ wxLibrary::~wxLibrary()
     else
       delete m_liblist;
 
     else
       delete m_liblist;
 

-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__

     dlclose(m_handle);
 #endif
 #ifdef __WINDOWS__
     dlclose(m_handle);
 #endif
 #ifdef __WINDOWS__


@@ -79,7 +79,7 @@ wxObject *wxLibrary::CreateObject(const wxString& name)
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {

-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__

   return dlsym(m_handle, WXSTRINGCAST symbname);
 #endif
 #ifdef __WINDOWS__
   return dlsym(m_handle, WXSTRINGCAST symbname);
 #endif
 #ifdef __WINDOWS__


@@ -117,8 +117,8 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
   if ( (node = m_loaded.Find(name.GetData())) )
     return ((wxLibrary *)node->Data());
 
   if ( (node = m_loaded.Find(name.GetData())) )
     return ((wxLibrary *)node->Data());
 

-#if defined(__LINUX__) || defined(__SGI__)
-  lib_name.Prepend("lib");
+#ifdef __UNIX__
+  lib_name.Prepend("./lib");

   lib_name += ".so";
 
   printf("lib_name = %s\n", WXSTRINGCAST lib_name);
   lib_name += ".so";
 
   printf("lib_name = %s\n", WXSTRINGCAST lib_name);


@@ -166,7 +166,7 @@ wxClassLibrary::wxClassLibrary(void)
 
 wxClassLibrary::~wxClassLibrary(void)
 {
 
 wxClassLibrary::~wxClassLibrary(void)
 {

-  uint i;
+  size_t i;

 
   for (i=0;i<m_list.Count();i++)
     delete (m_list[i]);
 
   for (i=0;i<m_list.Count();i++)
     delete (m_list[i]);


@@ -184,7 +184,7 @@ void wxClassLibrary::RegisterClass(wxClassInfo *class_info,
 
 void wxClassLibrary::UnregisterClass(wxClassInfo *class_info)
 {
 
 void wxClassLibrary::UnregisterClass(wxClassInfo *class_info)
 {

-  uint i = 0;
+  size_t i = 0;

 
   while (i < m_list.Count()) {
     if (m_list[i]->class_info == class_info) {
 
   while (i < m_list.Count()) {
     if (m_list[i]->class_info == class_info) {


@@ -200,7 +200,7 @@ bool wxClassLibrary::CreateObjects(const wxString& path,
                                    wxArrayClassInfo& objs)
 {
   wxClassLibInfo *info;
                                    wxArrayClassInfo& objs)
 {
   wxClassLibInfo *info;

-  uint i = 0;
+  size_t i = 0;

 
   while (i < m_list.Count()) {
     info = m_list[i];
 
   while (i < m_list.Count()) {
     info = m_list[i];


@@ -215,7 +215,7 @@ bool wxClassLibrary::FetchInfos(const wxString& path,
                                 wxArrayClassLibInfo& infos)
 {
   wxClassLibInfo *info;
                                 wxArrayClassLibInfo& infos)
 {
   wxClassLibInfo *info;

-  uint i = 0;
+  size_t i = 0;

 
   while (i < m_list.Count()) {
     info = m_list[i];
 
   while (i < m_list.Count()) {
     info = m_list[i];


@@ -232,7 +232,7 @@ bool wxClassLibrary::FetchInfos(const wxString& path,
 wxObject *wxClassLibrary::CreateObject(const wxString& path)
 {
   wxClassLibInfo *info;
 wxObject *wxClassLibrary::CreateObject(const wxString& path)
 {
   wxClassLibInfo *info;

-  uint i = 0;
+  size_t i = 0;

 
   while (i < m_list.Count()) {
     info = m_list[i];
 
   while (i < m_list.Count()) {
     info = m_list[i];