Add markup support to wxMSW wxButton and show it in the sample.

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index fb19f1ebbf0ce537ea04253ff606c48a68612e45..dac5bd30b72f093f7aa7ac78cd8f6472d18930e6 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -108,7 +108,7 @@ void wxArtProviderCache::Clear()
 wxArtProviderCache::ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client)
 {
 wxArtProviderCache::ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client)
 {

-    return id + _T('-') + client;
+    return id + wxT('-') + client;

 }
 
 
 }
 
 


@@ -117,8 +117,8 @@ wxArtProviderCache::ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size)
 {
                                     const wxArtClient& client,
                                     const wxSize& size)
 {

-    return ConstructHashID(id, client) + _T('-') +
-            wxString::Format(_T("%d-%d"), size.x, size.y);
+    return ConstructHashID(id, client) + wxT('-') +
+            wxString::Format(wxT("%d-%d"), size.x, size.y);

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -168,8 +168,8 @@ wxArtProvider::~wxArtProvider()
 
 /*static*/ bool wxArtProvider::Pop()
 {
 
 /*static*/ bool wxArtProvider::Pop()
 {

-    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
-    wxCHECK_MSG( !sm_providers->empty(), false, _T("wxArtProviders stack is empty") );
+    wxCHECK_MSG( sm_providers, false, wxT("no wxArtProvider exists") );
+    wxCHECK_MSG( !sm_providers->empty(), false, wxT("wxArtProviders stack is empty") );

 
     delete sm_providers->GetFirst()->GetData();
     sm_cache->Clear();
 
     delete sm_providers->GetFirst()->GetData();
     sm_cache->Clear();


@@ -178,7 +178,7 @@ wxArtProvider::~wxArtProvider()
 
 /*static*/ bool wxArtProvider::Remove(wxArtProvider *provider)
 {
 
 /*static*/ bool wxArtProvider::Remove(wxArtProvider *provider)
 {

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

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


@@ -204,11 +204,8 @@ wxArtProvider::~wxArtProvider()
         while ( !sm_providers->empty() )
             delete *sm_providers->begin();
 
         while ( !sm_providers->empty() )
             delete *sm_providers->begin();
 

-        delete sm_providers;
-        sm_providers = NULL;
-
-        delete sm_cache;
-        sm_cache = NULL;
+        wxDELETE(sm_providers);
+        wxDELETE(sm_cache);

     }
 }
 
     }
 }
 


@@ -221,9 +218,9 @@ wxArtProvider::~wxArtProvider()
                                              const wxSize& size)
 {
     // safety-check against writing client,id,size instead of id,client,size:
                                              const wxSize& size)
 {
     // safety-check against writing client,id,size instead of id,client,size:

-    wxASSERT_MSG( client.Last() == _T('C'), _T("invalid 'client' parameter") );
+    wxASSERT_MSG( client.Last() == wxT('C'), wxT("invalid 'client' parameter") );

 
 

-    wxCHECK_MSG( sm_providers, wxNullBitmap, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers, wxNullBitmap, wxT("no wxArtProvider exists") );

 
     wxString hashId = wxArtProviderCache::ConstructHashID(id, client, size);
 
 
     wxString hashId = wxArtProviderCache::ConstructHashID(id, client, size);
 


@@ -238,6 +235,7 @@ wxArtProvider::~wxArtProvider()
                 break;
         }
 
                 break;
         }
 

+        wxSize sizeNeeded = size;

         if ( !bmp.Ok() )
         {
             // no bitmap created -- as a fallback, try if we can find desired
         if ( !bmp.Ok() )
         {
             // no bitmap created -- as a fallback, try if we can find desired


@@ -245,28 +243,31 @@ wxArtProvider::~wxArtProvider()
             wxIconBundle iconBundle = DoGetIconBundle(id, client);
             if ( iconBundle.IsOk() )
             {
             wxIconBundle iconBundle = DoGetIconBundle(id, client);
             if ( iconBundle.IsOk() )
             {

-                wxSize sz(size != wxDefaultSize
-                            ? size
-                            : GetNativeSizeHint(client));
-                wxIcon icon(iconBundle.GetIcon(sz));
+                if ( sizeNeeded == wxDefaultSize )
+                    sizeNeeded = GetNativeSizeHint(client);
+
+                wxIcon icon(iconBundle.GetIcon(sizeNeeded));

                 if ( icon.IsOk() )
                 if ( icon.IsOk() )

+                {
+                    // this icon may be not of the correct size, it will be
+                    // rescaled below in such case

                     bmp.CopyFromIcon(icon);
                     bmp.CopyFromIcon(icon);

+                }

             }
         }
 
             }
         }
 

-        if ( bmp.IsOk() )
-        {
-            // if we didn't get the correct size, resize the bitmap
+        // if we didn't get the correct size, resize the bitmap

 #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
 #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

-            if ( size != wxDefaultSize &&
-                 (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
+        if ( bmp.IsOk() && sizeNeeded != wxDefaultSize )
+        {
+            if ( bmp.GetSize() != sizeNeeded )

             {
                 wxImage img = bmp.ConvertToImage();
             {
                 wxImage img = bmp.ConvertToImage();

-                img.Rescale(size.x, size.y);
+                img.Rescale(sizeNeeded.x, sizeNeeded.y);

                 bmp = wxBitmap(img);
             }
                 bmp = wxBitmap(img);
             }

-#endif

         }
         }

+#endif // wxUSE_IMAGE

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


@@ -294,9 +295,9 @@ wxIconBundle wxArtProvider::GetIconBundle(const wxArtID& id, const wxArtClient&
 wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient& client)
 {
     // safety-check against writing client,id,size instead of id,client,size:
 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") );
+    wxASSERT_MSG( client.Last() == wxT('C'), wxT("invalid 'client' parameter") );

 
 

-    wxCHECK_MSG( sm_providers, wxNullIconBundle, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers, wxNullIconBundle, wxT("no wxArtProvider exists") );

 
     wxString hashId = wxArtProviderCache::ConstructHashID(id, client);
 
 
     wxString hashId = wxArtProviderCache::ConstructHashID(id, client);
 


@@ -332,33 +333,26 @@ wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient
 }
 
 /* static */
 }
 
 /* static */

-wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
+wxArtID wxArtProvider::GetMessageBoxIconId(int flags)

 {
 {

-    wxIcon icon;

     switch ( flags & wxICON_MASK )
     {
         default:
     switch ( flags & wxICON_MASK )
     {
         default:

-            wxFAIL_MSG(_T("incorrect message box icon flags"));
+            wxFAIL_MSG(wxT("incorrect message box icon flags"));

             // fall through
 
         case wxICON_ERROR:
             // fall through
 
         case wxICON_ERROR:

-            icon = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
-            break;
+            return wxART_ERROR;

 
         case wxICON_INFORMATION:
 
         case wxICON_INFORMATION:

-            icon = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
-            break;
+            return wxART_INFORMATION;

 
         case wxICON_WARNING:
 
         case wxICON_WARNING:

-            icon = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
-            break;
+            return wxART_WARNING;

 
         case wxICON_QUESTION:
 
         case wxICON_QUESTION:

-            icon = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
-            break;
+            return wxART_QUESTION;

     }
     }

-
-    return icon;

 }
 
 /*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,
 }
 
 /*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,


@@ -446,7 +440,12 @@ class wxArtProviderModule: public wxModule
 public:
     bool OnInit()
     {
 public:
     bool OnInit()
     {

+#if wxUSE_ARTPROVIDER_STD

         wxArtProvider::InitStdProvider();
         wxArtProvider::InitStdProvider();

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

         wxArtProvider::InitNativeProvider();
         return true;
     }
         wxArtProvider::InitNativeProvider();
         return true;
     }