Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use wxApp::GetStdIcon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-24 00:21:26 +00:00
parent 3a72b4eff0
commit 389d906b21
5 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/drawing/drawing.cpp
View File

@@ -37,6 +37,7 @@
#include "wx/colordlg.h"
#include "wx/image.h"
#include "wx/artprov.h"
// ----------------------------------------------------------------------------
// ressources
@@ -368,7 +369,7 @@ MyCanvas::MyCanvas(MyFrame *parent)
m_owner = parent;
m_show = Show_Default;
m_smile_bmp = wxBitmap(smile_xpm);
m_std_icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
m_std_icon = wxArtProvider::GetIcon(wxART_INFORMATION);
}
void MyCanvas::DrawTestBrushes(wxDC& dc)
@@ -553,9 +554,9 @@ void MyCanvas::DrawDefault(wxDC& dc)
memdc.SelectObject( wxNullBitmap );
dc.DrawBitmap( bitmap, 10, 170 );
wxImage image( bitmap );
wxImage image = bitmap.ConvertToImage();
image.Rescale( 60,210 );
bitmap = image.ConvertToBitmap();
bitmap = wxBitmap(image);
dc.DrawBitmap( bitmap, 50, 170 );
// test the rectangle outline drawing - there should be one pixel between