Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Next attempt at dynlib.cpp

Browse Source 
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
This commit is contained in:
Robert Roebling
1998-08-18 15:28:46 +00:00
parent 39570cd479
commit 77ff2d2639
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/listctrl.h
View File

@@ -605,11 +605,11 @@ class wxListCtrl: public wxControl
wxColour GetBackgroundColour() const wxColour GetBackgroundColour() const
{ return m_mainWin->GetBackgroundColour(); } { return m_mainWin->GetBackgroundColour(); }
void SetBackgroundColour( const wxColour &colour ) void SetBackgroundColour( const wxColour &colour )
{ m_mainWin->SetBackgroundColour(colour); } { m_mainWin->SetBackgroundColour( colour ); }
wxColour GetForegroundColour() const wxColour GetForegroundColour() const
{ return m_mainWin->GetForegroundColour(); } { return m_mainWin->GetForegroundColour(); }
void SetForegroundColour( const wxColour &colour ) void SetForegroundColour( const wxColour &colour )
{ m_mainWin->SetForegroundColour(colour); } { m_mainWin->SetForegroundColour( colour ); }
bool PopupMenu( wxMenu *menu, int x, int y ) bool PopupMenu( wxMenu *menu, int x, int y )
{ return m_mainWin->PopupMenu( menu, x, y ); } { return m_mainWin->PopupMenu( menu, x, y ); }

15
src/common/dynlib.cpp
View File

@@ -22,7 +22,7 @@
// System dependent include // System dependent include
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#if defined(__LINUX__) || defined(__SGI__) #ifdef __UNIX__
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
@@ -63,7 +63,7 @@ wxLibrary::~wxLibrary()
else else
delete m_liblist; delete m_liblist;
#if defined(__LINUX__) || defined(__SGI__) #ifdef __UNIX__
dlclose(m_handle); dlclose(m_handle);
#endif #endif
#ifdef __WINDOWS__ #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); return dlsym(m_handle, WXSTRINGCAST symbname);
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@@ -117,7 +117,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
if ( (node = m_loaded.Find(name.GetData())) ) if ( (node = m_loaded.Find(name.GetData())) )
return ((wxLibrary *)node->Data()); return ((wxLibrary *)node->Data());
#if defined(__LINUX__) || defined(__SGI__) #ifdef __UNIX__
lib_name.Prepend("lib"); lib_name.Prepend("lib");
lib_name += ".so"; lib_name += ".so";
@@ -127,21 +127,18 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
if (!handle) if (!handle)
return NULL; return NULL;
#elif defined( __WINDOWS__ ) #endif
#ifdef __WINDOWS__
lib_name += ".dll"; lib_name += ".dll";
HMODULE handle = LoadLibrary(lib_name); HMODULE handle = LoadLibrary(lib_name);
if (!handle) if (!handle)
return NULL; return NULL;
#else
return NULL;
#endif #endif
#if defined(__LINUX__) || defined(__SGI__) || defined (__WINDOWS__)
lib = new wxLibrary((void *)handle); lib = new wxLibrary((void *)handle);
m_loaded.Append(name.GetData(), lib); m_loaded.Append(name.GetData(), lib);
return lib; return lib;
#endif
} }
wxObject *wxLibraries::CreateObject(const wxString& path) wxObject *wxLibraries::CreateObject(const wxString& path)

2
src/gtk/bitmap.cpp
View File

@@ -99,7 +99,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
{ {
#ifdef USE_GDK_IMLIB #ifdef USE_GDK_IMLIB
if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap ); 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 #else
if (m_pixmap) gdk_pixmap_unref( m_pixmap ); if (m_pixmap) gdk_pixmap_unref( m_pixmap );
#endif #endif

2
src/gtk1/bitmap.cpp
View File

@@ -99,7 +99,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
{ {
#ifdef USE_GDK_IMLIB #ifdef USE_GDK_IMLIB
if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap ); 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 #else
if (m_pixmap) gdk_pixmap_unref( m_pixmap ); if (m_pixmap) gdk_pixmap_unref( m_pixmap );
#endif #endif