X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1970409e33ce5aa182fa40ea499e532fdbf1982d..8f4745feeb2850f3bebb3af45407e164550d541a:/src/common/artprov.cpp

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 793718faab..fb19f1ebbf 100644
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -160,7 +160,7 @@ wxArtProvider::~wxArtProvider()
     sm_providers->Insert(provider);
 }
 
-/*static*/ void wxArtProvider::Insert(wxArtProvider *provider)
+/*static*/ void wxArtProvider::PushBack(wxArtProvider *provider)
 {
     CommonAddingProvider();
     sm_providers->Append(provider);
@@ -235,28 +235,63 @@ wxArtProvider::~wxArtProvider()
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
+                break;
+        }
+
+        if ( !bmp.Ok() )
+        {
+            // no bitmap created -- as a fallback, try if we can find desired
+            // icon in a bundle
+            wxIconBundle iconBundle = DoGetIconBundle(id, client);
+            if ( iconBundle.IsOk() )
             {
+                wxSize sz(size != wxDefaultSize
+                            ? size
+                            : GetNativeSizeHint(client));
+                wxIcon icon(iconBundle.GetIcon(sz));
+                if ( icon.IsOk() )
+                    bmp.CopyFromIcon(icon);
+            }
+        }
+
+        if ( bmp.IsOk() )
+        {
+            // if we didn't get the correct size, resize the bitmap
 #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
-                if ( size != wxDefaultSize &&
-                     (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
-                {
-                    wxImage img = bmp.ConvertToImage();
-                    img.Rescale(size.x, size.y);
-                    bmp = wxBitmap(img);
-                }
-#endif
-                break;
+            if ( size != wxDefaultSize &&
+                 (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
+            {
+                wxImage img = bmp.ConvertToImage();
+                img.Rescale(size.x, size.y);
+                bmp = wxBitmap(img);
             }
-            // We could try the IconBundles here and convert what we find
-            // to a bitmap.
+#endif
         }
+
         sm_cache->PutBitmap(hashId, bmp);
-        }
+    }
 
     return bmp;
 }
 
-/*static*/ wxIconBundle wxArtProvider::GetIconBundle(const wxArtID& id, const wxArtClient& client)
+/*static*/
+wxIconBundle wxArtProvider::GetIconBundle(const wxArtID& id, const wxArtClient& client)
+{
+    wxIconBundle iconbundle(DoGetIconBundle(id, client));
+
+    if ( iconbundle.IsOk() )
+    {
+        return iconbundle;
+    }
+    else
+    {
+        // fall back to single-icon bundle
+        return wxIconBundle(GetIcon(id, client));
+    }
+}
+
+/*static*/
+wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient& client)
 {
     // safety-check against writing client,id,size instead of id,client,size:
     wxASSERT_MSG( client.Last() == _T('C'), _T("invalid 'client' parameter") );
@@ -286,16 +321,9 @@ wxArtProvider::~wxArtProvider()
                                          const wxArtClient& client,
                                          const wxSize& size)
 {
-    wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
-
-    // First look for an appropriate icon bundle - this will give us the best icon
-    wxIconBundle iconBundle = GetIconBundle(id, client);
-    if ( iconBundle.IsOk() )
-        return iconBundle.GetIcon(size);
-
-    // If there is no icon bundle then look for a bitmap
     wxBitmap bmp = GetBitmap(id, client, size);
-    if ( !bmp.Ok() )
+
+    if ( !bmp.IsOk() )
         return wxNullIcon;
 
     wxIcon icon;
@@ -333,11 +361,6 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
     return icon;
 }
 
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    #include <gtk/gtk.h>
-    extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
-#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-
 /*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,
                                          bool platform_dependent)
 {
@@ -348,34 +371,33 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
             return node->GetData()->DoGetSizeHint(client);
     }
 
-        // else return platform dependent size
-
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    // Gtk has specific sizes for each client, see artgtk.cpp
-    GtkIconSize gtk_size = wxArtClientToIconSize(client);
-    // no size hints for this client
-    if (gtk_size == GTK_ICON_SIZE_INVALID)
-        return wxDefaultSize;
-    gint width, height;
-    gtk_icon_size_lookup( gtk_size, &width, &height);
-    return wxSize(width, height);
-#else // !GTK+ 2
-    // NB: These size hints may have to be adjusted per platform
-    if (client == wxART_TOOLBAR)
-        return wxSize(16, 15);
-    else if (client == wxART_MENU)
-        return wxSize(16, 15);
-    else if (client == wxART_FRAME_ICON)
-        return wxSize(16, 15);
-    else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX)
-        return wxSize(32, 32);
-    else if (client == wxART_HELP_BROWSER)
-        return wxSize(16, 15);
-    else if (client == wxART_BUTTON)
-        return wxSize(16, 15);
-    else // wxART_OTHER or perhaps a user's client, no specified size
-        return wxDefaultSize;
-#endif // GTK+ 2/else
+    return GetNativeSizeHint(client);
+}
+
+#ifndef wxHAS_NATIVE_ART_PROVIDER_IMPL
+/*static*/
+wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& WXUNUSED(client))
+{
+    // rather than returning some arbitrary value that doesn't make much
+    // sense (as 2.8 used to do), tell the caller that we don't have a clue:
+    return wxDefaultSize;
+}
+
+/*static*/
+void wxArtProvider::InitNativeProvider()
+{
+}
+#endif // !wxHAS_NATIVE_ART_PROVIDER_IMPL
+
+
+/* static */
+bool wxArtProvider::HasNativeProvider()
+{
+#ifdef __WXGTK20__
+    return true;
+#else
+    return false;
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -408,6 +430,13 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
 
 #endif // WXWIN_COMPATIBILITY_2_6
 
+#if WXWIN_COMPATIBILITY_2_8
+/* static */ void wxArtProvider::Insert(wxArtProvider *provider)
+{
+    PushBack(provider);
+}
+#endif // WXWIN_COMPATIBILITY_2_8
+
 // ============================================================================
 // wxArtProviderModule
 // ============================================================================