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

return wxString from wxDynamicLibrary::GetDllExt()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-19 19:29:07 +00:00
parent 593177c566
commit 00711afdd6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dynlib.h
View File

@@ -170,7 +170,7 @@ public:
static wxDllType GetProgramHandle();
// return the platform standard DLL extension (with leading dot)
static const wxChar *GetDllExt() { return ms_dllext; }
static const wxString& GetDllExt() { return ms_dllext; }
wxDynamicLibrary() : m_handle(0) { }
wxDynamicLibrary(const wxString& libname, int flags = wxDL_DEFAULT)
@@ -298,7 +298,7 @@ protected:
// platform specific shared lib suffix.
static const wxChar *ms_dllext;
static const wxString ms_dllext;
// the handle to DLL or NULL
wxDllType m_handle;

4
src/common/dynlib.cpp
View File

@@ -59,9 +59,9 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
// ---------------------------------------------------------------------------
#if defined(__WXPM__) || defined(__EMX__)
const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
const wxString wxDynamicLibrary::ms_dllext(_T(".dll"));
#elif defined(__WXMAC__) && !defined(__DARWIN__)
const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;
const wxString wxDynamicLibrary::ms_dllext; // empty string
#endif
// for MSW/Unix it is defined in platform-specific file

2
src/msw/dlmsw.cpp
View File

@@ -28,7 +28,7 @@
#include "wx/msw/private.h"
#include "wx/msw/debughlp.h"
const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
const wxString wxDynamicLibrary::ms_dllext(_T(".dll"));
// ----------------------------------------------------------------------------
// private classes

6
src/unix/dlunix.cpp
View File

@@ -65,11 +65,11 @@
// standard shared libraries extensions for different Unix versions
#if defined(__HPUX__)
const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
const wxString wxDynamicLibrary::ms_dllext(".sl");
#elif defined(__DARWIN__)
const wxChar *wxDynamicLibrary::ms_dllext = _T(".bundle");
const wxString wxDynamicLibrary::ms_dllext(".bundle");
#else
const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
const wxString wxDynamicLibrary::ms_dllext(".so");
#endif
// ============================================================================