Next attempt at dynlib.cpp

  Disabled ImLib's cashing
  Confirmed Vadim's changes to wxListCtrl :-)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index da9d2dcdcdfe2668ca5a58711bb3747544655c50..a2c0493699a127c0f5600607cebc5e41a9f98835 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -605,11 +605,11 @@ class wxListCtrl: public wxControl
     wxColour GetBackgroundColour() const
       { return m_mainWin->GetBackgroundColour(); }
     void SetBackgroundColour( const wxColour &colour )
-      { m_mainWin->SetBackgroundColour(colour); }
+      { m_mainWin->SetBackgroundColour( colour ); }
     wxColour GetForegroundColour() const
       { return m_mainWin->GetForegroundColour(); }
     void SetForegroundColour( const wxColour &colour )
-      { m_mainWin->SetForegroundColour(colour); }
+      { m_mainWin->SetForegroundColour( colour ); }
     bool PopupMenu( wxMenu *menu, int x, int y )
       { return m_mainWin->PopupMenu( menu, x, y ); }
 

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 177e21a773d0efa0b6b8c3cb72edcae0ffbbae38..7e2f336baf90cc912c04552dcd6ea74eb978b132 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -22,7 +22,7 @@
 // System dependent include
 // ---------------------------------------------------------------------------
 
-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__ 
 #include <dlfcn.h>
 #endif
 
@@ -63,7 +63,7 @@ wxLibrary::~wxLibrary()
     else
       delete m_liblist;
 
-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__
     dlclose(m_handle);
 #endif
 #ifdef __WINDOWS__
@@ -79,7 +79,7 @@ wxObject *wxLibrary::CreateObject(const wxString& name)
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {
-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__
   return dlsym(m_handle, WXSTRINGCAST symbname);
 #endif
 #ifdef __WINDOWS__
@@ -117,7 +117,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
   if ( (node = m_loaded.Find(name.GetData())) )
     return ((wxLibrary *)node->Data());
 
-#if defined(__LINUX__) || defined(__SGI__)
+#ifdef __UNIX__
   lib_name.Prepend("lib");
   lib_name += ".so";
 
@@ -127,21 +127,18 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 
   if (!handle)
     return NULL;
-#elif defined( __WINDOWS__ )
+#endif
+#ifdef __WINDOWS__
   lib_name += ".dll";
 
   HMODULE handle = LoadLibrary(lib_name);
   if (!handle)
     return NULL;
-#else
-    return NULL;
 #endif
-#if defined(__LINUX__) || defined(__SGI__) || defined (__WINDOWS__)
   lib = new wxLibrary((void *)handle);
 
   m_loaded.Append(name.GetData(), lib);
   return lib;
-#endif
 }
 
 wxObject *wxLibraries::CreateObject(const wxString& path)

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index e715481f32caea0498675d207c44e93609b363dd..6f3e9146fb891ab4e64d61033712c774a8763809 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -99,7 +99,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
 {
 #ifdef USE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
-  if (m_image) gdk_imlib_destroy_image( m_image );
+  if (m_image) gdk_imlib_kill_image( m_image );
 #else
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );
 #endif

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index e715481f32caea0498675d207c44e93609b363dd..6f3e9146fb891ab4e64d61033712c774a8763809 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -99,7 +99,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
 {
 #ifdef USE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
-  if (m_image) gdk_imlib_destroy_image( m_image );
+  if (m_image) gdk_imlib_kill_image( m_image );
 #else
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );
 #endif