fixed MIPSpro version in the comment

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 7294febe6f51d57dc609daf0282c23de74239b4b..2e8a1df31c826bb25ec9e3c0e6cd249d3f0a3b59 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -13,10 +13,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "artprov.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,7 +28,9 @@
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"

-
+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -40,13 +38,13 @@
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);

-WX_DEFINE_LIST(wxArtProvidersList);
+WX_DEFINE_LIST(wxArtProvidersList)

 
 // ----------------------------------------------------------------------------
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 

-WX_DECLARE_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);

 
 class WXDLLEXPORT wxArtProviderCache
 {
 
 class WXDLLEXPORT wxArtProviderCache
 {


@@ -56,7 +54,7 @@ public:
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();

-    
+

     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);
     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);


@@ -70,12 +68,12 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
     wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
     if ( entry == m_bitmapsHash.end() )
     {
     wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
     if ( entry == m_bitmapsHash.end() )
     {

-        return FALSE;
+        return false;

     }
     else
     {
         *bmp = entry->second;
     }
     else
     {
         *bmp = entry->second;

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -108,38 +106,41 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     if ( !sm_providers )
     {
         sm_providers = new wxArtProvidersList;
     if ( !sm_providers )
     {
         sm_providers = new wxArtProvidersList;

-        sm_providers->DeleteContents(TRUE);

         sm_cache = new wxArtProviderCache;
     }
 
     sm_providers->Insert(provider);
         sm_cache = new wxArtProviderCache;
     }
 
     sm_providers->Insert(provider);

+    sm_cache->Clear();

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

-    wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") );
-    wxCHECK_MSG( sm_providers->GetCount() > 0, FALSE, _T("wxArtProviders stack is empty") );
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers->GetCount() > 0, false, _T("wxArtProviders stack is empty") );

 
 

-    sm_providers->DeleteNode(sm_providers->GetFirst());
+    delete sm_providers->GetFirst()->GetData();
+    sm_providers->Erase(sm_providers->GetFirst());

     sm_cache->Clear();
     sm_cache->Clear();

-    return TRUE;
+    return true;

 }
 
 /*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
 {
 }
 
 /*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
 {

-    wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );

 
     if ( sm_providers->DeleteObject(provider) )
     {
 
     if ( sm_providers->DeleteObject(provider) )
     {

+        delete provider;

         sm_cache->Clear();
         sm_cache->Clear();

-        return TRUE;
+        return true;

     }
     }

-    
-    return FALSE;
+
+    return false;

 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {
 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {

+    WX_CLEAR_LIST(wxArtProvidersList, *sm_providers);

     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }
     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }


@@ -158,13 +159,25 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
     {
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
     {

-        for (wxArtProvidersList::Node *node = sm_providers->GetFirst();
+        for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();

              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )

+            {
+#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;
                 break;

+            }

         }
         }

+

         sm_cache->PutBitmap(hashId, bmp);
     }
 
         sm_cache->PutBitmap(hashId, bmp);
     }
 


@@ -178,25 +191,73 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
     wxBitmap bmp = GetBitmap(id, client, size);
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
     wxBitmap bmp = GetBitmap(id, client, size);

-    if ( bmp.Ok() )
-    {
-        wxIcon icon;
-        icon.CopyFromBitmap(bmp);
-        return icon;
-    }
-    else
-    {
+    if ( !bmp.Ok() )

         return wxNullIcon;
         return wxNullIcon;

-    }
+
+    wxIcon icon;
+    icon.CopyFromBitmap(bmp);
+    return icon;

 }
 
 }
 

+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk/private.h"
+    extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
+#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+
+/*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,
+                                         bool platform_dependent)
+{
+    if (!platform_dependent)
+    {
+        wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
+        if (node)
+            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
+}

 
 
 class wxArtProviderModule: public wxModule
 {
 public:
 
 
 class wxArtProviderModule: public wxModule
 {
 public:

-    bool OnInit() { return TRUE; }
-    void OnExit() { wxArtProvider::CleanUpProviders(); }
+    bool OnInit()
+    {
+        wxArtProvider::InitStdProvider();
+        wxArtProvider::InitNativeProvider();
+        return true;
+    }
+    void OnExit()
+    {
+        wxArtProvider::CleanUpProviders();
+    }

 
     DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
 };