don't crash when streaming out a wxString into an std::ostream, just set the failbit...

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index bd79bb96e346408085ae57efe60f22baa736a432..267b1c2c3b3b8072aa98d652f7ae7664adbda7d6 100644 (file)
--- 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);
@@ -303,8 +303,38 @@ wxArtProvider::~wxArtProvider()
     return icon;
 }
 
+/* static */
+wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
+{
+    wxIcon icon;
+    switch ( flags & wxICON_MASK )
+    {
+        default:
+            wxFAIL_MSG(_T("incorrect message box icon flags"));
+            // fall through
+
+        case wxICON_ERROR:
+            icon = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
+            break;
+
+        case wxICON_INFORMATION:
+            icon = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
+            break;
+
+        case wxICON_WARNING:
+            icon = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
+            break;
+
+        case wxICON_QUESTION:
+            icon = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
+            break;
+    }
+
+    return icon;
+}
+
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    #include "wx/gtk/private.h"
+    #include <gtk/gtk.h>
     extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
 #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 
@@ -348,6 +378,16 @@ wxArtProvider::~wxArtProvider()
 #endif // GTK+ 2/else
 }
 
+/* static */
+bool wxArtProvider::HasNativeProvider()
+{
+#ifdef __WXGTK20__
+    return true;
+#else
+    return false;
+#endif
+}
+
 // ----------------------------------------------------------------------------
 // deprecated wxArtProvider methods
 // ----------------------------------------------------------------------------
@@ -378,6 +418,13 @@ wxArtProvider::~wxArtProvider()
 
 #endif // WXWIN_COMPATIBILITY_2_6
 
+#if WXWIN_COMPATIBILITY_2_8
+/* static */ void wxArtProvider::Insert(wxArtProvider *provider)
+{
+    PushBack(provider);
+}
+#endif // WXWIN_COMPATIBILITY_2_8
+
 // ============================================================================
 // wxArtProviderModule
 // ============================================================================