Use wxRTC text colour if possible for caret

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index dac5bd30b72f093f7aa7ac78cd8f6472d18930e6..908af16369dbed9252989209ffee2f13d4bc2ca0 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -231,12 +231,12 @@ wxArtProvider::~wxArtProvider()
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);

-            if ( bmp.Ok() )
+            if ( bmp.IsOk() )

                 break;
         }
 
         wxSize sizeNeeded = size;
                 break;
         }
 
         wxSize sizeNeeded = size;

-        if ( !bmp.Ok() )
+        if ( !bmp.IsOk() )

         {
             // no bitmap created -- as a fallback, try if we can find desired
             // icon in a bundle
         {
             // no bitmap created -- as a fallback, try if we can find desired
             // icon in a bundle


@@ -407,7 +407,7 @@ bool wxArtProvider::HasNativeProvider()
 
 /* static */ void wxArtProvider::InsertProvider(wxArtProvider *provider)
 {
 
 /* static */ void wxArtProvider::InsertProvider(wxArtProvider *provider)
 {

-    Insert(provider);
+    PushBack(provider);

 }
 
 /* static */ bool wxArtProvider::PopProvider()
 }
 
 /* static */ bool wxArtProvider::PopProvider()


@@ -440,13 +440,16 @@ class wxArtProviderModule: public wxModule
 public:
     bool OnInit()
     {
 public:
     bool OnInit()
     {

-#if wxUSE_ARTPROVIDER_STD
-        wxArtProvider::InitStdProvider();
-#endif // wxUSE_ARTPROVIDER_STD
+        // The order here is such that the native provider will be used first
+        // and the standard one last as all these default providers add
+        // themselves to the bottom of the stack.
+        wxArtProvider::InitNativeProvider();

 #if wxUSE_ARTPROVIDER_TANGO
         wxArtProvider::InitTangoProvider();
 #endif // wxUSE_ARTPROVIDER_TANGO
 #if wxUSE_ARTPROVIDER_TANGO
         wxArtProvider::InitTangoProvider();
 #endif // wxUSE_ARTPROVIDER_TANGO

-        wxArtProvider::InitNativeProvider();
+#if wxUSE_ARTPROVIDER_STD
+        wxArtProvider::InitStdProvider();
+#endif // wxUSE_ARTPROVIDER_STD

         return true;
     }
     void OnExit()
         return true;
     }
     void OnExit()