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

Add wxWithImages::SetImages() and update wxMSW wxNotebook for it

Browse Source 
This new function will allow selecting the bitmap of the most suitable
size and automatically react to DPI scale changes (although this hasn't
been implemented yet) in all controls using image lists.

For now, only wxNotebook in wxMSW has been updated to work with it, the
other classes and ports will be updated to override OnImagesChanged()
instead of SetImageList() later.

Also update the notebook sample to use SetImages() rather than
SetImageList() -- which means that it doesn't show the icons any longer
in non-MSW ports, which haven't been updated yet.
This commit is contained in:
Vadim Zeitlin
2021-10-31 20:54:58 +01:00
parent 55819925dc
commit b0d9465921
8 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/notebook/notebook.cpp
View File

@@ -397,18 +397,13 @@ MyFrame::MyFrame()
m_panel = NULL;
m_bookCtrl = NULL;
// create a dummy image list with a few icons
// use some random images for the book control pages
const wxSize imageSize(32, 32);
m_imageList = new wxImageList(imageSize.GetWidth(), imageSize.GetHeight());
m_imageList->
Add(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, imageSize));
m_imageList->
Add(wxArtProvider::GetIcon(wxART_QUESTION, wxART_OTHER, imageSize));
m_imageList->
Add(wxArtProvider::GetIcon(wxART_WARNING, wxART_OTHER, imageSize));
m_imageList->
Add(wxArtProvider::GetIcon(wxART_ERROR, wxART_OTHER, imageSize));
m_images.push_back(wxArtProvider::GetBitmapBundle(wxART_INFORMATION, wxART_OTHER, imageSize));
m_images.push_back(wxArtProvider::GetBitmapBundle(wxART_QUESTION, wxART_OTHER, imageSize));
m_images.push_back(wxArtProvider::GetBitmapBundle(wxART_WARNING, wxART_OTHER, imageSize));
m_images.push_back(wxArtProvider::GetBitmapBundle(wxART_ERROR, wxART_OTHER, imageSize));
m_panel = new wxPanel(this);
@@ -442,8 +437,6 @@ MyFrame::~MyFrame()
#if USE_LOG
delete wxLog::SetActiveTarget(m_logTargetOld);
#endif // USE_LOG
delete m_imageList;
}
// DISPATCH_ON_TYPE() macro is an ugly way to write the "same" code for
@@ -565,7 +558,7 @@ void MyFrame::RecreateBook()
// wxToolbook doesn't work without icons so always use them for it.
if ( m_chkShowImages || m_type == Type_Toolbook )
{
m_bookCtrl->SetImageList(m_imageList);
m_bookCtrl->SetImages(m_images);
}
if ( oldBook )