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

added wxTB_RIGHT style for right-aligned toolbars (slightly modified patch 1567469)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-29 19:12:52 +00:00
parent 3af706cc31
commit 7a9763046b
8 changed files with 137 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/frame.cpp
View File

@@ -251,7 +251,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
{
int x, y;
m_frameToolBar->GetSize( &x, &y );
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
if ( m_frameToolBar->IsVertical() )
{
if (width != NULL)
*width -= x;
@@ -305,7 +305,7 @@ void wxFrame::DoSetClientSize( int width, int height )
{
int x, y;
m_frameToolBar->GetSize( &x, &y );
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
if ( m_frameToolBar->IsVertical() )
{
width += x;
}
@@ -431,6 +431,17 @@ void wxFrame::GtkOnSize()
client_area_x_offset += ww;
}
else if( m_frameToolBar->HasFlag(wxTB_RIGHT) )
{
yy += 2;
ww = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_width;
xx = GetClientSize().x - 1;
hh = m_height - 2*m_miniEdge;
if( hh < 0 )
hh = 0;
}
else if( m_frameToolBar->GetWindowStyle() & wxTB_BOTTOM )
{
xx = m_miniEdge;