preparation for runtime loading of plugins

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 3fdfa076be48cb967f94341dfd6507cfa2ea0170..0f69c8e70970b5b3816f89c4cf495f64a200d8e5 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -97,6 +97,18 @@ enum wxDLFlags
 #endif
 };
 
+enum wxDynamicLibraryCategory
+{
+    wxDL_LIBRARY,       // standard library
+    wxDL_MODULE,        // loadable module/plugin
+};
+
+enum wxPluginCategory
+{
+    wxDL_PLUGIN_GUI,    // plugin that uses GUI classes
+    wxDL_PLUGIN_BASE,   // wxBase-only plugin
+};
+
 
 class WXDLLIMPEXP_BASE wxDynamicLibrary
 {
@@ -159,6 +171,20 @@ public:
     operator bool() const { return IsLoaded(); }
 #endif
 
+    // return platform-specific name of dynamic library with proper extension
+    // and prefix (e.g. "foo.dll" on Windows or "libfoo.so" on Linux)
+    static wxString CanonicalizeName(const wxString& name,
+                                     wxDynamicLibraryCategory cat = wxDL_LIBRARY);
+
+    // return name of wxWindows plugin (adds compiler and version info
+    // to the filename):
+    static wxString CanonicalizePluginName(const wxString& name,
+                                           wxPluginCategory cat);
+
+    // return plugin directory on platforms where it makes sense and empty
+    // string on others:
+    static wxString GetPluginsDirectory();
+
 protected:
 
         // Platform specific shared lib suffix.

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 6e42ede2c66fc4e9b05c9006ec80260cd2e885a3..fad9d7515a7a50f206bd2dd57800c36378ab9ad7 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -34,6 +34,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/hash.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/filename.h"        // for SplitPath()
@@ -303,6 +304,99 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 
     return symbol;
 }
+    
+
+/*static*/
+wxString wxDynamicLibrary::CanonicalizeName(const wxString& name,
+                                            wxDynamicLibraryCategory cat)
+{
+#ifdef __UNIX__
+    if ( cat == wxDL_MODULE )
+        return name + GetDllExt();
+    else
+        return wxString(_T("lib")) + name + GetDllExt();
+#else
+    return name + GetDllExt();
+#endif
+}
+
+/*static*/
+wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
+                                                  wxPluginCategory cat)
+{
+    wxString suffix;
+    if ( cat == wxDL_PLUGIN_GUI )
+    {
+        suffix = wxString::FromAscii(
+#if defined(__WXMSW__)
+                "msw"
+#elif defined(__WXGTK__)
+                "gtk"
+#elif defined(__WXMGL__)
+                "mgl"
+#elif defined(__WXMOTIF__)
+                "motif"
+#elif defined(__WXOS2__)
+                "pm"
+#elif defined(__WXX11__)
+                "x11"
+#elif defined(__WXMAC__)
+                "mac"
+#elif defined(__WXCOCOA__)
+                "cocoa"
+#endif
+       );
+
+#ifdef __WXUNIVERSAL__
+        suffix << _T("univ");
+#endif
+    }
+#if wxUSE_UNICODE
+    suffix << _T('u');
+#endif
+#ifdef __WXDEBUG__
+    suffix << _T('d');
+#endif
+
+    if ( !suffix.empty() )
+        suffix = wxString(_T("_")) + suffix;
+
+#ifdef __UNIX__
+    #if (wxMINOR_VERSION % 2) == 0
+        #define wxDLLVER(x,y,z) "-" #x "." #y
+    #else
+        #define wxDLLVER(x,y,z) "-" #x "." #y "." #z
+    #endif
+#else
+    #if (wxMINOR_VERSION % 2) == 0
+        #define wxDLLVER(x,y,z) #x #y
+    #else
+        #define wxDLLVER(x,y,z) #x #y #z
+    #endif
+#endif
+    suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
+                                           wxRELEASE_NUMBER));
+#undef wxDLLVER
+
+    return CanonicalizeName(name + suffix, wxDL_MODULE);
+}
+    
+/*static*/
+wxString wxDynamicLibrary::GetPluginsDirectory()
+{
+#ifdef __UNIX__
+    wxString format = wxGetInstallPrefix();
+    format << wxFILE_SEP_PATH
+           << wxT("lib") << wxFILE_SEP_PATH
+           << wxT("wx") << wxFILE_SEP_PATH
+           << wxT("%i.%i");
+    wxString dir;
+    dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
+    return dir;
+#else
+    return wxEmptyString;
+#endif
+}
 
 
 // ---------------------------------------------------------------------------