added wxAppTraits::CreateRenderer() which may be used to customize the renderer

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

src/common/appbase.cpp

@@ -506,6 +506,12 @@ wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
+wxRendererNative *wxConsoleAppTraitsBase::CreateRenderer()
+{
+    // console applications don't use renderers
+    return NULL;
+}
+
 #ifdef __WXDEBUG__
 bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {

src/common/appcmn.cpp

@@ -322,6 +322,12 @@ wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
+wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
+{
+    // use the default native renderer by default
+    return NULL;
+}
+
 #ifdef __WXDEBUG__
 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)

src/common/rendcmn.cpp

@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/rendcmn.cpp
+// Purpose:     wxRendererNative common functions
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     28.07.03
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/apptrait.h"
+#include "wx/renderer.h"
+
+#include "wx/ptr_scpd.h"
+
+// ----------------------------------------------------------------------------
+// wxRendererPtr: auto pointer holding the global renderer
+// ----------------------------------------------------------------------------
+
+wxDECLARE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
+wxDEFINE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
+
+class wxRendererPtr : public wxRendererPtrBase
+{
+public:
+    wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }
+
+    // return true if we have a renderer, false otherwise
+    bool IsOk()
+    {
+        if ( !m_initialized )
+        {
+            // only try to create the renderer once
+            m_initialized = true;
+
+            DoInit();
+        }
+
+        return get() != NULL;
+    }
+
+private:
+    void DoInit()
+    {
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits )
+        {
+            // ask the traits object to create a renderer for us
+            reset(traits->CreateRenderer());
+        }
+    }
+
+    bool m_initialized;
+
+    DECLARE_NO_COPY_CLASS(wxRendererPtr)
+};
+
+// ============================================================================
+// wxRendererNative implementation
+// ============================================================================
+
+/* static */
+wxRendererNative& wxRendererNative::Get()
+{
+    static wxRendererPtr s_renderer;
+
+    return s_renderer.IsOk() ? *s_renderer.get() : GetDefault();
+}
+

src/generic/renderg.cpp

@@ -100,17 +100,6 @@ wxRendererNative& wxRendererNative::GetGeneric()
     return s_rendererGeneric;
 }
 
-// some platforms have their own renderers
-#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__)
-
-/* static */
-wxRendererNative& wxRendererNative::Get()
-{
-    return GetGeneric();
-}
-
-#endif // platforms using their own renderers
-
 wxRendererGeneric::wxRendererGeneric()
     : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)),
       m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)),

src/gtk/renderer.cpp

@@ -76,7 +76,7 @@ public:
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
 {
     static wxRendererGTK s_rendererGTK;
 

src/gtk1/renderer.cpp

@@ -76,7 +76,7 @@ public:
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
 {
     static wxRendererGTK s_rendererGTK;
 

src/mac/carbon/renderer.cpp

@@ -118,7 +118,7 @@ static const char *aqua_arrow_down_xpm[] = {
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
 {
     static wxRendererMac s_rendererMac;
 

src/mac/renderer.cpp

@@ -118,7 +118,7 @@ static const char *aqua_arrow_down_xpm[] = {
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
 {
     static wxRendererMac s_rendererMac;
 

src/msw/renderer.cpp

@@ -48,7 +48,7 @@ private:
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
 {
     static wxRendererMSW s_rendererMSW;