Added wxArtProvider::GetMessageBoxIconId().

This function translates between wxICON_XXX constants and wxART_YYY values. It
was extracted from the existing GetMessageBoxIcon().

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 76d10d67dffbe98150e29a2ac467978765f8f494..75d0ff705f22144e6c0d0e13a00739e377e82b85 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -155,10 +155,18 @@ public:
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
+    // Helper used by GetMessageBoxIcon(): return the art id corresponding to
+    // the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
+    // can be set)
+    static wxArtID GetMessageBoxIconId(int flags);
+
     // Helper used by several generic classes: return the icon corresponding to
     // the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
     // can be set)
-    static wxIcon GetMessageBoxIcon(int flags);
+    static wxIcon GetMessageBoxIcon(int flags)
+    {
+        return GetIcon(GetMessageBoxIconId(flags), wxART_MESSAGE_BOX);
+    }
 
     // Query the providers for iconbundle with given ID and return it. Return
     // wxNullIconBundle if no provider provides it.

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index ff278ac39f3b46a348f429bd803c3d80d3d9294f..79c9470e01693d39dd5bea94c8dc19f70b456c33 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -332,9 +332,8 @@ wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient
 }
 
 /* static */
-wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
+wxArtID wxArtProvider::GetMessageBoxIconId(int flags)
 {
-    wxIcon icon;
     switch ( flags & wxICON_MASK )
     {
         default:
@@ -342,23 +341,17 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
             // fall through
 
         case wxICON_ERROR:
-            icon = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
-            break;
+            return wxART_ERROR;
 
         case wxICON_INFORMATION:
-            icon = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
-            break;
+            return wxART_INFORMATION;
 
         case wxICON_WARNING:
-            icon = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
-            break;
+            return wxART_WARNING;
 
         case wxICON_QUESTION:
-            icon = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
-            break;
+            return wxART_QUESTION;
     }
-
-    return icon;
 }
 
 /*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,