removed OSX code that is no longer needed

[wxWidgets.git] / src / common / rendcmn.cpp

diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 202ec01517b0e495556d808907fd0aa2e002d246..77bfdde5168306426ef8841c958706716cfcfc7c 100644 (file)
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -24,6 +24,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"


@@ -31,6 +32,10 @@
 
 #include "wx/ptr_scpd.h"
 
 
 #include "wx/ptr_scpd.h"
 

+#if wxUSE_DYNLIB_CLASS
+    #include "wx/dynlib.h"
+#endif // wxUSE_DYNLIB_CLASS
+

 // ----------------------------------------------------------------------------
 // wxRendererPtr: auto pointer holding the global renderer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRendererPtr: auto pointer holding the global renderer
 // ----------------------------------------------------------------------------


@@ -41,8 +46,6 @@ wxDEFINE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
 class wxRendererPtr : public wxRendererPtrBase
 {
 public:
 class wxRendererPtr : public wxRendererPtrBase
 {
 public:

-    wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }
-

     // return true if we have a renderer, false otherwise
     bool IsOk()
     {
     // return true if we have a renderer, false otherwise
     bool IsOk()
     {


@@ -57,7 +60,17 @@ public:
         return get() != NULL;
     }
 
         return get() != NULL;
     }
 

+    // return the global and unique wxRendererPtr
+    static wxRendererPtr& Get()
+    {
+        static wxRendererPtr s_renderer;
+
+        return s_renderer;
+    }
+

 private:
 private:

+    wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }
+

     void DoInit()
     {
         wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
     void DoInit()
     {
         wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;


@@ -73,15 +86,97 @@ private:
     DECLARE_NO_COPY_CLASS(wxRendererPtr)
 };
 
     DECLARE_NO_COPY_CLASS(wxRendererPtr)
 };
 

+#if wxUSE_DYNLIB_CLASS
+
+// ----------------------------------------------------------------------------
+// wxRendererFromDynLib: represents a renderer dynamically loaded from a DLL
+// ----------------------------------------------------------------------------
+
+class wxRendererFromDynLib : public wxDelegateRendererNative
+{
+public:
+    // create the object wrapping the given renderer created from this DLL
+    //
+    // we take ownership of the pointer and will delete it (and also unload the
+    // DLL) when we're deleted
+    wxRendererFromDynLib(wxDynamicLibrary& dll, wxRendererNative *renderer)
+        : wxDelegateRendererNative(*renderer),
+          m_renderer(renderer),
+          m_dllHandle(dll.Detach())
+        {
+        }
+
+    virtual ~wxRendererFromDynLib()
+    {
+        delete m_renderer;
+        wxDynamicLibrary::Unload(m_dllHandle);
+    }
+
+private:
+    wxRendererNative *m_renderer;
+    wxDllType m_dllHandle;
+};
+
+#endif // wxUSE_DYNLIB_CLASS
+

 // ============================================================================
 // wxRendererNative implementation
 // ============================================================================
 
 // ============================================================================
 // wxRendererNative implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// Managing the global renderer
+// ----------------------------------------------------------------------------
+

 /* static */
 wxRendererNative& wxRendererNative::Get()
 {
 /* static */
 wxRendererNative& wxRendererNative::Get()
 {

-    static wxRendererPtr s_renderer;
+    wxRendererPtr& renderer = wxRendererPtr::Get();

 
 

-    return s_renderer.IsOk() ? *s_renderer.get() : GetDefault();
+    return renderer.IsOk() ? *renderer.get() : GetDefault();

 }
 
 }
 

+/* static */
+wxRendererNative *wxRendererNative::Set(wxRendererNative *rendererNew)
+{
+    wxRendererPtr& renderer = wxRendererPtr::Get();
+
+    wxRendererNative *rendererOld = renderer.release();
+
+    renderer.reset(rendererNew);
+
+    return rendererOld;
+}
+
+
+// ----------------------------------------------------------------------------
+// Dynamic renderers loading
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DYNLIB_CLASS
+
+/* static */
+wxRendererNative *wxRendererNative::Load(const wxString& name)
+{
+    wxString fullname = wxDynamicLibrary::CanonicalizePluginName(name);
+
+    wxDynamicLibrary dll(fullname);
+    if ( !dll.IsLoaded() )
+        return NULL;
+
+    // each theme DLL must export a wxCreateRenderer() function with this
+    // signature
+    typedef wxRendererNative *(*wxCreateRenderer_t)();
+
+    wxDYNLIB_FUNCTION(wxCreateRenderer_t, wxCreateRenderer, dll);
+    if ( !pfnwxCreateRenderer )
+        return NULL;
+
+    wxRendererNative *renderer = (*pfnwxCreateRenderer)();
+    if ( !renderer )
+        return NULL;
+
+    return new wxRendererFromDynLib(dll, renderer);
+}
+
+#endif // wxUSE_DYNLIB_CLASS
+