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

don't use the bitmaps in toolbars with wxTB_NOICONS style

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-09-17 10:40:23 +00:00
parent ae6db164e2
commit d55a4efc0f
2 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/tbargtk.cpp
View File

@@ -379,6 +379,8 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
size_t posGtk = m_xMargin > 1 ? pos + 1 : pos; size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
if ( tool->IsButton() ) if ( tool->IsButton() )
{
if ( !HasFlag(wxTB_NOICONS) )
{ {
wxBitmap bitmap = tool->GetNormalBitmap(); wxBitmap bitmap = tool->GetNormalBitmap();
@@ -406,6 +408,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
tool->m_pixmap = tool_pixmap; tool->m_pixmap = tool_pixmap;
} }
}
switch ( tool->GetStyle() ) switch ( tool->GetStyle() )
{ {

3
src/gtk1/tbargtk.cpp
View File

@@ -379,6 +379,8 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
size_t posGtk = m_xMargin > 1 ? pos + 1 : pos; size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
if ( tool->IsButton() ) if ( tool->IsButton() )
{
if ( !HasFlag(wxTB_NOICONS) )
{ {
wxBitmap bitmap = tool->GetNormalBitmap(); wxBitmap bitmap = tool->GetNormalBitmap();
@@ -406,6 +408,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
tool->m_pixmap = tool_pixmap; tool->m_pixmap = tool_pixmap;
} }
}
switch ( tool->GetStyle() ) switch ( tool->GetStyle() )
{ {