AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support for vertical toolbars under GTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-12-14 18:50:19 +00:00
parent b685cd9bc8
commit 93fa69f84b
2 changed files with 118 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/gtk/frame.cpp
View File

@ -357,7 +357,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
child->m_width, child->m_width,
child->m_height ); child->m_height );
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR && !wxUSE_TOOLBAR_SIMPLE
/* we connect to these events for recalculating the client area /* we connect to these events for recalculating the client area
space when the toolbar is floating */ space when the toolbar is floating */
if (wxIS_KIND_OF(child,wxToolBar)) if (wxIS_KIND_OF(child,wxToolBar))
@ -617,29 +617,38 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
/* status bar */ /* status bar */
if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
#endif #endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar)
{ {
if (!m_toolBarDetached) if (m_toolBarDetached)
{ {
int y = 0; *height -= wxPLACE_HOLDER;
m_frameToolBar->GetSize( (int *) NULL, &y );
(*height) -= y;
} }
else else
(*height) -= wxPLACE_HOLDER; {
int x, y;
m_frameToolBar->GetSize( &x, &y );
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
*width -= x;
} }
#endif else
{
*height -= y;
}
}
}
#endif // wxUSE_TOOLBAR
/* mini edge */ /* mini edge */
(*height) -= m_miniEdge*2 + m_miniTitle; *height -= m_miniEdge*2 + m_miniTitle;
} }
if (width) if (width)
{ {
(*width) -= m_miniEdge*2; *width -= m_miniEdge*2;
} }
} }
@ -665,14 +674,23 @@ void wxFrame::DoSetClientSize( int width, int height )
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar)
{ {
if (!m_toolBarDetached) if (m_toolBarDetached)
{ {
int y = 0; height += wxPLACE_HOLDER;
m_frameToolBar->GetSize( (int *) NULL, &y );
height += y;
} }
else else
height += wxPLACE_HOLDER; {
int x, y;
m_frameToolBar->GetSize( &x, &y );
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
width += x;
}
else
{
height += y;
}
}
} }
#endif #endif
@ -697,7 +715,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
m_height = height; m_height = height;
/* space occupied by m_frameToolBar and m_frameMenuBar */ /* space occupied by m_frameToolBar and m_frameMenuBar */
int client_area_y_offset = 0; int client_area_x_offset = 0,
client_area_y_offset = 0;
/* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
wxWindow::Create to create it's GTK equivalent. m_mainWidget is only wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
@ -750,23 +769,38 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
else else
yy += wxPLACE_HOLDER; yy += wxPLACE_HOLDER;
} }
int ww = m_width - 2*m_miniEdge;
int hh = m_frameToolBar->m_height;
if (m_toolBarDetached) hh = wxPLACE_HOLDER;
m_frameToolBar->m_x = xx; m_frameToolBar->m_x = xx;
m_frameToolBar->m_y = yy; m_frameToolBar->m_y = yy;
/* m_frameToolBar->m_height = hh; don't change the toolbar's reported size
m_frameToolBar->m_width = ww; */ /* don't change the toolbar's reported height/width */
int ww, hh;
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
ww = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_width;
hh = m_height - 2*m_miniEdge;
client_area_x_offset += ww;
}
else
{
ww = m_width - 2*m_miniEdge;
hh = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_height;
client_area_y_offset += hh;
}
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
m_frameToolBar->m_widget, m_frameToolBar->m_widget,
xx, yy, ww, hh ); xx, yy, ww, hh );
client_area_y_offset += hh;
} }
#endif #endif // wxUSE_TOOLBAR
int client_x = m_miniEdge; int client_x = client_area_x_offset + m_miniEdge;
int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
int client_w = m_width - 2*m_miniEdge; int client_w = m_width - client_area_x_offset - 2*m_miniEdge;
int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
m_wxwindow, m_wxwindow,

84
src/gtk1/frame.cpp
View File

@ -357,7 +357,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
child->m_width, child->m_width,
child->m_height ); child->m_height );
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR && !wxUSE_TOOLBAR_SIMPLE
/* we connect to these events for recalculating the client area /* we connect to these events for recalculating the client area
space when the toolbar is floating */ space when the toolbar is floating */
if (wxIS_KIND_OF(child,wxToolBar)) if (wxIS_KIND_OF(child,wxToolBar))
@ -617,29 +617,38 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
/* status bar */ /* status bar */
if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
#endif #endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar)
{ {
if (!m_toolBarDetached) if (m_toolBarDetached)
{ {
int y = 0; *height -= wxPLACE_HOLDER;
m_frameToolBar->GetSize( (int *) NULL, &y );
(*height) -= y;
} }
else else
(*height) -= wxPLACE_HOLDER; {
int x, y;
m_frameToolBar->GetSize( &x, &y );
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
*width -= x;
} }
#endif else
{
*height -= y;
}
}
}
#endif // wxUSE_TOOLBAR
/* mini edge */ /* mini edge */
(*height) -= m_miniEdge*2 + m_miniTitle; *height -= m_miniEdge*2 + m_miniTitle;
} }
if (width) if (width)
{ {
(*width) -= m_miniEdge*2; *width -= m_miniEdge*2;
} }
} }
@ -665,14 +674,23 @@ void wxFrame::DoSetClientSize( int width, int height )
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar)
{ {
if (!m_toolBarDetached) if (m_toolBarDetached)
{ {
int y = 0; height += wxPLACE_HOLDER;
m_frameToolBar->GetSize( (int *) NULL, &y );
height += y;
} }
else else
height += wxPLACE_HOLDER; {
int x, y;
m_frameToolBar->GetSize( &x, &y );
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
width += x;
}
else
{
height += y;
}
}
} }
#endif #endif
@ -697,7 +715,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
m_height = height; m_height = height;
/* space occupied by m_frameToolBar and m_frameMenuBar */ /* space occupied by m_frameToolBar and m_frameMenuBar */
int client_area_y_offset = 0; int client_area_x_offset = 0,
client_area_y_offset = 0;
/* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
wxWindow::Create to create it's GTK equivalent. m_mainWidget is only wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
@ -750,23 +769,38 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
else else
yy += wxPLACE_HOLDER; yy += wxPLACE_HOLDER;
} }
int ww = m_width - 2*m_miniEdge;
int hh = m_frameToolBar->m_height;
if (m_toolBarDetached) hh = wxPLACE_HOLDER;
m_frameToolBar->m_x = xx; m_frameToolBar->m_x = xx;
m_frameToolBar->m_y = yy; m_frameToolBar->m_y = yy;
/* m_frameToolBar->m_height = hh; don't change the toolbar's reported size
m_frameToolBar->m_width = ww; */ /* don't change the toolbar's reported height/width */
int ww, hh;
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
ww = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_width;
hh = m_height - 2*m_miniEdge;
client_area_x_offset += ww;
}
else
{
ww = m_width - 2*m_miniEdge;
hh = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_height;
client_area_y_offset += hh;
}
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
m_frameToolBar->m_widget, m_frameToolBar->m_widget,
xx, yy, ww, hh ); xx, yy, ww, hh );
client_area_y_offset += hh;
} }
#endif #endif // wxUSE_TOOLBAR
int client_x = m_miniEdge; int client_x = client_area_x_offset + m_miniEdge;
int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
int client_w = m_width - 2*m_miniEdge; int client_w = m_width - client_area_x_offset - 2*m_miniEdge;
int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
m_wxwindow, m_wxwindow,