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

Don't allow for status or toolbar size if they are not currently shown

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-08-29 13:21:07 +00:00
parent d11bb14faa
commit fa755cf187
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/frame.cpp
View File

@@ -627,12 +627,12 @@ 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 && m_frameStatusBar->IsShown()) (*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar && m_frameToolBar->IsShown())
{ {
if (m_toolBarDetached) if (m_toolBarDetached)
{ {
@@ -678,12 +678,12 @@ void wxFrame::DoSetClientSize( int width, int height )
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
/* status bar */ /* status bar */
if (m_frameStatusBar) height += wxSTATUS_HEIGHT; if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
#endif #endif
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar && m_frameToolBar->IsShown())
{ {
if (m_toolBarDetached) if (m_toolBarDetached)
{ {
@@ -781,7 +781,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
} }
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
if ((m_frameToolBar) && if ((m_frameToolBar) && m_frameToolBar->IsShown() &&
(m_frameToolBar->m_widget->parent == m_mainWidget)) (m_frameToolBar->m_widget->parent == m_mainWidget))
{ {
int xx = m_miniEdge; int xx = m_miniEdge;
@@ -837,7 +837,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
} }
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if (m_frameStatusBar) if (m_frameStatusBar && m_frameStatusBar->IsShown())
{ {
int xx = 0 + m_miniEdge; int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;

12
src/gtk1/frame.cpp
View File

@@ -627,12 +627,12 @@ 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 && m_frameStatusBar->IsShown()) (*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar && m_frameToolBar->IsShown())
{ {
if (m_toolBarDetached) if (m_toolBarDetached)
{ {
@@ -678,12 +678,12 @@ void wxFrame::DoSetClientSize( int width, int height )
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
/* status bar */ /* status bar */
if (m_frameStatusBar) height += wxSTATUS_HEIGHT; if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
#endif #endif
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
/* tool bar */ /* tool bar */
if (m_frameToolBar) if (m_frameToolBar && m_frameToolBar->IsShown())
{ {
if (m_toolBarDetached) if (m_toolBarDetached)
{ {
@@ -781,7 +781,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
} }
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
if ((m_frameToolBar) && if ((m_frameToolBar) && m_frameToolBar->IsShown() &&
(m_frameToolBar->m_widget->parent == m_mainWidget)) (m_frameToolBar->m_widget->parent == m_mainWidget))
{ {
int xx = m_miniEdge; int xx = m_miniEdge;
@@ -837,7 +837,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
} }
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if (m_frameStatusBar) if (m_frameStatusBar && m_frameStatusBar->IsShown())
{ {
int xx = 0 + m_miniEdge; int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;