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

Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

Browse Source 
and allowed for vertical toolbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-24 23:04:46 +00:00
parent d1017acfc3
commit 16c9a4258f
5 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/toolbar/toolbar.cpp
View File

@@ -297,7 +297,7 @@ void MyFrame::RecreateToolbar()
toolBar->AddTool(wxID_OPEN, toolBarBitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file");
// neither the generic nor Motif native toolbars really support this
#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__)
#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) && !defined(__WXX11__)
// adding a combo to a vertical toolbar is not very smart
if ( m_horzToolbar )
{