Mercurial > nand-ecoscentric

diff host/tools/configtool/standalone/wxwin/msgdlgex.cpp @ 3353:53088a1817a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/standalone/wxwin/finddlg.cpp, standalone/wxwin/msgdlgex.cpp, standalone/wxwin/packagesdlg.cpp, standalone/wxwin/packagesdlg.h, standalone/wxwin/settingsdlg.cpp, standalone/wxwin/templatesdlg.cpp: Eliminate deprecated wxWidgets calls. [ Bugzilla 1001947 ] * standalone/wxwin/mainwin.cpp, standalone/wxwin/configtool.cpp: Update copyright strings.
author jld
date Fri, 28 Feb 2014 09:47:26 +0000
parents 2395031e7a66
children
line wrap: on
line diff
--- a/host/tools/configtool/standalone/wxwin/msgdlgex.cpp
+++ b/host/tools/configtool/standalone/wxwin/msgdlgex.cpp
@@ -46,7 +46,10 @@
 #include "wx/statbox.h"
 #include "wx/stattext.h"
 #include "wx/statbmp.h"
-#include "wx/bmpbuttn.h"
+#include "wx/bmpbuttn.h"
+#if wxCHECK_VERSION(2, 8, 0)
+#include "wx/artprov.h"
+#endif
 
 //----------------------------------------------------------------------------
 // wxMessageDialogEx
@@ -73,8 +76,13 @@ wxMessageDialogEx::wxMessageDialogEx( wx
     // 1) icon
     if (style & wxICON_MASK)
     {
-         wxStaticBitmap *icon = new wxStaticBitmap(
-            this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
+#if wxCHECK_VERSION(2, 8, 0)
+         wxStaticBitmap *icon = new wxStaticBitmap(this, wxID_ANY,
+                            wxArtProvider::GetIcon(wxART_INFORMATION));
+#else
+         wxStaticBitmap *icon = new wxStaticBitmap(
+            this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
+#endif
          icon_text->Add( icon, 0, wxCENTER );
     }