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

Use wxBitmapBundle::GetDefaultSize() in the toolbar sample

Browse Source 
This actually reverts the sample to the version in master, which used
wxBitmap::Get{Width,Height}(), but just replaces "w" and "h" variables
with a single "sizeBitmap" one.
This commit is contained in:
Vadim Zeitlin
2021-09-27 19:01:20 +01:00
parent 15e35a5e7c
commit 043461077e
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
samples/toolbar/toolbar.cpp
View File

@@ -401,19 +401,17 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
toolBarBitmaps[Tool_help ] = wxBITMAP_BUNDLE_2(help ); toolBarBitmaps[Tool_help ] = wxBITMAP_BUNDLE_2(help );
// Size of the bitmaps we use by default. // Size of the bitmaps we use by default.
int w = 32, //
h = 32; // Note that scaling it up by 2 is not something we would do in real
// application code, it is only done in the sample for testing of bigger
if ( !m_smallToolbar ) // bitmap sizes.
{ const wxSize sizeBitmap = toolBarBitmaps[Tool_new].GetDefaultSize() *
w *= 2; (m_smallToolbar ? 1 : 2);
h *= 2;
}
// Note that there is no need for FromDIP() here, wxMSW will adjust the // Note that there is no need for FromDIP() here, wxMSW will adjust the
// size on its own and under the other platforms there is no need for // size on its own and under the other platforms there is no need for
// scaling the coordinates anyhow. // scaling the coordinates anyhow.
toolBar->SetToolBitmapSize(wxSize(w, h)); toolBar->SetToolBitmapSize(sizeBitmap);
toolBar->AddTool(wxID_NEW, "New", toolBar->AddTool(wxID_NEW, "New",
toolBarBitmaps[Tool_new], wxNullBitmap, wxITEM_DROPDOWN, toolBarBitmaps[Tool_new], wxNullBitmap, wxITEM_DROPDOWN,
@@ -454,15 +452,15 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
if ( m_useCustomDisabled ) if ( m_useCustomDisabled )
{ {
wxBitmap bmpDisabled(w, h); wxBitmap bmpDisabled(sizeBitmap);
{ {
wxMemoryDC dc; wxMemoryDC dc;
dc.SelectObject(bmpDisabled); dc.SelectObject(bmpDisabled);
dc.DrawBitmap(toolBarBitmaps[Tool_print].GetBitmap(wxSize(w, h)), 0, 0); dc.DrawBitmap(toolBarBitmaps[Tool_print].GetBitmap(sizeBitmap), 0, 0);
wxPen pen(*wxRED, 5); wxPen pen(*wxRED, 5);
dc.SetPen(pen); dc.SetPen(pen);
dc.DrawLine(0, 0, w, h); dc.DrawLine(0, 0, sizeBitmap.x, sizeBitmap.y);
} }
toolBar->AddTool(wxID_PRINT, "Print", toolBarBitmaps[Tool_print], toolBar->AddTool(wxID_PRINT, "Print", toolBarBitmaps[Tool_print],
@@ -487,8 +485,8 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
wxImage img(m_pathBmp); wxImage img(m_pathBmp);
if ( img.IsOk() ) if ( img.IsOk() )
{ {
if ( img.GetWidth() > w && img.GetHeight() > h ) if ( img.GetWidth() > sizeBitmap.x && img.GetHeight() > sizeBitmap.y )
img = img.GetSubImage(wxRect(0, 0, w, h)); img = img.GetSubImage(wxRect(0, 0, sizeBitmap.x, sizeBitmap.y));
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(wxID_ANY, "Custom", img); toolBar->AddTool(wxID_ANY, "Custom", img);