return wxString from wxDynamicLibrary::GetDllExt()

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 58c81afebd027a2733e7197a1cf0fe14215d1672..4bd00cf0f9bafc1f17d95d3664ef4b082979f2a5 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -170,7 +170,7 @@ public:
     static wxDllType         GetProgramHandle();
 
     // return the platform standard DLL extension (with leading dot)
     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)
 
     wxDynamicLibrary() : m_handle(0) { }
     wxDynamicLibrary(const wxString& libname, int flags = wxDL_DEFAULT)


@@ -298,7 +298,7 @@ protected:
 
 
     // platform specific shared lib suffix.
 
 
     // platform specific shared lib suffix.

-    static const wxChar *ms_dllext;
+    static const wxString ms_dllext;

 
     // the handle to DLL or NULL
     wxDllType m_handle;
 
     // the handle to DLL or NULL
     wxDllType m_handle;

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index ae754bc9c3d2f69eed0aa0a782ec44b7b6f4609d..ff9c14648d5397bd870cb8a6d9355f162eb0ddf5 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -59,9 +59,9 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
 // ---------------------------------------------------------------------------
 
 #if defined(__WXPM__) || defined(__EMX__)
 // ---------------------------------------------------------------------------
 
 #if defined(__WXPM__) || defined(__EMX__)

-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
+    const wxString wxDynamicLibrary::ms_dllext(_T(".dll"));

 #elif defined(__WXMAC__) && !defined(__DARWIN__)
 #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
 #endif
 
 // for MSW/Unix it is defined in platform-specific file

diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index a0e6ab8e55f3e1f06742fefebb8e6b9903780eb7..7faff796a5f4c93818e04e4e3461576b97eb8265 100644 (file)
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -28,7 +28,7 @@
 #include "wx/msw/private.h"
 #include "wx/msw/debughlp.h"
 
 #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
 
 // ----------------------------------------------------------------------------
 // private classes

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index 97d20f98ee54c5415312ec60416253b872539d6a..2c9fec3b3ca8dcd3737021454043de9776e18c67 100644 (file)
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -65,11 +65,11 @@
 
 // standard shared libraries extensions for different Unix versions
 #if defined(__HPUX__)
 
 // 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__)
 #elif defined(__DARWIN__)

-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".bundle");
+    const wxString wxDynamicLibrary::ms_dllext(".bundle");

 #else
 #else

-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
+    const wxString wxDynamicLibrary::ms_dllext(".so");

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================