Mercurial > nand-ecoscentric

comparison 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
comparison
equal deleted inserted replaced
3352:5a5723396af5 3353:53088a1817a7
45 #include "wx/statline.h" 45 #include "wx/statline.h"
46 #include "wx/statbox.h" 46 #include "wx/statbox.h"
47 #include "wx/stattext.h" 47 #include "wx/stattext.h"
48 #include "wx/statbmp.h" 48 #include "wx/statbmp.h"
49 #include "wx/bmpbuttn.h" 49 #include "wx/bmpbuttn.h"
50 #if wxCHECK_VERSION(2, 8, 0)
51 #include "wx/artprov.h"
52 #endif
50 53
51 //---------------------------------------------------------------------------- 54 //----------------------------------------------------------------------------
52 // wxMessageDialogEx 55 // wxMessageDialogEx
53 //---------------------------------------------------------------------------- 56 //----------------------------------------------------------------------------
54 57
71 wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL ); 74 wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
72 75
73 // 1) icon 76 // 1) icon
74 if (style & wxICON_MASK) 77 if (style & wxICON_MASK)
75 { 78 {
79 #if wxCHECK_VERSION(2, 8, 0)
80 wxStaticBitmap *icon = new wxStaticBitmap(this, wxID_ANY,
81 wxArtProvider::GetIcon(wxART_INFORMATION));
82 #else
76 wxStaticBitmap *icon = new wxStaticBitmap( 83 wxStaticBitmap *icon = new wxStaticBitmap(
77 this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK))); 84 this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
85 #endif
78 icon_text->Add( icon, 0, wxCENTER ); 86 icon_text->Add( icon, 0, wxCENTER );
79 } 87 }
80 88
81 // 2) text 89 // 2) text
82 icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 ); 90 icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );