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

Let wxToolBar assume that no orientation flag means horizontal.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-07-14 17:39:20 +00:00
parent b8c140b89f
commit 1fd1922a49
2 changed files with 224 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mac/carbon/toolbar.cpp
View File

@@ -253,26 +253,27 @@ bool wxToolBar::Realize()
wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
::EmbedControl( m_macToolHandle , container ) ;
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
x += (int)toolSize.x;
y += (int)toolSize.y;
}
else
{
y += (int)toolSize.y;
x += (int)toolSize.x;
}
noButtons ++;
}
else
{
m_macToolHandles.Add( NULL ) ;
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
x += (int)toolSize.x / 4;
y += (int)toolSize.y / 4;
}
else
{
y += (int)toolSize.y / 4;
x += (int)toolSize.x / 4;
}
}
if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) {

13
src/mac/toolbar.cpp
View File

@@ -253,26 +253,27 @@ bool wxToolBar::Realize()
wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
::EmbedControl( m_macToolHandle , container ) ;
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
x += (int)toolSize.x;
y += (int)toolSize.y;
}
else
{
y += (int)toolSize.y;
x += (int)toolSize.x;
}
noButtons ++;
}
else
{
m_macToolHandles.Add( NULL ) ;
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
x += (int)toolSize.x / 4;
y += (int)toolSize.y / 4;
}
else
{
y += (int)toolSize.y / 4;
x += (int)toolSize.x / 4;
}
}
if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) {